From aaed047eb412883a6f87de7511f5fb916aa616d5 Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Fri, 17 Nov 2023 16:24:44 +0100 Subject: [PATCH 1/2] test(qe): update expected error in SQLite tests with driver adapters (#4462) The error message was changed in https://github.com/prisma/prisma-engines/pull/4429 but wasn't updated in the tests which resulted in them failing on main. https://github.com/prisma/prisma-engines/pull/4429 --- .../query-engine-tests/tests/new/regressions/prisma_15204.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/prisma_15204.rs b/query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/prisma_15204.rs index ccf04dd2f4af..179011108cb7 100644 --- a/query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/prisma_15204.rs +++ b/query-engine/connector-test-kit-rs/query-engine-tests/tests/new/regressions/prisma_15204.rs @@ -46,7 +46,7 @@ mod conversion_error { runner, r#"query { findManyTestModel { field } }"#, 2023, - "Inconsistent column data: Conversion failed: number must be an integer in column 'field'" + "Inconsistent column data: Conversion failed: number must be an integer in column 'field', got '1.84467440724388e19'" ); Ok(()) @@ -74,7 +74,7 @@ mod conversion_error { runner, r#"query { findManyTestModel { field } }"#, 2023, - "Inconsistent column data: Conversion failed: number must be an i64 in column 'field'" + "Inconsistent column data: Conversion failed: number must be an integer in column 'field', got '1.84467440724388e19'" ); Ok(()) From 3541054b2723c17a158e5e1990ca581461756f1b Mon Sep 17 00:00:00 2001 From: jkomyno Date: Fri, 17 Nov 2023 16:30:14 +0100 Subject: [PATCH 2/2] fix(driver-adapters): ci for "request-handlers" --- query-engine/connectors/sql-query-connector/Cargo.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/query-engine/connectors/sql-query-connector/Cargo.toml b/query-engine/connectors/sql-query-connector/Cargo.toml index fa9c32ef88e1..9ed0b4070056 100644 --- a/query-engine/connectors/sql-query-connector/Cargo.toml +++ b/query-engine/connectors/sql-query-connector/Cargo.toml @@ -26,9 +26,14 @@ tracing-futures = "0.2" uuid.workspace = true opentelemetry = { version = "0.17", features = ["tokio"] } tracing-opentelemetry = "0.17.3" -quaint = { path = "../../../quaint" } cuid = { git = "https://github.com/prisma/cuid-rust", branch = "wasm32-support" } +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +quaint.workspace = true + +[target.'cfg(target_arch = "wasm32")'.dependencies] +quaint = { path = "../../../quaint" } + [dependencies.connector-interface] package = "query-connector" path = "../query-connector"