Keep track of SQL input

src/error.rs

@@ -136,6 +136,8 @@ pub enum Error {
         error: ffi::Error,
         /// error message
         msg: String,
+        /// SQL input
+        sql: String,
         /// byte offset of the start of invalid token
         offset: c_int,
     },
@@ -187,15 +189,17 @@ impl PartialEq for Error {
             (
                 Error::SqlInputError {
                     error: e1,
-                    msg: s1,
+                    msg: m1,
+                    sql: s1,
                     offset: o1,
                 },
                 Error::SqlInputError {
                     error: e2,
-                    msg: s2,
+                    msg: m2,
+                    sql: s2,
                     offset: o2,
                 },
-            ) => e1 == e2 && s1 == s2 && o1 == o2,
+            ) => e1 == e2 && m1 == m2 && s1 == s2 && o1 == o2,
             (..) => false,
         }
     }
@@ -309,8 +313,11 @@ impl fmt::Display for Error {
             Error::BlobSizeError => "Blob size is insufficient".fmt(f),
             #[cfg(feature = "modern_sqlite")]
             Error::SqlInputError {
-                ref msg, offset, ..
+                ref msg,
-            } => write!(f, "{} at offset {}", msg, offset),
+                offset,
+                ref sql,
+                ..
+            } => write!(f, "{} in {} at offset {}", msg, sql, offset),
         }
     }
 }
@@ -402,13 +409,13 @@ pub unsafe fn error_from_handle(db: *mut ffi::sqlite3, code: c_int) -> Error {
 
 #[cold]
 #[cfg(not(feature = "modern_sqlite"))]
-pub unsafe fn error_with_offset(db: *mut ffi::sqlite3, code: c_int) -> Error {
+pub unsafe fn error_with_offset(db: *mut ffi::sqlite3, code: c_int, sql: &str) -> Error {
     error_from_handle(db, code)
 }
 
 #[cold]
 #[cfg(feature = "modern_sqlite")] // 3.38.0
-pub unsafe fn error_with_offset(db: *mut ffi::sqlite3, code: c_int) -> Error {
+pub unsafe fn error_with_offset(db: *mut ffi::sqlite3, code: c_int, sql: &str) -> Error {
     if db.is_null() {
         error_from_sqlite_code(code, None)
     } else {
@@ -417,7 +424,12 @@ pub unsafe fn error_with_offset(db: *mut ffi::sqlite3, code: c_int) -> Error {
         if ffi::ErrorCode::Unknown == error.code {
             let offset = ffi::sqlite3_error_offset(db);
             if offset >= 0 {
-                return Error::SqlInputError { error, msg, offset };
+                return Error::SqlInputError {
+                    error,
+                    msg,
+                    sql: sql.to_owned(),
+                    offset,
+                };
             }
         }
         Error::SqliteFailure(error, Some(msg))

src/inner_connection.rs

@@ -257,7 +257,7 @@ impl InnerConnection {
         };
         // If there is an error, *ppStmt is set to NULL.
         if r != ffi::SQLITE_OK {
-            return Err(unsafe { error_with_offset(self.db, r) });
+            return Err(unsafe { error_with_offset(self.db, r, sql) });
         }
         // If the input text contains no SQL (if the input is an empty string or a
         // comment) then *ppStmt is set to NULL.

src/statement.rs

@@ -1537,7 +1537,7 @@ mod test {
     }
 
     #[test]
-    #[cfg(feature = "modern_sqlite")]
+    #[cfg(all(feature = "modern_sqlite", not(feature = "bundled-sqlcipher")))] // SQLite >= 3.38.0
     fn test_error_offset() -> Result<()> {
         use crate::ffi::ErrorCode;
         let db = Connection::open_in_memory()?;