Convert more initialization code to Rust

core/rs/bundle/src/lib.rs

@@ -6,7 +6,7 @@ extern crate alloc;
 
 use core::alloc::GlobalAlloc;
 use core::alloc::Layout;
-use core::ffi::{c_char, c_int};
+use core::ffi::c_char;
 use core::panic::PanicInfo;
 use crsql_core;
 use crsql_core::sqlite3_crsqlcore_init;
@@ -43,12 +43,12 @@ pub extern "C" fn sqlite3_crsqlrustbundle_init(
     db: *mut sqlite::sqlite3,
     err_msg: *mut *mut c_char,
     api: *mut sqlite::api_routines,
-) -> c_int {
+) -> *mut ::core::ffi::c_void {
     sqlite::EXTENSION_INIT2(api);
 
     let rc = sqlite3_crsqlfractionalindex_init(db, err_msg, api);
     if rc != 0 {
-        return rc;
+        return core::ptr::null_mut();
     }
 
     sqlite3_crsqlcore_init(db, err_msg, api)

core/rs/core/src/automigrate.rs

@@ -9,7 +9,6 @@ use alloc::string::ToString;
 use alloc::vec;
 use alloc::vec::Vec;
 use core::ffi::{c_char, c_int};
-use core::slice;
 use sqlite::ColumnType;
 use sqlite_nostd as sqlite;
 

core/rs/core/src/c.rs

@@ -108,6 +108,7 @@ extern "C" {
         siteIdBuffer: *mut c_char,
     ) -> *mut crsql_ExtData;
     pub fn crsql_freeExtData(pExtData: *mut crsql_ExtData);
+    pub fn crsql_finalize(pExtData: *mut crsql_ExtData);
 }
 
 #[test]

core/rs/core/src/changes_vtab.rs

@@ -10,7 +10,6 @@ use alloc::vec::Vec;
 use core::ffi::{c_char, c_int, CStr};
 use core::mem::{self, forget};
 use core::ptr::null_mut;
-use core::slice;
 
 use alloc::ffi::CString;
 #[cfg(not(feature = "std"))]

core/rs/core/src/changes_vtab_write.rs

@@ -4,7 +4,6 @@ use alloc::format;
 use alloc::vec::Vec;
 use core::ffi::{c_char, c_int};
 use core::mem;
-use core::slice;
 use sqlite::Stmt;
 use sqlite_nostd as sqlite;
 use sqlite_nostd::{sqlite3, ResultCode, Value};
@@ -575,7 +574,9 @@ unsafe fn merge_insert(
     // In an in-order delivery situation then `sentinel_only` would have already resurrected the row
     // In out-of-order delivery, we need to resurrect the row as soon as we get a value
     // which should resurrect the row. I.e., don't wait on the sentinel value to resurrect the row!
-    if needs_resurrect && row_exists_locally {
+    // If the row does not exist locally and the insert_cl is > 1 then we need to create a sentinel to record the insert cl.
+    // Not doing so will cause us to assume a cl of 1.
+    if needs_resurrect && (row_exists_locally || (!row_exists_locally && insert_cl > 1)) {
         // this should work -- same as `merge_sentinel_only_insert` except we're not done once we do it
         // and the version to set to is the cl not col_vrsn of current insert
         merge_sentinel_only_insert(