Skip to content

Commit 9c30299

Browse files
authored
1 parent 3293398 commit 9c30299

23 files changed

Lines changed: 84 additions & 83 deletions

File tree

.github/workflows/test-query-engine.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ jobs:
228228
- name: 'd1 (wasm)'
229229
setup_task: 'dev-d1'
230230
- name: 'better-sqlite3 (wasm)'
231-
setup_task: 'dev-better-sqlite3'
231+
setup_task: 'dev-better-sqlite3-wasm'
232232
- name: 'mssql (wasm)'
233233
setup_task: 'dev-mssql-wasm'
234234
- name: 'mariadb (wasm)'

Makefile

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -194,17 +194,11 @@ dev-d1: build-qe-wasm build-se-wasm build-driver-adapters-kit-qe
194194
test-d1: dev-d1 test-qe-st
195195
test-driver-adapter-d1: test-d1
196196

197-
dev-better-sqlite3: build-qe-wasm build-se-wasm build-driver-adapters-kit-qe
198-
cp $(CONFIG_PATH)/better-sqlite3 $(CONFIG_FILE)
197+
dev-better-sqlite3-wasm: build-qe-wasm build-se-wasm build-driver-adapters-kit-qe
198+
cp $(CONFIG_PATH)/better-sqlite3-wasm $(CONFIG_FILE)
199199

200-
test-better-sqlite3: dev-better-sqlite3 test-qe-st
201-
test-driver-adapter-better-sqlite3: test-better-sqlite3
202-
203-
dev-sqlite3: build-qe-wasm build-se-wasm build-driver-adapters-kit-qe
204-
cp $(CONFIG_PATH)/sqlite3 $(CONFIG_FILE)
205-
206-
test-sqlite3: dev-sqlite3 test-qe-st
207-
test-driver-adapter-sqlite3: test-sqlite3
200+
test-better-sqlite3-wasm: dev-better-sqlite3-wasm test-qe-st
201+
test-driver-adapter-better-sqlite3-wasm: test-better-sqlite3-wasm
208202

209203
start-postgres9:
210204
docker compose -f docker-compose.yml up --wait -d --remove-orphans postgres9

libs/user-facing-errors/src/query_engine/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ pub struct InputError {
200200
}
201201

202202
#[derive(Debug, UserFacingError, Serialize)]
203-
#[user_facing(code = "P2020", message = "Value out of range for the type. {details}")]
203+
#[user_facing(code = "P2020", message = "Value out of range for the type: {details}")]
204204
pub struct ValueOutOfRange {
205205
pub details: String,
206206
}

quaint/src/connector/mssql/error.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,17 @@ impl From<MssqlError> for Error {
212212

213213
builder.build()
214214
}
215+
108 | 168 | 183 | 187 | 220 | 232 | 236 | 242 | 244 | 248 | 294 | 296 | 298 | 304 | 517 | 535 | 1007
216+
| 1080 | 2386 | 2568 | 2570 | 2579 | 2742 | 2950 | 3194 | 3250 | 3606 | 3995 | 4079 | 4867 | 6244
217+
| 6398 | 6937 | 6938 | 6960 | 7116 | 7135 | 7722 | 7810 | 7981 | 8115 | 8165 | 8351 | 8411 | 8727
218+
| 8729 | 8968 | 8991 | 9109 | 9204 | 9526 | 9527 | 9746 | 9813 | 9835 | 9838 | 9839 => {
219+
let mut builder = Error::builder(ErrorKind::value_out_of_range(error.message.clone()));
220+
221+
builder.set_original_code(error.code.to_string());
222+
builder.set_original_message(error.message);
223+
224+
builder.build()
225+
}
215226
_ => {
216227
let kind = ErrorKind::QueryError(error.clone().into());
217228

quaint/src/error/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ impl From<std::io::Error> for Error {
259259
}
260260

261261
impl ErrorKind {
262-
#[cfg(feature = "mysql-native")]
263262
pub(crate) fn value_out_of_range(msg: impl Into<String>) -> Self {
264263
Self::ValueOutOfRange { message: msg.into() }
265264
}

query-compiler/query-engine-tests-todo/better-sqlite3/fail/query

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
new::interactive_tx::interactive_tx::batch_queries_failure
2-
new::regressions::max_integer::max_integer::unfitted_int_should_fail
32
new::regressions::prisma_7434::not_in_chunking::not_in_batch_filter
43
queries::aggregation::group_by::aggregation_group_by::group_by_ordering_sum_aggregation
54
queries::chunking::chunking::order_by_aggregation_should_fail

query-compiler/query-engine-tests-todo/libsql/fail/query

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
new::interactive_tx::interactive_tx::batch_queries_failure
2-
new::regressions::max_integer::max_integer::unfitted_int_should_fail
32
new::regressions::prisma_15204::conversion_error::convert_to_bigint_sqlite_js
43
new::regressions::prisma_15204::conversion_error::convert_to_int_sqlite_js
54
new::regressions::prisma_7434::not_in_chunking::not_in_batch_filter

query-compiler/query-engine-tests-todo/mssql/fail/query

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
new::regressions::max_integer::max_integer::unfitted_int_should_fail
2-
new::regressions::max_integer::max_integer::unfitted_int_should_fail_mssql
31
new::regressions::prisma_7434::not_in_chunking::not_in_batch_filter
42
queries::aggregation::group_by::aggregation_group_by::group_by_ordering_sum_aggregation
53
queries::chunking::chunking::order_by_aggregation_should_fail

query-compiler/query-engine-tests-todo/neon/fail/join

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
new::regressions::max_integer::max_integer::unfitted_int_should_fail
2-
new::regressions::max_integer::max_integer::unfitted_int_should_fail_pg_js
31
new::regressions::prisma_13097::prisma_13097::group_by_boolean_array
42
new::regressions::prisma_13097::prisma_13097::group_by_enum_array
53
new::regressions::prisma_7434::not_in_chunking::not_in_batch_filter

query-compiler/query-engine-tests-todo/neon/fail/query

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
new::regressions::max_integer::max_integer::unfitted_int_should_fail
2-
new::regressions::max_integer::max_integer::unfitted_int_should_fail_pg_js
31
new::regressions::prisma_13097::prisma_13097::group_by_boolean_array
42
new::regressions::prisma_13097::prisma_13097::group_by_enum_array
53
new::regressions::prisma_7434::not_in_chunking::not_in_batch_filter

0 commit comments

Comments
 (0)