Skip to content

Commit

Permalink
Ammends after merge
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelff committed Nov 22, 2023
1 parent 27eff23 commit b152f82
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ services:
networks:
- databases

planetscale:
planetscale-vitess8:
build: ./docker/planetscale_proxy
environment:
MYSQL_HOST: 'planetscale-mysql'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Original file line number Diff line number Diff line change
@@ -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"
}
Original file line number Diff line number Diff line change
@@ -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"
}

0 comments on commit b152f82

Please sign in to comment.