Some updates related to extra_check feature

gwenn · gwenn · commit 0de702060378 · 2025-04-19T09:59:56.000+02:00
Specify that query passed to `execute` should have no tail.
Remove unreliable check in `execute_batch` (unreliable for at least for PRAGMA).
diff --git a/README.md b/README.md
@@ -135,7 +135,7 @@ features](https://doc.rust-lang.org/cargo/reference/manifest.html#the-features-s
 * `i128_blob` allows storing values of type `i128` type in SQLite databases. Internally, the data is stored as a 16 byte big-endian blob, with the most significant bit flipped, which allows ordering and comparison between different blobs storing i128s to work as expected.
 * `uuid` allows storing and retrieving `Uuid` values from the [`uuid`](https://docs.rs/uuid/) crate using blobs.
 * [`session`](https://sqlite.org/sessionintro.html), Session module extension. Requires `buildtime_bindgen` feature. (Implies `hooks`.)
-* `extra_check` fail when a query passed to execute is readonly or has a column count > 0.
+* `extra_check` fails when a query passed to `execute` has tail or is readonly and has a column count > 0.
 * `column_decltype` provides `columns()` method for Statements and Rows; omit if linking to a version of SQLite/SQLCipher compiled with `-DSQLITE_OMIT_DECLTYPE`.
 * `collation` exposes [`sqlite3_create_collation_v2`](https://sqlite.org/c3ref/create_collation.html).
 * `serialize` exposes [`sqlite3_serialize`](http://sqlite.org/c3ref/serialize.html) (3.23.0).
@@ -256,4 +256,3 @@ Both of these are quite permissive, have no bearing on the license of the code i
 ## Minimum supported Rust version (MSRV)
 
 Latest stable Rust version at the time of release. It might compile with older versions.
-
diff --git a/src/lib.rs b/src/lib.rs
@@ -567,9 +567,11 @@ impl Connection {
         let mut sql = sql;
         while !sql.is_empty() {
             let stmt = self.prepare(sql)?;
-            if !stmt.stmt.is_null() && stmt.step()? && cfg!(feature = "extra_check") {
+            if !stmt.stmt.is_null() && stmt.step()? {
                 // Some PRAGMA may return rows
-                return Err(Error::ExecuteReturnedResults);
+                if false {
+                    return Err(Error::ExecuteReturnedResults);
+                }
             }
             let tail = stmt.stmt.tail();
             if tail == 0 || tail >= sql.len() {
@@ -1510,6 +1512,8 @@ mod test {
         db.execute_batch("UPDATE foo SET x = 3 WHERE x < 3")?;
 
         db.execute_batch("INVALID SQL").unwrap_err();
+
+        db.execute_batch("PRAGMA locking_mode = EXCLUSIVE")?;
         Ok(())
     }
 
@@ -1558,6 +1562,11 @@ mod test {
             Error::MultipleStatement => (),
             _ => panic!("Unexpected error: {err}"),
         }
+        if false {
+            // FIXME
+            db.execute("CREATE TABLE t(c); -- bim", [])
+                .expect("Tail comment should be ignored");
+        }
     }
 
     #[test]
@@ -2192,7 +2201,6 @@ mod test {
     }
 
     #[test]
-    #[cfg(not(feature = "extra_check"))]
     fn test_alter_table() -> Result<()> {
         let db = Connection::open_in_memory()?;
         db.execute_batch("CREATE TABLE x(t);")?;
diff --git a/src/pragma.rs b/src/pragma.rs
@@ -427,12 +427,7 @@ mod test {
     #[test]
     fn locking_mode() -> Result<()> {
         let db = Connection::open_in_memory()?;
-        let r = db.pragma_update(None, "locking_mode", "exclusive");
-        if cfg!(feature = "extra_check") {
-            r.unwrap_err();
-        } else {
-            r?;
-        }
+        db.pragma_update(None, "locking_mode", "exclusive")?;
         Ok(())
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -427,12 +427,7 @@ mod test {`
`427`	`427`	`#[test]`
`428`	`428`	`fn locking_mode() -> Result<()> {`
`429`	`429`	`let db = Connection::open_in_memory()?;`
`430`		`- let r = db.pragma_update(None, "locking_mode", "exclusive");`
`431`		`- if cfg!(feature = "extra_check") {`
`432`		`- r.unwrap_err();`
`433`		`- } else {`
`434`		`- r?;`
`435`		`- }`
	`430`	`+ db.pragma_update(None, "locking_mode", "exclusive")?;`
`436`	`431`	`Ok(())`
`437`	`432`	`}`
`438`	`433`	`}`