Merge branch 'chore/data-proxy-ga-3' into chore/data-proxy-ga-4

prisma · Jun 7, 2022 · 629c63e · 629c63e
2 parents 7149342 + 91ea26a
commit 629c63e
Show file tree

Hide file tree

Showing 26 changed files with 913 additions and 396 deletions.
diff --git a/.buildkite/publish/docker-compose.yml b/.buildkite/publish/docker-compose.yml
@@ -32,6 +32,8 @@ services:
       - TEST_MONGO_URI_MIGRATE=mongodb://root:prisma@mongodb_migrate:27017/tests-migrate?authSource=admin
       # CockroachDB
       - TEST_COCKROACH_URI=postgresql://prisma@cockroachdb:26257/tests
+      - TEST_COCKROACH_URI_MIGRATE=postgresql://prisma@cockroachdb:26257/tests-migrate
+      - TEST_COCKROACH_SHADOWDB_URI_MIGRATE=postgresql://prisma@cockroachdb:26257/tests-migrate-shadowdb
       # Other vars !\ If not defined, they cannot be accessed
       # TODO: do an env var cleanup?
       - NPM_TOKEN
@@ -85,7 +87,7 @@ services:
       - '5435:5432'
 
   cockroachdb:
-    image: prismagraphql/cockroachdb-custom:22.1.0-beta.5
+    image: prismagraphql/cockroachdb-custom:22.1.0
     restart: always
     command: start-single-node --insecure
     ports:

diff --git a/.buildkite/test/docker-compose.14.yml b/.buildkite/test/docker-compose.14.yml
@@ -32,6 +32,8 @@ services:
       - TEST_MONGO_URI_MIGRATE=mongodb://root:prisma@mongodb_migrate:27017/tests-migrate?authSource=admin
       # CockroachDB
       - TEST_COCKROACH_URI=postgresql://prisma@cockroachdb:26257/tests
+      - TEST_COCKROACH_URI_MIGRATE=postgresql://prisma@cockroachdb:26257/tests-migrate
+      - TEST_COCKROACH_SHADOWDB_URI_MIGRATE=postgresql://prisma@cockroachdb:26257/tests-migrate-shadowdb
       # Other vars
       - BUILDKITE
       - BUILDKITE_PARALLEL_JOB
@@ -75,7 +77,7 @@ services:
       - '5435:5432'
 
   cockroachdb:
-    image: prismagraphql/cockroachdb-custom:22.1.0-beta.5
+    image: prismagraphql/cockroachdb-custom:22.1.0
     restart: always
     command: start-single-node --insecure
     ports:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -410,6 +410,8 @@ jobs:
           TEST_MSSQL_SHADOWDB_JDBC_URI_MIGRATE: 'sqlserver://localhost:1433;database=tests-migrate-shadowdb;user=SA;password=Pr1sm4_Pr1sm4;trustServerCertificate=true;'
           TEST_MONGO_URI_MIGRATE: 'mongodb://root:prisma@localhost:27017/tests-migrate?authSource=admin'
           TEST_COCKROACH_URI: 'postgresql://prisma@localhost:26257/tests'
+          TEST_COCKROACH_URI_MIGRATE: 'postgresql://prisma@localhost:26257/tests-migrate'
+          TEST_COCKROACH_SHADOWDB_URI_MIGRATE: 'postgres://prisma:prisma@localhost:26257/tests-migrate-shadowdb'
 
       - uses: codecov/codecov-action@v3
         with:

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       - '5435:5432'
 
   cockroachdb:
