Skip to content

Commit

Permalink
Adjust makefile and fix wasm build
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Tatarintsev committed Nov 21, 2023
1 parent a7dea5e commit 7eaf3cf
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,11 @@ ifndef DRIVER_ADAPTER
cargo test --package query-engine-tests
else
@echo "Executing query engine tests with $(DRIVER_ADAPTER) driver adapter"; \
# Add your actual command for the "test-driver-adapter" task here
$(MAKE) test-driver-adapter-$(DRIVER_ADAPTER);
if [ "$(ENGINE)" = "wasm" ]; then \
$(MAKE) test-driver-adapter-$(DRIVER_ADAPTER)-wasm; \
else \
$(MAKE) test-driver-adapter-$(DRIVER_ADAPTER); \
fi
endif

test-qe-verbose:
Expand Down Expand Up @@ -95,6 +98,7 @@ dev-libsql-sqlite-wasm: build-qe-wasm build-connector-kit-js
cp $(CONFIG_PATH)/libsql-sqlite-wasm $(CONFIG_FILE)

test-libsql-sqlite-wasm: dev-libsql-sqlite-wasm test-qe-st
test-driver-adapter-libsql-sqlite-wasm: test-libsql-sqlite-wasm

start-postgres9:
docker compose -f docker-compose.yml up --wait -d --remove-orphans postgres9
Expand Down Expand Up @@ -139,6 +143,7 @@ dev-pg-postgres13-wasm: start-pg-postgres13 build-qe-wasm build-connector-kit-js
test-pg-postgres13-wasm: dev-pg-postgres13-wasm test-qe-st

test-driver-adapter-pg: test-pg-postgres13
test-driver-adapter-pg-wasm: test-pg-postgres13-wasm

start-neon-postgres13:
docker compose -f docker-compose.yml up --wait -d --remove-orphans neon-postgres13
Expand All @@ -154,6 +159,7 @@ dev-neon-ws-postgres13-wasm: start-neon-postgres13 build-qe-wasm build-connector
test-neon-ws-postgres13-wasm: dev-neon-ws-postgres13-wasm test-qe-st

test-driver-adapter-neon: test-neon-ws-postgres13
test-driver-adapter-neon-wasm: test-neon-ws-postgres13-wasm

start-postgres14:
docker compose -f docker-compose.yml up --wait -d --remove-orphans postgres14
Expand Down Expand Up @@ -291,6 +297,7 @@ dev-planetscale-vitess8-wasm: start-planetscale-vitess8 build-qe-wasm build-conn
test-planetscale-vitess8-wasm: dev-planetscale-vitess8-wasm test-qe-st

test-driver-adapter-planetscale: test-planetscale-vitess8
test-driver-adapter-planetscale-wasm: test-planetscale-vitess8-wasm

######################
# Local dev commands #
Expand Down
4 changes: 2 additions & 2 deletions query-engine/query-engine-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ user-facing-errors = { path = "../../libs/user-facing-errors" }
psl.workspace = true
prisma-models = { path = "../prisma-models" }
quaint = { path = "../../quaint" }
request-handlers = { path = "../request-handlers", default-features = false, features = ["sql", "driver-adapters"] }
# request-handlers = { path = "../request-handlers", default-features = false, features = ["sql", "driver-adapters"] }
connector = { path = "../connectors/query-connector", package = "query-connector" }
sql-query-connector = { path = "../connectors/sql-query-connector" }
query-core = { path = "../core" }

thiserror = "1"
connection-string.workspace = true
connection-string.workspace = true
url = "2"
serde_json.workspace = true
serde.workspace = true
Expand Down

0 comments on commit 7eaf3cf

Please sign in to comment.