chore: upgrade to Prisma 5.14.0 (#1477)

zenstackhq · Jun 2, 2024 · f606b12 · f606b12
1 parent 6610bd0
commit f606b12
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 93 deletions.
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -98,7 +98,7 @@
         "zod-validation-error": "^1.5.0"
     },
     "peerDependencies": {
-        "@prisma/client": "5.0.0 - 5.13.x"
+        "@prisma/client": "5.0.0 - 5.14.x"
     },
     "author": {
         "name": "ZenStack Team"

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -122,10 +122,10 @@
         "zod-validation-error": "^1.5.0"
     },
     "peerDependencies": {
-        "prisma": "5.0.0 - 5.13.x"
+        "prisma": "5.0.0 - 5.14.x"
     },
     "devDependencies": {
-        "@prisma/client": "^5.13.0",
+        "@prisma/client": "^5.14.0",
         "@types/async-exit-hook": "^2.0.0",
         "@types/pluralize": "^0.0.29",
         "@types/semver": "^7.3.13",
@@ -137,7 +137,7 @@
         "@zenstackhq/runtime": "workspace:*",
         "dotenv": "^16.0.3",
         "esbuild": "^0.15.12",
-        "prisma": "^5.13.0",
+        "prisma": "^5.14.0",
         "renamer": "^4.0.0",
         "tmp": "^0.2.1",
         "tsc-alias": "^1.7.0",

diff --git a/packages/schema/tests/generator/prisma-generator.test.ts b/packages/schema/tests/generator/prisma-generator.test.ts
@@ -34,7 +34,6 @@ describe('Prisma generator test', () => {
                 provider = 'postgresql'
                 url = env("DATABASE_URL")
                 directUrl = env("DATABASE_URL")
-                shadowDatabaseUrl = env("DATABASE_URL")
                 extensions = [pg_trgm, postgis(version: "3.3.2"), uuid_ossp(map: "uuid-ossp", schema: "extensions")]
                 schemas = ["auth", "public"]
             }
@@ -67,7 +66,6 @@ describe('Prisma generator test', () => {
         expect(content).toContain('provider = "postgresql"');
         expect(content).toContain('url = env("DATABASE_URL")');
         expect(content).toContain('directUrl = env("DATABASE_URL")');
-        expect(content).toContain('shadowDatabaseUrl = env("DATABASE_URL")');
         expect(content).toContain(
             'extensions = [pg_trgm, postgis(version: "3.3.2"), uuid_ossp(map: "uuid-ossp", schema: "extensions")]'
         );
@@ -253,9 +251,9 @@ describe('Prisma generator test', () => {
         expect(content).toContain(`@@map("_Role")`);
         expect(content).toContain(`@map("admin")`);
         expect(content).toContain(`@map("customer")`);
-        expect(content).toContain('/// Admin role documentation line 1\n' +
-            '  /// Admin role documentation line 2\n' +
-            '  ADMIN');
+        expect(content).toContain(
+            '/// Admin role documentation line 1\n' + '  /// Admin role documentation line 2\n' + '  ADMIN'
+        );
     });
 
     it('attribute passthrough', async () => {

diff --git a/packages/schema/tests/schema/validation/datasource-validation.test.ts b/packages/schema/tests/schema/validation/datasource-validation.test.ts
@@ -13,9 +13,9 @@ describe('Datasource Validation Tests', () => {
                 cause: [
                     { message: 'datasource must include a "provider" field' },
                     { message: 'datasource must include a "url" field' },
-                ]
-            }
-        })
+                ],
+            },
+        });
     });
 
     it('dup fields', async () => {
@@ -63,14 +63,6 @@ describe('Datasource Validation Tests', () => {
                 }
         `)
         ).toContain('"url" must be set to a string literal or an invocation of "env" function');
-
-        expect(
-            await loadModelWithError(`
-                datasource db {
-                    shadowDatabaseUrl = 123
-                }
-        `)
-        ).toContain('"shadowDatabaseUrl" must be set to a string literal or an invocation of "env" function');
     });
 
     it('invalid relationMode value', async () => {
@@ -96,7 +88,6 @@ describe('Datasource Validation Tests', () => {
             datasource db {
                 provider = "postgresql"
                 url = "url"
-                shadowDatabaseUrl = "shadow"
                 relationMode = "prisma"
             }
         `);
@@ -105,7 +96,6 @@ describe('Datasource Validation Tests', () => {
             datasource db {
                 provider = "postgresql"
                 url = env("url")
-                shadowDatabaseUrl = env("shadowUrl")
                 relationMode = "foreignKeys"
             }
         `);

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -18,8 +18,8 @@
     "author": "",
     "license": "MIT",
     "dependencies": {
-        "@prisma/generator-helper": "^5.13.0",
-        "@prisma/internals": "^5.13.0",
+        "@prisma/generator-helper": "^5.14.0",
+        "@prisma/internals": "^5.14.0",
         "@zenstackhq/language": "workspace:*",
         "@zenstackhq/runtime": "workspace:*",
         "langium": "1.3.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/integration/test-run/package.json b/tests/integration/test-run/package.json
@@ -10,9 +10,9 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@prisma/client": "^5.13.0",
+        "@prisma/client": "^5.14.0",
         "@zenstackhq/runtime": "file:../../../packages/runtime/dist",
-        "prisma": "^5.13.0",
+        "prisma": "^5.14.0",
         "react": "^18.2.0",
         "swr": "^1.3.0",
         "typescript": "^4.9.3",

diff --git a/tests/integration/tests/frameworks/nextjs/test-project/package.json b/tests/integration/tests/frameworks/nextjs/test-project/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@prisma/client": "^5.13.0",
+    "@prisma/client": "^5.14.0",
     "@types/node": "18.11.18",
     "@types/react": "18.0.27",
     "@types/react-dom": "18.0.10",
@@ -22,6 +22,6 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "prisma": "^5.13.0"
+    "prisma": "^5.14.0"
   }
 }
diff --git a/tests/integration/tests/frameworks/trpc/test-project/package.json b/tests/integration/tests/frameworks/trpc/test-project/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@prisma/client": "^5.13.0",
+    "@prisma/client": "^5.14.0",
     "@tanstack/react-query": "^4.22.4",
     "@trpc/client": "^10.34.0",
     "@trpc/next": "^10.34.0",
@@ -26,6 +26,6 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "prisma": "^5.13.0"
+    "prisma": "^5.14.0"
   }
 }