Merge pull request #7 from superfly/fix-warnings

Fix warnings

Author: somtochiama

core/rs/core/src/c.rs

@@ -9,7 +9,7 @@ use sqlite_nostd as sqlite;
 
 pub static INSERT_SENTINEL: &str = "-1";
 pub static DELETE_SENTINEL: &str = "-1";
-pub static DB_VERSION_SCHEMA_VERSION: c_int = 0;
+pub static _DB_VERSION_SCHEMA_VERSION: c_int = 0;
 pub static TABLE_INFO_SCHEMA_VERSION: c_int = 1;
 
 #[derive(FromPrimitive, PartialEq, Debug)]

core/rs/core/src/changes_vtab_write.rs

@@ -90,7 +90,7 @@ fn did_cid_win(
     match step_result {
         Ok(ResultCode::ROW) => {
             let local_value = col_val_stmt.column_value(0)?;
-            let mut ret = crsql_compare_sqlite_values(insert_val, local_value);
+            let ret = crsql_compare_sqlite_values(insert_val, local_value);
             reset_cached_stmt(col_val_stmt.stmt)?;
             if ret == 0 && unsafe { (*ext_data).mergeEqualValues == 1 } {
                 // values are the same (ret == 0) and the option to tie break on site_id is true
@@ -215,7 +215,7 @@ fn set_winner_clock(
                     );
 
                     if let Err(rc) = bind_result {
-                        reset_cached_stmt((*ext_data).pSetSiteIdOrdinalStmt);
+                        reset_cached_stmt((*ext_data).pSetSiteIdOrdinalStmt)?;
                         return Err(rc);
                     }
 
@@ -322,7 +322,7 @@ fn merge_sentinel_only_insert(
     }
 
     if rc.is_ok() {
-        zero_clocks_on_resurrect(db, tbl_info, key, remote_db_vsn)?;
+        zero_clocks_on_resurrect(db, tbl_info, key)?;
         return set_winner_clock(
             db,
             ext_data,
@@ -344,7 +344,6 @@ fn zero_clocks_on_resurrect(
     db: *mut sqlite3,
     tbl_info: &TableInfo,
     key: sqlite::int64,
-    insert_db_vrsn: sqlite::int64,
 ) -> Result<ResultCode, ResultCode> {
     let zero_stmt_ref = tbl_info.get_zero_clocks_on_resurrect_stmt(db)?;
     let zero_stmt = zero_stmt_ref.as_ref().ok_or(ResultCode::ERROR)?;

core/rs/core/src/consts.rs

@@ -12,8 +12,7 @@ pub const TBL_SCHEMA: &'static str = "crsql_master";
 // and, if we ever need it, we can track individual builds of a patch release
 // 00_05_01_01
 pub const CRSQLITE_VERSION: i32 = 17_00_00;
-pub const CRSQLITE_VERSION_STR: &'static str = "0.17.0";
-pub const CRSQLITE_VERSION_0_15_0: i32 = 15_00_00;
+pub const _CRSQLITE_VERSION_STR: &'static str = "0.17.0";
 pub const CRSQLITE_VERSION_0_17_0: i32 = 17_00_00;
 
 pub const SITE_ID_LEN: i32 = 16;

core/rs/core/src/db_version.rs

@@ -14,11 +14,8 @@ use sqlite_nostd as sqlite;
 
 use crate::c::crsql_ExtData;
 use crate::c::crsql_fetchPragmaDataVersion;
-use crate::c::crsql_fetchPragmaSchemaVersion;
-use crate::c::DB_VERSION_SCHEMA_VERSION;
 use crate::consts::MIN_POSSIBLE_DB_VERSION;
 use crate::consts::SITE_ID_LEN;
-use crate::ext_data::recreate_db_version_stmt;
 use crate::stmt_cache::reset_cached_stmt;
 #[no_mangle]
 pub extern "C" fn crsql_fill_db_version_if_needed(
@@ -135,7 +132,7 @@ pub fn fill_db_version_if_needed(
 }
 
 pub fn fetch_db_version_from_storage(
-    db: *mut sqlite3,
+    _db: *mut sqlite3,
     ext_data: *mut crsql_ExtData,
 ) -> Result<ResultCode, String> {
     unsafe {

core/rs/core/src/debug.rs

@@ -1,6 +1,3 @@
-use alloc::format;
-use alloc::string::String;
-use core::ffi::c_void;
 use sqlite::{context, value};
 use sqlite_nostd as sqlite;
 

core/rs/core/src/lib.rs

@@ -337,6 +337,23 @@ pub extern "C" fn sqlite3_crsqlcore_init(
         return null_mut();
     }
 
+    let rc = db
+    .create_function_v2(
+        "crsql_version",
+        0,
+        sqlite::UTF8 | sqlite::INNOCUOUS | sqlite::DETERMINISTIC,
+        None,
+        Some(x_crsql_version),
+        None,
+        None,
+        None,
+    )
+    .unwrap_or(ResultCode::ERROR);
+if rc != ResultCode::OK {
+    unsafe { crsql_freeExtData(ext_data) };
+    return null_mut();
+}
+
     let rc = db
         .create_function_v2(
             "crsql_increment_and_get_seq",
@@ -903,8 +920,8 @@ unsafe extern "C" fn x_crsql_db_version(
  */
 unsafe extern "C" fn x_crsql_next_db_version(
     ctx: *mut sqlite::context,
-    argc: i32,
-    argv: *mut *mut sqlite::value,
+    _argc: i32,
+    _argv: *mut *mut sqlite::value,
 ) {
     let ext_data = ctx.user_data() as *mut c::crsql_ExtData;
     let db = ctx.db_handle();
@@ -962,8 +979,8 @@ unsafe extern "C" fn x_crsql_set_db_version(
  */
 unsafe extern "C" fn x_crsql_peek_next_db_version(
     ctx: *mut sqlite::context,
-    argc: i32,
-    argv: *mut *mut sqlite::value,
+    _argc: i32,
+    _argv: *mut *mut sqlite::value,
 ) {
     let ext_data = ctx.user_data() as *mut c::crsql_ExtData;
     let db = ctx.db_handle();
@@ -984,16 +1001,16 @@ unsafe extern "C" fn x_crsql_peek_next_db_version(
  */
 unsafe extern "C" fn x_crsql_sha(
     ctx: *mut sqlite::context,
-    argc: i32,
-    argv: *mut *mut sqlite::value,
+    _argc: i32,
+    _argv: *mut *mut sqlite::value,
 ) {
     ctx.result_text_static(sha::SHA);
 }
 
 unsafe extern "C" fn x_crsql_version(
     ctx: *mut sqlite::context,
-    argc: i32,
-    argv: *mut *mut sqlite::value,
+    _argc: i32,
+    _argv: *mut *mut sqlite::value,
 ) {
     ctx.result_int64(consts::CRSQLITE_VERSION as i64);
 }

core/rs/core/src/local_writes/after_update.rs

@@ -200,30 +200,6 @@ fn after_update__move_non_pk_col(
     super::step_trigger_stmt(move_non_pk_col_stmt)
 }
 
-// TODO: in the future we can keep sentinel information in the lookaside
-#[allow(non_snake_case)]
-fn after_update__move_non_sentinels(
-    db: *mut sqlite3,
-    tbl_info: &TableInfo,
-    new_key: sqlite::int64,
-    old_key: sqlite::int64,
-) -> Result<ResultCode, String> {
-    let move_non_sentinels_stmt_ref = tbl_info
-        .get_move_non_sentinels_stmt(db)
-        .or_else(|_| Err("failed to get move_non_sentinels_stmt"))?;
-    let move_non_sentinels_stmt = move_non_sentinels_stmt_ref
-        .as_ref()
-        .ok_or("Failed to deref move_non_sentinels_stmt")?;
-
-    move_non_sentinels_stmt
-        // set things to new key
-        .bind_int64(1, new_key)
-        // where they have the old key
-        .and_then(|_| move_non_sentinels_stmt.bind_int64(2, old_key))
-        .or_else(|_| Err("failed to bind pks to move_non_sentinels_stmt"))?;
-    super::step_trigger_stmt(move_non_sentinels_stmt)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

core/rs/core/src/tableinfo.rs

@@ -468,6 +468,7 @@ impl TableInfo {
         Ok(self.mark_locally_deleted_stmt.try_borrow()?)
     }
 
+    #[allow(dead_code)]
     pub fn get_move_non_sentinels_stmt(
         &self,
         db: *mut sqlite3,
@@ -571,6 +572,7 @@ impl TableInfo {
         Ok(self.combo_insert_clock_stmt.try_borrow()?)
     }
 
+    #[allow(dead_code)]
     pub fn get_select_clock_stmt(
         &self,
         db: *mut sqlite3,