diff --git a/Makefile b/Makefile index 94b3d539f97..cdf3b0f9538 100644 --- a/Makefile +++ b/Makefile @@ -309,13 +309,13 @@ build-qe-napi: build-qe-wasm: cd query-engine/query-engine-wasm && ./build.sh -build-connector-kit-js: build-driver-adapters +build-connector-kit-js: install-driver-adapters cd query-engine/driver-adapters && pnpm i && pnpm build -build-driver-adapters: ensure-prisma-present - @echo "Building driver adapters..." +install-driver-adapters: ensure-prisma-present + @echo "Installing dependencies for driver adapters..." @cd ../prisma && pnpm --filter "*adapter*" i - @echo "Driver adapters build completed."; + @echo "Dependencies for driver adapters installed."; ensure-prisma-present: @if [ -d ../prisma ]; then \ diff --git a/docker-compose.yml b/docker-compose.yml index 8ee1ef117ce..ee9e7f81958 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -123,7 +123,7 @@ services: networks: - databases - planetscale: + planetscale-vitess8: build: ./docker/planetscale_proxy environment: MYSQL_HOST: 'planetscale-mysql' diff --git a/query-engine/connector-test-kit-rs/test-configs/neon-ws-postgres13 b/query-engine/connector-test-kit-rs/test-configs/neon-ws-postgres13 index b43657378f2..ac76377ac66 100644 --- a/query-engine/connector-test-kit-rs/test-configs/neon-ws-postgres13 +++ b/query-engine/connector-test-kit-rs/test-configs/neon-ws-postgres13 @@ -2,6 +2,6 @@ "connector": "postgres", "version": "neon.js", "driver_adapter": "neon:ws", - "driver_adapter_config": { "proxyUrl": "127.0.0.1:5488/v1" }, + "driver_adapter_config": { "proxy_url": "127.0.0.1:5488/v1" }, "external_test_executor": "Napi" } \ No newline at end of file diff --git a/query-engine/connector-test-kit-rs/test-configs/neon-ws-postgres13-wasm b/query-engine/connector-test-kit-rs/test-configs/neon-ws-postgres13-wasm index 6b1e9c0d128..2697c522739 100644 --- a/query-engine/connector-test-kit-rs/test-configs/neon-ws-postgres13-wasm +++ b/query-engine/connector-test-kit-rs/test-configs/neon-ws-postgres13-wasm @@ -2,6 +2,6 @@ "connector": "postgres", "version": "13", "driver_adapter": "neon:ws", - "driver_adapter_config": { "proxyUrl": "127.0.0.1:5488/v1" }, + "driver_adapter_config": { "proxy_url": "127.0.0.1:5488/v1" }, "external_test_executor": "Wasm" } \ No newline at end of file diff --git a/query-engine/connector-test-kit-rs/test-configs/planetscale-vitess8 b/query-engine/connector-test-kit-rs/test-configs/planetscale-vitess8 index b823cc10699..327ad94ba66 100644 --- a/query-engine/connector-test-kit-rs/test-configs/planetscale-vitess8 +++ b/query-engine/connector-test-kit-rs/test-configs/planetscale-vitess8 @@ -1,7 +1,9 @@ { "connector": "vitess", - "version": "8.0", + "version": "planetscale.js", "driver_adapter": "planetscale", - "driver_adapter_config": { "proxyUrl": "http://root:root@127.0.0.1:8085" }, + "driver_adapter_config": { + "proxy_url": "http://root:root@127.0.0.1:8085" + }, "external_test_executor": "Napi" } diff --git a/query-engine/connector-test-kit-rs/test-configs/planetscale-vitess8-wasm b/query-engine/connector-test-kit-rs/test-configs/planetscale-vitess8-wasm index d4ee0627759..62dd895e970 100644 --- a/query-engine/connector-test-kit-rs/test-configs/planetscale-vitess8-wasm +++ b/query-engine/connector-test-kit-rs/test-configs/planetscale-vitess8-wasm @@ -1,7 +1,9 @@ { "connector": "vitess", - "version": "8.0", + "version": "planetscale.js", "driver_adapter": "planetscale", - "driver_adapter_config": { "proxyUrl": "http://root:root@127.0.0.1:8085" }, + "driver_adapter_config": { + "proxy_url": "http://root:root@127.0.0.1:8085" + }, "external_test_executor": "Wasm" }