Merge branch 'main' into main

.buildkite/engineer

@@ -13,7 +13,7 @@ fi
 if ! type "engineer" &> /dev/null; then
     # Setup Prisma engine build & test tool (engineer).
     set -e
-    curl --fail -sSL "https://prisma-engineer.s3-eu-west-1.amazonaws.com/1.57/latest/$OS/engineer.gz" --output engineer.gz
+    curl --fail -sSL "https://prisma-engineer.s3-eu-west-1.amazonaws.com/1.59/latest/$OS/engineer.gz" --output engineer.gz
     gzip -d engineer.gz
     chmod +x engineer
 

.github/workflows/build-apple-intel.yml

@@ -43,7 +43,7 @@ jobs:
         with:
           name: binaries
           path: |
-            ${{ github.workspace }}/target/release/migration-engine
+            ${{ github.workspace }}/target/release/schema-engine
             ${{ github.workspace }}/target/release/prisma-fmt
             ${{ github.workspace }}/target/release/query-engine
             ${{ github.workspace }}/target/release/libquery_engine.dylib

.github/workflows/build-apple-silicon.yml

@@ -45,7 +45,7 @@ jobs:
         with:
           name: binaries
           path: |
-            ${{ github.workspace }}/target/aarch64-apple-darwin/release/migration-engine
+            ${{ github.workspace }}/target/aarch64-apple-darwin/release/schema-engine
             ${{ github.workspace }}/target/aarch64-apple-darwin/release/prisma-fmt
             ${{ github.workspace }}/target/aarch64-apple-darwin/release/query-engine
             ${{ github.workspace }}/target/aarch64-apple-darwin/release/libquery_engine.dylib

.github/workflows/build-wasm.yml

@@ -5,19 +5,19 @@ on:
       - main
   pull_request:
     paths-ignore:
-      - '.buildkite/**'
-      - '*.md'
-      - 'LICENSE'
-      - 'CODEOWNERS'
-      - 'renovate.json'
+      - ".buildkite/**"
+      - "*.md"
+      - "LICENSE"
+      - "CODEOWNERS"
+      - "renovate.json"
 
 jobs:
   build:
-    name: "prisma-fmt-wasm build ${{ github.event.ref }} for commit ${{ github.event.inputs.commit }}"
+    name: "prisma-schema-wasm build ${{ github.event.ref }} for commit ${{ github.event.inputs.commit }}"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v21
+      - uses: cachix/install-nix-action@v22
 
-      - run: nix build .#prisma-fmt-wasm
+      - run: nix build .#prisma-schema-wasm
       - run: nix flake check

.github/workflows/cargo-doc.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v21
+      - uses: cachix/install-nix-action@v22
       - run: |
           git config user.email "prismabots@gmail.com"
           git config user.name "prisma-bot"

.github/workflows/engine-size.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v21
+      - uses: cachix/install-nix-action@v22
       - run: |
           git config user.email "prismabots@gmail.com"
           git config user.name "prisma-bot"

.github/workflows/publish-prisma-fmt-wasm.yml → .github/workflows/publish-prisma-schema-wasm.yml

@@ -1,6 +1,6 @@
-name: Build and publish @prisma/prisma-fmt-wasm
+name: Build and publish @prisma/prisma-schema-wasm
 
-concurrency: build-prisma-fmt-wasm
+concurrency: build-prisma-schema-wasm
 
 on:
   # usually triggered via GH Actions Workflow in prisma/engines-wrapper repo
@@ -12,43 +12,43 @@ on:
         required: true
       npmDistTag:
         required: true
-        default: 'latest'
+        default: "latest"
 
 jobs:
   build:
-    name: Build and publish @prisma/prisma-fmt-wasm
+    name: Build and publish @prisma/prisma-schema-wasm
     runs-on: ubuntu-latest
     steps:
       - name: Print input
         env:
-          THE_INPUT: '${{ toJson(github.event.inputs) }}'
+          THE_INPUT: "${{ toJson(github.event.inputs) }}"
         run: |
           echo $THE_INPUT
 
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.enginesHash }}
-      - uses: cachix/install-nix-action@v21
+      - uses: cachix/install-nix-action@v22
 
       #
       # Build
       #
 
-      - run: nix build .#prisma-fmt-wasm
+      - run: nix build .#prisma-schema-wasm
 
       #
       # Publish
       #
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '14.x'
+          node-version: "14.x"
 
       - name: Set up NPM token
         run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
 
       - run: |
-          PACKAGE_DIR=$( nix run .#renderPrismaFmtWasmPackage ${{ github.event.inputs.enginesWrapperVersion }})
+          PACKAGE_DIR=$( nix run .#renderPrismaSchemaWasmPackage ${{ github.event.inputs.enginesWrapperVersion }})
           npm publish "$PACKAGE_DIR" --access public --tag ${{ github.event.inputs.npmDistTag }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -65,6 +65,6 @@ jobs:
         if: ${{ failure() }}
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
-          SLACK_TITLE: 'prisma-fmt-wasm publishing failed :x:'
-          SLACK_COLOR: '#FF0000'
+          SLACK_TITLE: "prisma-schema-wasm publishing failed :x:"
+          SLACK_COLOR: "#FF0000"
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_WASM_FAILING }}

.github/workflows/query-engine.yml

@@ -32,7 +32,7 @@ jobs:
             connector: "vitess"
             version: "8.0"
           - name: "postgres15"
-            single_threaded: false
+            single_threaded: true
             connector: "postgres"
             version: "15"
           - name: "mssql_2022"

.gitignore

@@ -45,4 +45,4 @@ dev_datamodel.prisma
 dmmf.json
 graph.dot
 
-prisma-fmt-wasm/nodejs
+prisma-schema-wasm/nodejs

Cargo.toml

@@ -28,7 +28,7 @@ members = [
   "query-engine/schema",
   "libs/*",
   "prisma-fmt",
-  "prisma-fmt-wasm",
+  "prisma-schema-wasm",
   "psl/*",
 ]
 

Makefile

@@ -257,9 +257,9 @@ qe-dev-chinook-postgres10: start-postgres10
 qe-dev-mongo_4_4: start-mongodb_4_4
 	cp $(SCHEMA_EXAMPLES_PATH)/generic_mongo4.prisma $(DEV_SCHEMA_FILE)
 
-use-local-migration-engine:
+use-local-schema-engine:
 	cargo build --release
-	cp target/release/migration-engine $(PRISMA2_BINARY_PATH)/
+	cp target/release/schema-engine $(PRISMA2_BINARY_PATH)/
 
 use-local-query-engine:
 	cargo build --release