[pull] main from prisma:main

.config/nextest.toml

@@ -0,0 +1,88 @@
+[store]
+# The directory under the workspace root at which nextest-related files are
+# written. Profile-specific storage is currently written to dir/<profile-name>.
+dir = "target/nextest"
+
+# This section defines the default nextest profile. Custom profiles are layered
+# on top of the default profile.
+[profile.default]
+# "retries" defines the number of times a test should be retried. If set to a
+# non-zero value, tests that succeed on a subsequent attempt will be marked as
+# flaky. Can be overridden through the `--retries` option.
+# Examples
+# * retries = 3
+# * retries = { backoff = "fixed", count = 2, delay = "1s" }
+# * retries = { backoff = "exponential", count = 10, delay = "1s", jitter = true, max-delay = "10s" }
+retries = { backoff = "fixed", count = 5, delay = "1s", jitter = true }
+
+# The number of threads to run tests with. Supported values are either an integer or
+# the string "num-cpus". Can be overridden through the `--test-threads` option.
+test-threads = "num-cpus"
+
+# The number of threads required for each test. This is generally used in overrides to
+# mark certain tests as heavier than others. However, it can also be set as a global parameter.
+threads-required = 1
+
+# Show these test statuses in the output.
+#
+# The possible values this can take are:
+# * none: no output
+# * fail: show failed (including exec-failed) tests
+# * retry: show flaky and retried tests
+# * slow: show slow tests
+# * pass: show passed tests
+# * skip: show skipped tests (most useful for CI)
+# * all: all of the above
+#
+# Each value includes all the values above it; for example, "slow" includes
+# failed and retried tests.
+#
+# Can be overridden through the `--status-level` flag.
+status-level = "pass"
+
+# Similar to status-level, show these test statuses at the end of the run.
+final-status-level = "flaky"
+
+# "failure-output" defines when standard output and standard error for failing tests are produced.
+# Accepted values are
+# * "immediate": output failures as soon as they happen
+# * "final": output failures at the end of the test run
+# * "immediate-final": output failures as soon as they happen and at the end of
+#   the test run; combination of "immediate" and "final"
+# * "never": don't output failures at all
+#
+# For large test suites and CI it is generally useful to use "immediate-final".
+#
+# Can be overridden through the `--failure-output` option.
+failure-output = "immediate-final"
+
+# "success-output" controls production of standard output and standard error on success. This should
+# generally be set to "never".
+success-output = "never"
+
+# Cancel the test run on the first failure. For CI runs, consider setting this
+# to false.
+fail-fast = false
+
+# Treat a test that takes longer than the configured 'period' as slow, and print a message.
+# See <https://nexte.st/book/slow-tests> for more information.
+#
+# Optional: specify the parameter 'terminate-after' with a non-zero integer,
+# which will cause slow tests to be terminated after the specified number of
+# periods have passed.
+# Example: slow-timeout = { period = "60s", terminate-after = 2 }
+slow-timeout = { period = "60s" }
+
+# Treat a test as leaky if after the process is shut down, standard output and standard error
+# aren't closed within this duration.
+#
+# This usually happens in case of a test that creates a child process and lets it inherit those
+# handles, but doesn't clean the child process up (especially when it fails).
+#
+# See <https://nexte.st/book/leaky-tests> for more information.
+leak-timeout = "100ms"
+
+# This profile is activated if MIRI_SYSROOT is set.
+[profile.default-miri]
+# Miri tests take up a lot of memory, so only run 1 test at a time by default.
+test-threads = 1

.editorconfig

@@ -0,0 +1,3 @@
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2

.envrc

@@ -7,7 +7,6 @@ export RUST_LOG=info
 export PRISMA_DML_PATH=$(pwd)/dev_datamodel.prisma
 export PRISMA2_BINARY_PATH="/usr/local/lib/node_modules/prisma2/"
 export PRISMA_BINARY_PATH=$(pwd)/target/release/query-engine
-export PRISMA_ENGINE_PROTOCOL="graphql"
 
 ### QE config vars, set to testing values ###
 export SQLITE_MAX_VARIABLE_NUMBER=250000 # This must be in sync with the setting in the engineer build CLI
