Skip to content

Enable JSON fields for SQLite #2081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Apr 14, 2025
Merged

Enable JSON fields for SQLite #2081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
efe65ec
merge dev to main (v2.9.2) (#1882)
ymc9 Nov 22, 2024
f5e4e7c
merge dev to main (v2.9.3) (#1886)
ymc9 Nov 26, 2024
251c699
merge dev to main (v2.9.4) (#1892)
ymc9 Nov 27, 2024
7cc5f00
merge dev to main (v2.10.0) (#1907)
ymc9 Dec 5, 2024
f7f85ea
merge dev to main (v2.10.1) (#1913)
ymc9 Dec 13, 2024
689d013
merge dev to main (v2.10.2) (#1919)
ymc9 Dec 18, 2024
70a81c6
merge dev to main (v2.11.0) (#1943)
ymc9 Jan 7, 2025
4b7d813
merge dev to main (v2.11.1) (#1952)
ymc9 Jan 8, 2025
ba80eda
merge dev to main (v2.11.2) (#1957)
ymc9 Jan 13, 2025
b220213
merge dev to main (v2.11.3) (#1963)
ymc9 Jan 14, 2025
ff393da
merge dev to main (v2.11.4) (#1966)
ymc9 Jan 17, 2025
a1dfdcd
merge dev to main (v2.11.5) (#1973)
ymc9 Jan 29, 2025
584d8af
merge dev to main (v2.11.6) (#1981)
ymc9 Feb 7, 2025
0107e1c
merge dev to main (v2.12.0) (#2013)
ymc9 Feb 25, 2025
8934679
merge dev to main (v2.12.1) (#2026)
ymc9 Mar 4, 2025
d4fb5ab
merge dev to main (v2.12.2) (#2032)
ymc9 Mar 7, 2025
a4acf35
merge dev to main (v2.12.3) (#2043)
ymc9 Mar 13, 2025
8a62f63
merge dev to main (v2.13.0) (#2057)
ymc9 Mar 24, 2025
79197c6
merge dev to main (v2.13.1) (#2068)
ymc9 Apr 4, 2025
c017a40
merge dev to main (v2.13.2) (#2072)
ymc9 Apr 7, 2025
2f69aa8
merge dev to main (v2.13.3) (#2076)
ymc9 Apr 9, 2025
9288755
enable JSON fields for SQLite,
liontariai Apr 13, 2025
262316f
fix broken test cases and add coverage for sqlite
ymc9 Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/schema/src/plugins/prisma/schema-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ import {
const MODEL_PASSTHROUGH_ATTR = '@@prisma.passthrough';
const FIELD_PASSTHROUGH_ATTR = '@prisma.passthrough';
const PROVIDERS_SUPPORTING_NAMED_CONSTRAINTS = ['postgresql', 'mysql', 'cockroachdb'];
const PROVIDERS_SUPPORTING_TYPEDEF_FIELDS = ['postgresql'];
const PROVIDERS_SUPPORTING_TYPEDEF_FIELDS = ['postgresql', 'sqlite'];

// Some database providers like postgres and mysql have default limit to the length of identifiers
// Here we use a conservative value that should work for most cases, and truncate names if needed
Expand Down
34 changes: 19 additions & 15 deletions tests/integration/tests/enhancements/json/crud.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
import { createPostgresDb, dropPostgresDb, loadSchema } from '@zenstackhq/testtools';

describe('Json field CRUD', () => {
describe.each(['sqlite' as const, 'postgresql' as const])('Json field CRUD - %p', (provider) => {
let dbUrl: string;
let prisma: any;

beforeEach(async () => {
dbUrl = await createPostgresDb('json-field-typing');
if (provider === 'postgresql') {
dbUrl = await createPostgresDb('json-field-typing');
}
});

afterEach(async () => {
if (prisma) {
await prisma.$disconnect();
if (provider === 'postgresql') {
if (prisma) {
await prisma.$disconnect();
}
await dropPostgresDb(dbUrl);
}
await dropPostgresDb(dbUrl);
});

it('works with simple cases', async () => {
Expand Down Expand Up @@ -41,7 +45,7 @@ describe('Json field CRUD', () => {
}
`,
{
provider: 'postgresql',
provider,
dbUrl,
enhancements: ['validation'],
}
Expand Down Expand Up @@ -90,7 +94,7 @@ describe('Json field CRUD', () => {
}
`,
{
provider: 'postgresql',
provider,
dbUrl,
}
);
Expand Down Expand Up @@ -137,7 +141,7 @@ describe('Json field CRUD', () => {
}
`,
{
provider: 'postgresql',
provider,
dbUrl,
}
);
Expand Down Expand Up @@ -211,7 +215,7 @@ describe('Json field CRUD', () => {
}
`,
{
provider: 'postgresql',
provider,
dbUrl,
}
);
Expand Down Expand Up @@ -255,7 +259,7 @@ describe('Json field CRUD', () => {
}
`,
{
provider: 'postgresql',
provider,
dbUrl,
}
);
Expand Down Expand Up @@ -291,7 +295,7 @@ describe('Json field CRUD', () => {
}
`,
{
provider: 'postgresql',
provider,
dbUrl,
}
);
Expand Down Expand Up @@ -328,7 +332,7 @@ describe('Json field CRUD', () => {
}
`,
{
provider: 'postgresql',
provider,
dbUrl,
}
);
Expand Down Expand Up @@ -368,7 +372,7 @@ describe('Json field CRUD', () => {
}
`,
{
provider: 'postgresql',
provider,
dbUrl,
}
);
Expand Down Expand Up @@ -401,7 +405,7 @@ describe('Json field CRUD', () => {
}
`,
{
provider: 'postgresql',
provider,
dbUrl,
}
);
Expand Down Expand Up @@ -446,7 +450,7 @@ describe('Json field CRUD', () => {
}
`,
{
provider: 'postgresql',
provider,
dbUrl,
compile: true,
extraSourceFiles: [
Expand Down
18 changes: 9 additions & 9 deletions tests/integration/tests/enhancements/json/typing.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { loadSchema } from '@zenstackhq/testtools';

describe('JSON field typing', () => {
describe.each(['sqlite' as const, 'postgresql' as const])('JSON field typing - %p', (provider) => {
it('works with simple field', async () => {
await loadSchema(
`
Expand All @@ -23,7 +23,7 @@ describe('JSON field typing', () => {
}
`,
{
provider: 'postgresql',
provider,
pushDb: false,
compile: true,
extraSourceFiles: [
Expand Down Expand Up @@ -64,7 +64,7 @@ async function main() {
}
`,
{
provider: 'postgresql',
provider,
pushDb: false,
compile: true,
extraSourceFiles: [
Expand Down Expand Up @@ -105,7 +105,7 @@ async function main() {
}
`,
{
provider: 'postgresql',
provider,
pushDb: false,
compile: true,
extraSourceFiles: [
Expand Down Expand Up @@ -151,7 +151,7 @@ async function main() {
}
`,
{
provider: 'postgresql',
provider,
pushDb: false,
compile: true,
extraSourceFiles: [
Expand Down Expand Up @@ -203,7 +203,7 @@ async function main() {
}
`,
{
provider: 'postgresql',
provider,
pushDb: false,
compile: true,
extraSourceFiles: [
Expand Down Expand Up @@ -252,7 +252,7 @@ async function main() {
}
`,
{
provider: 'postgresql',
provider,
pushDb: false,
compile: true,
extraSourceFiles: [
Expand Down Expand Up @@ -303,7 +303,7 @@ async function main() {
}
`,
{
provider: 'postgresql',
provider,
pushDb: false,
compile: true,
extraSourceFiles: [
Expand Down Expand Up @@ -348,7 +348,7 @@ async function main() {
}
`,
{
provider: 'postgresql',
provider,
pushDb: false,
compile: true,
extraSourceFiles: [
Expand Down
18 changes: 0 additions & 18 deletions tests/integration/tests/enhancements/json/validation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,6 @@
import { loadModel, loadModelWithError, loadSchema } from '@zenstackhq/testtools';

describe('JSON field typing', () => {
it('is only supported by postgres', async () => {
await expect(
loadSchema(
`
type Profile {
age Int @gt(0)
}

model User {
id Int @id @default(autoincrement())
profile Profile @json
@@allow('all', true)
}
`
)
).rejects.toThrow('Datasource provider "sqlite" does not support "@json" fields');
});

it('requires field to have @json attribute', async () => {
await expect(
loadModelWithError(
Expand Down
Loading