Enable JSON fields for SQLite (#2081)

liontariai · ymc9 · web-flow · commit 22db7b571ccc · 2025-04-13T21:23:10.000-07:00
Co-authored-by: Yiming &lt;yiming@whimslab.io&gt;
Co-authored-by: ymc9 &lt;104139426+ymc9@users.noreply.github.com&gt;
diff --git a/packages/schema/src/plugins/prisma/schema-generator.ts b/packages/schema/src/plugins/prisma/schema-generator.ts
@@ -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
diff --git a/tests/integration/tests/enhancements/json/crud.test.ts b/tests/integration/tests/enhancements/json/crud.test.ts
@@ -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 () => {
@@ -41,7 +45,7 @@ describe('Json field CRUD', () => {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 dbUrl,
                 enhancements: ['validation'],
             }
@@ -90,7 +94,7 @@ describe('Json field CRUD', () => {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 dbUrl,
             }
         );
@@ -137,7 +141,7 @@ describe('Json field CRUD', () => {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 dbUrl,
             }
         );
@@ -211,7 +215,7 @@ describe('Json field CRUD', () => {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 dbUrl,
             }
         );
@@ -255,7 +259,7 @@ describe('Json field CRUD', () => {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 dbUrl,
             }
         );
@@ -291,7 +295,7 @@ describe('Json field CRUD', () => {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 dbUrl,
             }
         );
@@ -328,7 +332,7 @@ describe('Json field CRUD', () => {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 dbUrl,
             }
         );
@@ -368,7 +372,7 @@ describe('Json field CRUD', () => {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 dbUrl,
             }
         );
@@ -401,7 +405,7 @@ describe('Json field CRUD', () => {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 dbUrl,
             }
         );
@@ -446,7 +450,7 @@ describe('Json field CRUD', () => {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 dbUrl,
                 compile: true,
                 extraSourceFiles: [
diff --git a/tests/integration/tests/enhancements/json/typing.test.ts b/tests/integration/tests/enhancements/json/typing.test.ts
@@ -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(
             `
@@ -23,7 +23,7 @@ describe('JSON field typing', () => {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 pushDb: false,
                 compile: true,
                 extraSourceFiles: [
@@ -64,7 +64,7 @@ async function main() {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 pushDb: false,
                 compile: true,
                 extraSourceFiles: [
@@ -105,7 +105,7 @@ async function main() {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 pushDb: false,
                 compile: true,
                 extraSourceFiles: [
@@ -151,7 +151,7 @@ async function main() {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 pushDb: false,
                 compile: true,
                 extraSourceFiles: [
@@ -203,7 +203,7 @@ async function main() {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 pushDb: false,
                 compile: true,
                 extraSourceFiles: [
@@ -252,7 +252,7 @@ async function main() {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 pushDb: false,
                 compile: true,
                 extraSourceFiles: [
@@ -303,7 +303,7 @@ async function main() {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 pushDb: false,
                 compile: true,
                 extraSourceFiles: [
@@ -348,7 +348,7 @@ async function main() {
             }
             `,
             {
-                provider: 'postgresql',
+                provider,
                 pushDb: false,
                 compile: true,
                 extraSourceFiles: [
diff --git a/tests/integration/tests/enhancements/json/validation.test.ts b/tests/integration/tests/enhancements/json/validation.test.ts
@@ -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(

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,22 @@`
`1`	`1`	`import { createPostgresDb, dropPostgresDb, loadSchema } from '@zenstackhq/testtools';`
`2`	`2`
`3`		`-describe('Json field CRUD', () => {`
	`3`	`+describe.each(['sqlite' as const, 'postgresql' as const])('Json field CRUD - %p', (provider) => {`
`4`	`4`	`let dbUrl: string;`
`5`	`5`	`let prisma: any;`
`6`	`6`
`7`	`7`	`beforeEach(async () => {`
`8`		`- dbUrl = await createPostgresDb('json-field-typing');`
	`8`	`+ if (provider === 'postgresql') {`
	`9`	`+ dbUrl = await createPostgresDb('json-field-typing');`
	`10`	`+ }`
`9`	`11`	`});`
`10`	`12`
`11`	`13`	`afterEach(async () => {`
`12`		`- if (prisma) {`
`13`		`- await prisma.$disconnect();`
	`14`	`+ if (provider === 'postgresql') {`
	`15`	`+ if (prisma) {`
	`16`	`+ await prisma.$disconnect();`
	`17`	`+ }`
	`18`	`+ await dropPostgresDb(dbUrl);`
`14`	`19`	`}`
`15`		`- await dropPostgresDb(dbUrl);`
`16`	`20`	`});`
`17`	`21`
`18`	`22`	`it('works with simple cases', async () => {`
`@@ -41,7 +45,7 @@ describe('Json field CRUD', () => {`
`41`	`45`	`}`
`42`	`46`	`,
`43`	`47`	`{`
`44`		`- provider: 'postgresql',`
	`48`	`+ provider,`
`45`	`49`	`dbUrl,`
`46`	`50`	`enhancements: ['validation'],`
`47`	`51`	`}`
`@@ -90,7 +94,7 @@ describe('Json field CRUD', () => {`
`90`	`94`	`}`
`91`	`95`	`,
`92`	`96`	`{`
`93`		`- provider: 'postgresql',`
	`97`	`+ provider,`
`94`	`98`	`dbUrl,`
`95`	`99`	`}`
`96`	`100`	`);`
`@@ -137,7 +141,7 @@ describe('Json field CRUD', () => {`
`137`	`141`	`}`
`138`	`142`	`,
`139`	`143`	`{`
`140`		`- provider: 'postgresql',`
	`144`	`+ provider,`
`141`	`145`	`dbUrl,`
`142`	`146`	`}`
`143`	`147`	`);`
`@@ -211,7 +215,7 @@ describe('Json field CRUD', () => {`
`211`	`215`	`}`
`212`	`216`	`,
`213`	`217`	`{`
`214`		`- provider: 'postgresql',`
	`218`	`+ provider,`
`215`	`219`	`dbUrl,`
`216`	`220`	`}`
`217`	`221`	`);`
`@@ -255,7 +259,7 @@ describe('Json field CRUD', () => {`
`255`	`259`	`}`
`256`	`260`	`,
`257`	`261`	`{`
`258`		`- provider: 'postgresql',`
	`262`	`+ provider,`
`259`	`263`	`dbUrl,`
`260`	`264`	`}`
`261`	`265`	`);`
`@@ -291,7 +295,7 @@ describe('Json field CRUD', () => {`
`291`	`295`	`}`
`292`	`296`	`,
`293`	`297`	`{`
`294`		`- provider: 'postgresql',`
	`298`	`+ provider,`
`295`	`299`	`dbUrl,`
`296`	`300`	`}`
`297`	`301`	`);`
`@@ -328,7 +332,7 @@ describe('Json field CRUD', () => {`
`328`	`332`	`}`
`329`	`333`	`,
`330`	`334`	`{`
`331`		`- provider: 'postgresql',`
	`335`	`+ provider,`
`332`	`336`	`dbUrl,`
`333`	`337`	`}`
`334`	`338`	`);`
`@@ -368,7 +372,7 @@ describe('Json field CRUD', () => {`
`368`	`372`	`}`
`369`	`373`	`,
`370`	`374`	`{`
`371`		`- provider: 'postgresql',`
	`375`	`+ provider,`
`372`	`376`	`dbUrl,`
`373`	`377`	`}`
`374`	`378`	`);`
`@@ -401,7 +405,7 @@ describe('Json field CRUD', () => {`
`401`	`405`	`}`
`402`	`406`	`,
`403`	`407`	`{`
`404`		`- provider: 'postgresql',`
	`408`	`+ provider,`
`405`	`409`	`dbUrl,`
`406`	`410`	`}`
`407`	`411`	`);`
`@@ -446,7 +450,7 @@ describe('Json field CRUD', () => {`
`446`	`450`	`}`
`447`	`451`	`,
`448`	`452`	`{`
`449`		`- provider: 'postgresql',`
	`453`	`+ provider,`
`450`	`454`	`dbUrl,`
`451`	`455`	`compile: true,`
`452`	`456`	`extraSourceFiles: [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { loadSchema } from '@zenstackhq/testtools';`
`2`	`2`
`3`		`-describe('JSON field typing', () => {`
	`3`	`+describe.each(['sqlite' as const, 'postgresql' as const])('JSON field typing - %p', (provider) => {`
`4`	`4`	`it('works with simple field', async () => {`
`5`	`5`	`await loadSchema(`
`6`	`6`	`
`@@ -23,7 +23,7 @@ describe('JSON field typing', () => {`
`23`	`23`	`}`
`24`	`24`	`,
`25`	`25`	`{`
`26`		`- provider: 'postgresql',`
	`26`	`+ provider,`
`27`	`27`	`pushDb: false,`
`28`	`28`	`compile: true,`
`29`	`29`	`extraSourceFiles: [`
`@@ -64,7 +64,7 @@ async function main() {`
`64`	`64`	`}`
`65`	`65`	`,
`66`	`66`	`{`
`67`		`- provider: 'postgresql',`
	`67`	`+ provider,`
`68`	`68`	`pushDb: false,`
`69`	`69`	`compile: true,`
`70`	`70`	`extraSourceFiles: [`
`@@ -105,7 +105,7 @@ async function main() {`
`105`	`105`	`}`
`106`	`106`	`,
`107`	`107`	`{`
`108`		`- provider: 'postgresql',`
	`108`	`+ provider,`
`109`	`109`	`pushDb: false,`
`110`	`110`	`compile: true,`
`111`	`111`	`extraSourceFiles: [`
`@@ -151,7 +151,7 @@ async function main() {`
`151`	`151`	`}`
`152`	`152`	`,
`153`	`153`	`{`
`154`		`- provider: 'postgresql',`
	`154`	`+ provider,`
`155`	`155`	`pushDb: false,`
`156`	`156`	`compile: true,`
`157`	`157`	`extraSourceFiles: [`
`@@ -203,7 +203,7 @@ async function main() {`
`203`	`203`	`}`
`204`	`204`	`,
`205`	`205`	`{`
`206`		`- provider: 'postgresql',`
	`206`	`+ provider,`
`207`	`207`	`pushDb: false,`
`208`	`208`	`compile: true,`
`209`	`209`	`extraSourceFiles: [`
`@@ -252,7 +252,7 @@ async function main() {`
`252`	`252`	`}`
`253`	`253`	`,
`254`	`254`	`{`
`255`		`- provider: 'postgresql',`
	`255`	`+ provider,`
`256`	`256`	`pushDb: false,`
`257`	`257`	`compile: true,`
`258`	`258`	`extraSourceFiles: [`
`@@ -303,7 +303,7 @@ async function main() {`
`303`	`303`	`}`
`304`	`304`	`,
`305`	`305`	`{`
`306`		`- provider: 'postgresql',`
	`306`	`+ provider,`
`307`	`307`	`pushDb: false,`
`308`	`308`	`compile: true,`
`309`	`309`	`extraSourceFiles: [`
`@@ -348,7 +348,7 @@ async function main() {`
`348`	`348`	`}`
`349`	`349`	`,
`350`	`350`	`{`
`351`		`- provider: 'postgresql',`
	`351`	`+ provider,`
`352`	`352`	`pushDb: false,`
`353`	`353`	`compile: true,`
`354`	`354`	`extraSourceFiles: [`