chore(driver-adapters): refactor query-engine test executor, in prepa…

…ration for schema-engine-wasm playground
prisma · Dec 29, 2024 · f8daf75 · f8daf75
1 parent cc0167b
commit f8daf75
Show file tree

Hide file tree

Showing 19 changed files with 679 additions and 650 deletions.
diff --git a/query-engine/connector-test-kit-rs/README.md b/query-engine/connector-test-kit-rs/README.md
@@ -89,7 +89,7 @@ To run tests through a driver adapters, you should also configure the following
 Example:
 
 ```shell
-export EXTERNAL_TEST_EXECUTOR="$WORKSPACE_ROOT/query-engine/driver-adapters/executor/script/testd.sh"
+export EXTERNAL_TEST_EXECUTOR="$WORKSPACE_ROOT/query-engine/driver-adapters/executor/script/testd-qe.sh"
 export DRIVER_ADAPTER=neon
 export ENGINE=wasm
 export DRIVER_ADAPTER_CONFIG ='{ "proxyUrl": "127.0.0.1:5488/v1" }'

diff --git a/query-engine/connector-test-kit-rs/query-tests-setup/src/config.rs b/query-engine/connector-test-kit-rs/query-tests-setup/src/config.rs
@@ -348,7 +348,7 @@ impl TestConfig {
     }
 
     pub fn external_test_executor_path(&self) -> Option<String> {
-        const DEFAULT_TEST_EXECUTOR: &str = "query-engine/driver-adapters/executor/script/testd.sh";
+        const DEFAULT_TEST_EXECUTOR: &str = "query-engine/driver-adapters/executor/script/testd-qe.sh";
         self.with_driver_adapter()
             .and_then(|_| {
                 Self::workspace_root().or_else(|| {

diff --git a/query-engine/driver-adapters/executor/package.json b/query-engine/driver-adapters/executor/package.json
@@ -8,8 +8,8 @@
   "description": "",
   "private": true,
   "scripts": {
-    "build": "tsup ./src/testd.ts ./src/bench.ts --format esm --dts",
-    "test": "node --import tsx ./src/testd.ts",
+    "build": "tsup ./src/testd-qe.ts ./src/bench.ts --format esm --dts",
+    "test:qe": "node --import tsx ./src/testd-qe.ts",
     "clean:d1": "rm -rf ../../connector-test-kit-rs/query-engine-tests/.wrangler"
   },
   "tsup": {

diff --git a/query-engine/driver-adapters/executor/script/testd-qe.sh b/query-engine/driver-adapters/executor/script/testd-qe.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+node "$(dirname "${BASH_SOURCE[0]}")/../dist/testd-qe.mjs"
diff --git a/query-engine/driver-adapters/executor/script/testd.sh b/query-engine/driver-adapters/executor/script/testd.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/usr/bin/env bash
		node "$(dirname "${BASH_SOURCE[0]}")/../dist/testd-qe.mjs"