Skip to content

Commit 89654d3

Browse files
committed
more verbose sqlite errors
1 parent bf18947 commit 89654d3

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

lib/sqlsync-reducer/examples/guest.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ async fn reducer(mutation: Vec<u8>) -> Result<(), ReducerError> {
3535
let result = query_future.await;
3636
log::info!("final query result: {:?}", result);
3737

38-
log::info!("testing errors");
3938
if let Err(err) = execute!("FAIL").await {
40-
log::error!("error: {:?}", err);
39+
log::info!("received expected error: {:?}", err);
4140
} else {
42-
panic!("expected error");
41+
panic!("failed to receive expected error");
4342
}
4443

4544
log::info!("make sure we can resume queries after an error");

lib/sqlsync-reducer/examples/host.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ fn main() -> anyhow::Result<()> {
6565
}
6666
Request::Exec { sql, params } => {
6767
log::info!("received exec request: {} {:?}", sql, params);
68-
log::info!("the following error is EXPECTED");
6968
if sql == "FAIL" {
7069
let ptr = ffi.encode(
7170
&mut store,

lib/sqlsync/src/reducer.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,12 @@ fn to_sqlite_value(v: ValueRef) -> SqliteValue {
182182

183183
fn rusqlite_err_to_response_err(e: rusqlite::Error) -> ErrorResponse {
184184
match e {
185-
rusqlite::Error::SqliteFailure(e, _) => ErrorResponse::SqliteError {
185+
rusqlite::Error::SqliteFailure(e, extra) => ErrorResponse::SqliteError {
186186
code: e.extended_code,
187-
message: format!("{}", e),
187+
message: match extra {
188+
Some(extra) => format!("{}: {}", e, extra),
189+
None => format!("{}", e),
190+
},
188191
},
189192
other => ErrorResponse::Unknown(format!("{}", other)),
190193
}

0 commit comments

Comments
 (0)