Vendor sqlite-nostd

Author: simolus3

.gitmodules

@@ -35,6 +35,3 @@ keywords = ["sqlite", "powersync"]
 license = "Apache-2.0"
 homepage = "https://powersync.com"
 repository = "https://github.com/powersync-ja/powersync-sqlite-core"
-
-[workspace.dependencies]
-sqlite_nostd = { path="./sqlite-rs-embedded/sqlite_nostd" }

Cargo.lock

@@ -13,7 +13,7 @@ name = "powersync_core"
 crate-type = ["rlib"]
 
 [dependencies]
-sqlite_nostd = { workspace=true }
+powersync_sqlite_nostd = { version = "=0.4.8", path = "../sqlite_nostd" }
 bytes = { version = "1.4", default-features = false }
 num-traits = { version = "0.2.15", default-features = false }
 num-derive = "0.3"
@@ -37,9 +37,7 @@ features = []
 [features]
 default = ["getrandom"]
 
-loadable_extension = ["sqlite_nostd/loadable_extension"]
-static = ["sqlite_nostd/static"]
-omit_load_extension = ["sqlite_nostd/omit_load_extension"]
+static = ["powersync_sqlite_nostd/static"]
 # Enable to use the getrandom crate instead of sqlite3_randomness
 # Enable for Windows builds; do not enable for WASM
 getrandom = ["uuid/v4"]

Cargo.toml

@@ -4,11 +4,11 @@ use alloc::string::String;
 use alloc::vec::Vec;
 use core::ffi::c_int;
 
+use powersync_sqlite_nostd as sqlite;
+use powersync_sqlite_nostd::{Connection, Context, Value};
 use serde::Serialize;
 use serde_json as json;
 use sqlite::ResultCode;
-use sqlite_nostd as sqlite;
-use sqlite_nostd::{Connection, Context, Value};
 
 use crate::create_sqlite_text_fn;
 use crate::error::PowerSyncError;

crates/core/Cargo.toml

@@ -7,9 +7,9 @@ use core::ffi::{CStr, c_char, c_int, c_void};
 use serde::Serialize;
 use serde_json::value::RawValue;
 
+use powersync_sqlite_nostd::ManagedStmt;
+use powersync_sqlite_nostd::{self as sqlite, ColumnType};
 use sqlite::{Connection, ResultCode, Value};
-use sqlite_nostd::ManagedStmt;
-use sqlite_nostd::{self as sqlite, ColumnType};
 
 use crate::error::PowerSyncError;
 use crate::ext::SafeManagedStmt;
@@ -101,7 +101,7 @@ impl VirtualTable {
                 // Columns are (data TEXT, options INT HIDDEN)
                 let data = args[0].text();
                 let flags = match args[1].value_type() {
-                    sqlite_nostd::ColumnType::Null => TableInfoFlags::default(),
+                    sqlite::ColumnType::Null => TableInfoFlags::default(),
                     _ => TableInfoFlags(args[1].int() as u32),
                 };
 
@@ -114,7 +114,7 @@ impl VirtualTable {
             CrudTransactionMode::Simple(simple) => {
                 // Columns are (op TEXT, id TEXT, type TEXT, data TEXT, old_values TEXT, metadata TEXT, options INT HIDDEN)
                 let flags = match args[6].value_type() {
-                    sqlite_nostd::ColumnType::Null => TableInfoFlags::default(),
+                    sqlite::ColumnType::Null => TableInfoFlags::default(),
                     _ => TableInfoFlags(args[6].int() as u32),
                 };
                 let op = args[0].text();
@@ -364,7 +364,7 @@ extern "C" fn update(
 // Insert-only virtual table.
 // The primary functionality here is in begin, update, commit and rollback.
 // connect and disconnect configures the table and allocates the required resources.
-static MODULE: sqlite_nostd::module = sqlite_nostd::module {
+static MODULE: sqlite::module = sqlite::module {
     iVersion: 0,
     xCreate: None,
     xConnect: Some(connect),

crates/core/src/checkpoint.rs

@@ -3,15 +3,15 @@ extern crate alloc;
 use alloc::string::{String, ToString};
 use core::ffi::c_int;
 
+use powersync_sqlite_nostd as sqlite;
+use powersync_sqlite_nostd::{Connection, Context, Value};
 use sqlite::ResultCode;
-use sqlite_nostd as sqlite;
-use sqlite_nostd::{Connection, Context, Value};
 
 use crate::constants::SUBTYPE_JSON;
 use crate::create_sqlite_text_fn;
 use crate::error::PowerSyncError;
+use powersync_sqlite_nostd::bindings::SQLITE_RESULT_SUBTYPE;
 use serde_json as json;
-use sqlite_nostd::bindings::SQLITE_RESULT_SUBTYPE;
 
 fn powersync_diff_impl(
     ctx: *mut sqlite::context,

crates/core/src/crud_vtab.rs

@@ -6,7 +6,7 @@ use alloc::{
     string::{String, ToString},
 };
 use num_traits::FromPrimitive;
-use sqlite_nostd::{self as sqlite, Connection, Context, ResultCode, context, sqlite3};
+use powersync_sqlite_nostd::{self as sqlite, Connection, Context, ResultCode, context, sqlite3};
 use thiserror::Error;
 
 use crate::{

crates/core/src/diff.rs

@@ -1,4 +1,4 @@
-use sqlite_nostd::{Connection, Destructor, ManagedStmt, ResultCode, sqlite3};
+use powersync_sqlite_nostd::{Connection, Destructor, ManagedStmt, ResultCode, sqlite3};
 
 pub trait SafeManagedStmt {
     fn exec(&self) -> Result<(), ResultCode>;

crates/core/src/error.rs

@@ -5,8 +5,8 @@ use alloc::string::String;
 
 use crate::create_sqlite_optional_text_fn;
 use crate::error::{PSResult, PowerSyncError};
-use sqlite_nostd::{self as sqlite, ColumnType, Value};
-use sqlite_nostd::{Connection, Context, ResultCode};
+use powersync_sqlite_nostd::{self as sqlite, ColumnType, Value};
+use powersync_sqlite_nostd::{Connection, Context, ResultCode};
 
 use crate::ext::SafeManagedStmt;
 use crate::util::quote_identifier;