reset statement where needed

Author: somtochiama

core/rs/core/src/changes_vtab_write.rs

@@ -41,15 +41,13 @@ fn did_cid_win(
     let col_vrsn_stmt_ref = tbl_info.get_col_version_stmt(db)?;
     let col_vrsn_stmt = col_vrsn_stmt_ref.as_ref().ok_or(ResultCode::ERROR)?;
 
-    let bind_result = col_vrsn_stmt.bind_int64(1, key);
+    let bind_result = col_vrsn_stmt
+        .bind_int64(1, key)
+        .and_then(|_| col_vrsn_stmt.bind_text(2, col_name, sqlite::Destructor::STATIC));
     if let Err(rc) = bind_result {
         reset_cached_stmt(col_vrsn_stmt.stmt)?;
         return Err(rc);
     }
-    if let Err(rc) = col_vrsn_stmt.bind_text(2, col_name, sqlite::Destructor::STATIC) {
-        reset_cached_stmt(col_vrsn_stmt.stmt)?;
-        return Err(rc);
-    }
 
     match col_vrsn_stmt.step() {
         Ok(ResultCode::ROW) => {
@@ -98,16 +96,13 @@ fn did_cid_win(
                 let col_site_id_stmt_ref = tbl_info.get_col_site_id_stmt(db)?;
                 let col_site_id_stmt = col_site_id_stmt_ref.as_ref().ok_or(ResultCode::ERROR)?;
 
-                let bind_result = col_site_id_stmt.bind_int64(1, key);
+                let bind_result = col_site_id_stmt.bind_int64(1, key).and_then(|_| {
+                    col_site_id_stmt.bind_text(2, col_name, sqlite::Destructor::STATIC)
+                });
                 if let Err(rc) = bind_result {
                     reset_cached_stmt(col_site_id_stmt.stmt)?;
                     return Err(rc);
                 }
-                if let Err(rc) = col_site_id_stmt.bind_text(2, col_name, sqlite::Destructor::STATIC)
-                {
-                    reset_cached_stmt(col_site_id_stmt.stmt)?;
-                    return Err(rc);
-                }
 
                 match col_site_id_stmt.step() {
                     Ok(ResultCode::ROW) => {
@@ -233,13 +228,9 @@ fn set_winner_clock(
     let set_stmt_ref = tbl_info.get_set_winner_clock_stmt(db)?;
     let set_stmt = set_stmt_ref.as_ref().ok_or(ResultCode::ERROR)?;
 
-    let bind_result = set_stmt.bind_int64(1, key);
-    if let Err(rc) = bind_result {
-        reset_cached_stmt(set_stmt.stmt)?;
-        return Err(rc);
-    }
     let bind_result = set_stmt
-        .bind_text(2, insert_col_name, sqlite::Destructor::STATIC)
+        .bind_int64(1, key)
+        .and_then(|_| set_stmt.bind_text(2, insert_col_name, sqlite::Destructor::STATIC))
         .and_then(|_| set_stmt.bind_int64(3, insert_col_vrsn))
         .and_then(|_| set_stmt.bind_int64(4, insert_db_vrsn))
         .and_then(|_| set_stmt.bind_int64(5, insert_seq))
@@ -369,9 +360,7 @@ unsafe fn merge_delete(
     (*ext_data).pSetSyncBitStmt.reset()?;
     reset_cached_stmt(delete_stmt.stmt)?;
 
-    let sync_rc = (*ext_data)
-        .pClearSyncBitStmt
-        .step();
+    let sync_rc = (*ext_data).pClearSyncBitStmt.step();
 
     (*ext_data).pClearSyncBitStmt.reset()?;
     if let Err(sync_rc) = sync_rc {
@@ -428,12 +417,9 @@ fn get_local_cl(
     let local_cl_stmt_ref = tbl_info.get_local_cl_stmt(db)?;
     let local_cl_stmt = local_cl_stmt_ref.as_ref().ok_or(ResultCode::ERROR)?;
 
-    let rc = local_cl_stmt.bind_int64(1, key);
-    if let Err(rc) = rc {
-        reset_cached_stmt(local_cl_stmt.stmt)?;
-        return Err(rc);
-    }
-    let rc = local_cl_stmt.bind_int64(2, key);
+    let rc = local_cl_stmt
+        .bind_int64(1, key)
+        .and_then(|_| local_cl_stmt.bind_int64(2, key));
     if let Err(rc) = rc {
         reset_cached_stmt(local_cl_stmt.stmt)?;
         return Err(rc);

core/rs/core/src/tableinfo.rs

@@ -111,7 +111,10 @@ impl TableInfo {
         let stmt_ref = self.get_select_key_stmt(db)?;
         let stmt = stmt_ref.as_ref().ok_or(ResultCode::ERROR)?;
         for (i, pk) in pks.iter().enumerate() {
-            stmt.bind_value(i as i32 + 1, *pk)?;
+            if let Err(rc) = stmt.bind_value(i as i32 + 1, *pk) {
+                stmt.clear_bindings()?;
+                return Err(rc);
+            }
         }
         match stmt.step() {
             Ok(ResultCode::DONE) => {
@@ -141,7 +144,10 @@ impl TableInfo {
         let stmt_ref = self.get_insert_or_ignore_returning_key_stmt(db)?;
         let stmt = stmt_ref.as_ref().ok_or(ResultCode::ERROR)?;
         for (i, pk) in pks.iter().enumerate() {
-            stmt.bind_value(i as i32 + 1, *pk)?;
+            if let Err(rc) = stmt.bind_value(i as i32 + 1, *pk) {
+                stmt.clear_bindings()?;
+                return Err(rc);
+            }
         }
         match stmt.step() {
             Ok(ResultCode::DONE) => {
@@ -208,7 +214,10 @@ impl TableInfo {
         let stmt_ref = self.get_insert_key_stmt(db)?;
         let stmt = stmt_ref.as_ref().ok_or(ResultCode::ERROR)?;
         for (i, pk) in pks.iter().enumerate() {
-            stmt.bind_value(i as i32 + 1, *pk)?;
+            if let Err(rc) = stmt.bind_value(i as i32 + 1, *pk) {
+                stmt.clear_bindings()?;
+                return Err(rc);
+            }
         }
         match stmt.step() {
             Ok(ResultCode::ROW) => {
@@ -478,15 +487,15 @@ impl TableInfo {
             // from the old pk can override the ones from the new at a node
             // following our changes.
             let sql = format!(
-            "UPDATE OR REPLACE \"{table_name}__crsql_clock\" SET
-                key = ?,
-                db_version = ?,
-                seq = ?,
-                col_version = col_version + 1,
-                site_id = 0
-            WHERE
-                key = ? AND col_name = ?",
-              table_name = crate::util::escape_ident(&self.tbl_name),
+                "UPDATE OR REPLACE \"{table_name}__crsql_clock\" SET
+                    key = ?,
+                    db_version = ?,
+                    seq = ?,
+                    col_version = col_version + 1,
+                    site_id = 0
+                WHERE
+                    key = ? AND col_name = ?",
+                table_name = crate::util::escape_ident(&self.tbl_name),
             );
             let ret = db.prepare_v3(&sql, sqlite::PREPARE_PERSISTENT)?;
             *self.move_non_sentinels_stmt.try_borrow_mut()? = Some(ret);