-    image: prismagraphql/cockroachdb-custom:22.1.0-beta.5
+    image: prismagraphql/cockroachdb-custom:22.1.0
     restart: always
     command: start-single-node --insecure
     ports:

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -68,13 +68,13 @@
   "devDependencies": {
     "@prisma/client": "workspace:*",
     "@prisma/debug": "workspace:*",
-    "@prisma/fetch-engine": "3.15.0-25.85b689a79df86c0da0e3676d1c001c946c2d903c",
+    "@prisma/fetch-engine": "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372",
     "@prisma/generator-helper": "workspace:*",
-    "@prisma/get-platform": "3.15.0-25.85b689a79df86c0da0e3676d1c001c946c2d903c",
+    "@prisma/get-platform": "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372",
     "@prisma/migrate": "workspace:*",
     "@prisma/sdk": "workspace:*",
-    "@prisma/studio": "0.461.0",
-    "@prisma/studio-server": "0.461.0",
+    "@prisma/studio": "0.462.0",
+    "@prisma/studio-server": "0.462.0",
     "@swc/core": "1.2.189",
     "@swc/jest": "0.2.21",
     "@types/debug": "4.1.7",
@@ -120,7 +120,7 @@
     "prepublishOnly": "pnpm run build"
   },
   "dependencies": {
-    "@prisma/engines": "3.15.0-25.85b689a79df86c0da0e3676d1c001c946c2d903c"
+    "@prisma/engines": "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372"
   },
   "sideEffects": false
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -66,10 +66,10 @@
     "@opentelemetry/api": "1.1.0",
     "@prisma/debug": "workspace:*",
     "@prisma/engine-core": "workspace:*",
-    "@prisma/engines": "3.15.0-25.85b689a79df86c0da0e3676d1c001c946c2d903c",
-    "@prisma/fetch-engine": "3.15.0-25.85b689a79df86c0da0e3676d1c001c946c2d903c",
+    "@prisma/engines": "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372",
+    "@prisma/fetch-engine": "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372",
     "@prisma/generator-helper": "workspace:*",
-    "@prisma/get-platform": "3.15.0-25.85b689a79df86c0da0e3676d1c001c946c2d903c",
+    "@prisma/get-platform": "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372",
     "@prisma/migrate": "workspace:*",
     "@prisma/sdk": "workspace:*",
     "@swc/core": "1.2.189",
@@ -130,7 +130,7 @@
     }
   },
   "dependencies": {
-    "@prisma/engines-version": "3.15.0-25.85b689a79df86c0da0e3676d1c001c946c2d903c"
+    "@prisma/engines-version": "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372"
   },
   "sideEffects": false
 }
diff --git a/packages/engine-core/package.json b/packages/engine-core/package.json
@@ -35,9 +35,9 @@
   },
   "dependencies": {
     "@prisma/debug": "workspace:*",
-    "@prisma/engines": "3.15.0-25.85b689a79df86c0da0e3676d1c001c946c2d903c",
+    "@prisma/engines": "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372",
     "@prisma/generator-helper": "workspace:*",
-    "@prisma/get-platform": "3.15.0-25.85b689a79df86c0da0e3676d1c001c946c2d903c",
+    "@prisma/get-platform": "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372",
     "chalk": "4.1.2",
     "execa": "5.1.1",
     "get-stream": "6.0.1",

diff --git a/packages/engine-core/src/common/errors/PrismaClientRustError.ts b/packages/engine-core/src/common/errors/PrismaClientRustError.ts
@@ -11,7 +11,7 @@ export class PrismaClientRustError extends Error {
   constructor({ clientVersion, log, error }: PrismaClientRustErrorArgs) {
     if (log) {
       const backtrace = getBacktraceFromLog(log)
-      super(backtrace ?? 'Unkown error')
+      super(backtrace ?? 'Unknown error')
     } else if (error) {
       const backtrace = getBacktraceFromRustError(error)
       super(backtrace)

diff --git a/packages/migrate/package.json b/packages/migrate/package.json
@@ -19,7 +19,7 @@
     "version": "latest"
   },
   "devDependencies": {
-    "@prisma/engines-version": "3.15.0-25.85b689a79df86c0da0e3676d1c001c946c2d903c",
+    "@prisma/engines-version": "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372",
     "@prisma/generator-helper": "workspace:*",
     "@prisma/sdk": "workspace:*",
     "@swc/core": "1.2.189",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@prisma/debug": "workspace:*",
-    "@prisma/get-platform": "3.15.0-25.85b689a79df86c0da0e3676d1c001c946c2d903c",
+    "@prisma/get-platform": "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372",
     "@sindresorhus/slugify": "1.1.2",
     "chalk": "4.1.2",
     "execa": "5.1.1",