@@ -20,7 +19,13 @@ export SIMPLE_TEST_MODE="yes" # Reduces the amount of generated `relation_link_t
 ### QE specific logging vars ###
 export QE_LOG_LEVEL=debug # Set it to "trace" to enable query-graph debugging logs
 # export PRISMA_RENDER_DOT_FILE=1 # Uncomment to enable rendering a dot file of the Query Graph from an executed query.
-# export FMT_SQL=1 # Uncomment it to enable logging formatted SQL queries
+export FMT_SQL=1 # Uncomment it to enable logging formatted SQL queries
+
+### Uncomment to run driver adapters tests. See query-engine-driver-adapters.yml workflow for how tests run in CI.
+# export EXTERNAL_TEST_EXECUTOR="napi"
+# export DRIVER_ADAPTER=pg # Set to pg, neon, planetscale, libsql or cfd1
+# export PRISMA_DISABLE_QUAINT_EXECUTORS=1 # Disable quaint executors for driver adapters
+# export DRIVER_ADAPTER_URL_OVERRIDE ="postgres://USER:PASSWORD@DATABASExxxx" # Override the database url for the driver adapter tests
 
 # Mongo image requires additional wait time on arm arch for some reason.
 if uname -a | grep -q 'arm64'; then
@@ -29,24 +34,22 @@ else
     export INIT_WAIT_SEC="2"
 fi
 
+# Source the gitignored .envrc.local if it exists.
+if test -f .envrc.local; then
+    watch_file .envrc.local
+    source .envrc.local
+fi
+
 # (Example env vars if you're not using the make commands, i.e. the config files, to set up query engine tests)
 # export TEST_RUNNER="direct"
 # export TEST_CONNECTOR="postgres"
 # export TEST_CONNECTOR_VERSION="10"
 
-# Set up env vars and build inputs from flake.nix automatically for nix users.
+# Set up env vars and build inputs from shell.nix automatically for nix users.
 # If you don't use nix, you can safely ignore this.
-if command -v nix &> /dev/null
+# You can set the DISABLE_NIX environment variable if you're in an environment
+# where nix is pre-installed (e.g. gitpod) but you don't want to use it.
+if command -v nix &> /dev/null && [ -z ${DISABLE_NIX+x} ]
 then
-    if nix flake metadata > /dev/null; then
-        if type nix_direnv_watch_file &> /dev/null; then
-            nix_direnv_watch_file nix/shell.nix nix/all-engines.nix nix/args.nix
-        fi
-        use flake
-    fi
-fi
-
-# Source the gitignored .envrc.local if it exists.
-if test -f .envrc.local; then
-    source .envrc.local
+    use nix
 fi

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

@@ -0,0 +1,62 @@
+name: Build Engines for Apple Intel
+
+on:
+  workflow_call:
+    inputs:
+      commit:
+        description: 'Commit on the given branch to build'
+        type: string
+        required: false
+
+jobs:
+  build:
+    name: 'MacOS Intel engines build for commit ${{ inputs.commit }}'
+    env:
+      SQLITE_MAX_VARIABLE_NUMBER: 250000
+      SQLITE_MAX_EXPR_DEPTH: 10000
+
+      # minimum supported version of macOS
+      MACOSX_DEPLOYMENT_TARGET: 10.15
+    runs-on: macos-13
+
+    steps:
+      - name: Output link to real commit
+        run: echo ${{ github.repository }}/commit/${{ inputs.commit }}
+
+      - name: Checkout ${{ inputs.commit }}
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.commit }}
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - run: |
+          cargo build --release -p query-engine -p query-engine-node-api -p schema-engine-cli -p prisma-fmt
+
+      - name: Rename files
+        working-directory: ${{ github.workspace }}/target/release/
+        run: |
+          echo "Files in target/release before renaming"
+          ls -la .
+
+          mv libquery_engine.dylib libquery_engine.dylib.node
+
+          echo "Files in target/release after renaming"
+          ls -la .
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: darwin
+          path: |
+            ${{ 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.node