add fn to set crsql db_version

Author: somtochiama

core/rs/core/src/lib.rs

@@ -63,6 +63,7 @@ use core::ffi::{c_int, c_void, CStr};
 use create_crr::create_crr;
 use db_version::{
     crsql_fill_db_version_if_needed, crsql_next_db_version, crsql_peek_next_db_version,
+    insert_db_version,
 };
 use is_crr::*;
 use local_writes::after_delete::x_crsql_after_delete;
@@ -369,34 +370,51 @@ pub extern "C" fn sqlite3_crsqlcore_init(
     }
 
     let rc = db
-    .create_function_v2(
-        "crsql_set_ts",
-        -1,
-        sqlite::UTF8 | sqlite::DETERMINISTIC,
-        Some(ext_data as *mut c_void),
-        Some(x_crsql_set_ts),
-        None,
-        None,
-        None,
-    )
-    .unwrap_or(ResultCode::ERROR);
+        .create_function_v2(
+            "crsql_set_ts",
+            -1,
+            sqlite::UTF8 | sqlite::DETERMINISTIC,
+            Some(ext_data as *mut c_void),
+            Some(x_crsql_set_ts),
+            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_set_db_version",
+            -1,
+            sqlite::UTF8 | sqlite::DETERMINISTIC,
+            Some(ext_data as *mut c_void),
+            Some(x_crsql_set_db_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_get_ts",
-        -1,
-        sqlite::UTF8 | sqlite::DETERMINISTIC,
-        Some(ext_data as *mut c_void),
-        Some(x_crsql_get_ts),
-        None,
-        None,
-        None,
-    )
-    .unwrap_or(ResultCode::ERROR);
+        .create_function_v2(
+            "crsql_get_ts",
+            -1,
+            sqlite::UTF8 | sqlite::DETERMINISTIC,
+            Some(ext_data as *mut c_void),
+            Some(x_crsql_get_ts),
+            None,
+            None,
+            None,
+        )
+        .unwrap_or(ResultCode::ERROR);
     if rc != ResultCode::OK {
         unsafe { crsql_freeExtData(ext_data) };
         return null_mut();
@@ -883,6 +901,40 @@ unsafe extern "C" fn x_crsql_next_db_version(
     ctx.result_int64(ret);
 }
 
+/**
+ * Return the next version of the database for use in inserts/updates/deletes
+ *
+ * `select crsql_set_db_version()`
+ *
+ * This is used to set the db version for a particular site_id.
+ * This is useful for exposing a way for the application to set a db_version
+ * that might not get passed to crsqlite.
+ */
+unsafe extern "C" fn x_crsql_set_db_version(
+    ctx: *mut sqlite::context,
+    argc: i32,
+    argv: *mut *mut sqlite::value,
+) {
+    if argc < 2 {
+        ctx.result_error(
+            "Wrong number of args provided to crsql_set_db_version. Provide the
+        site id and db version.",
+        );
+        return;
+    }
+
+    let args = sqlite::args!(argc, argv);
+    let (site_id, db_version) = (args[0].blob(), args[1].int64());
+    let ext_data = ctx.user_data() as *mut c::crsql_ExtData;
+
+    let ret = insert_db_version(ext_data, site_id, db_version);
+    if ret.is_err() {
+        ctx.result_error("Unable to set the db version");
+        return;
+    }
+    ctx.result_text_static("OK");
+}
+
 /**
  * Return the next version of the database for use in inserts/updates/deletes
  * without updating the the database or value in ext_data.
@@ -898,7 +950,6 @@ unsafe extern "C" fn x_crsql_peek_next_db_version(
     let db = ctx.db_handle();
     let mut err_msg = null_mut();
 
-
     let ret = crsql_peek_next_db_version(db, ext_data, &mut err_msg as *mut _);
     if ret < 0 {
         // TODO: use err_msg!

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

@@ -88,7 +88,14 @@ fn after_update(
         let next_seq = super::bump_seq(ext_data);
         changed = true;
         // Record the delete of the row identified by the old primary keys
-        after_update__mark_old_pk_row_deleted(db, tbl_info, old_key, next_db_version, next_seq, &ts)?;
+        after_update__mark_old_pk_row_deleted(
+            db,
+            tbl_info,
+            old_key,
+            next_db_version,
+            next_seq,
+            &ts,
+        )?;
         let next_seq = super::bump_seq(ext_data);
         // todo: we don't need to this, if there's no existing row (cl is assumed to be 1).
         super::mark_new_pk_row_created(db, tbl_info, new_key, next_db_version, next_seq, &ts)?;

core/rs/core/src/local_writes/mod.rs

@@ -170,7 +170,13 @@ fn mark_locally_inserted(
                     })
                     .and_then(|_| combo_insert_clock_stmt.bind_int64(offset + 3, db_version))
                     .and_then(|_| combo_insert_clock_stmt.bind_int(offset + 4, seq))
-                    .and_then(|_| combo_insert_clock_stmt.bind_text(offset + 5, ts, sqlite::Destructor::STATIC))
+                    .and_then(|_| {
+                        combo_insert_clock_stmt.bind_text(
+                            offset + 5,
+                            ts,
+                            sqlite::Destructor::STATIC,
+                        )
+                    })
                     .map_err(|code| {
                         format!("failed binding to combo_insert_clock_stmt, code: {code}")
                     })?;

core/src/ext-data.c

@@ -55,10 +55,10 @@ crsql_ExtData *crsql_newExtData(sqlite3 *db, unsigned char *siteIdBuffer) {
   // printf("instantiating pSetDbVersionStmt... current rc: %d\n", rc);
   rc += sqlite3_prepare_v3(
       db,
-      "INSERT OR REPLACE INTO crsql_db_versions (site_id, db_version) VALUES "
+      "INSERT INTO crsql_db_versions (site_id, db_version) VALUES "
       "(?, ?)  ON "
-      "CONFLICT (site_id) DO UPDATE SET db_version = max(excluded.db_version, "
-      "crsql_db_versions.db_version) RETURNING db_version",
+      "CONFLICT (site_id) DO UPDATE SET db_version = excluded.db_version "
+      "WHERE crsql_db_versions.db_version < excluded.db_version RETURNING db_version",
       -1, SQLITE_PREPARE_PERSISTENT, &(pExtData->pSetDbVersionStmt), 0);
 
   // printf("instantiated pSetDbVersionStmt, rc: %d\n", rc);