pyturso 0.2.0rc15__tar.gz → 0.2.2__tar.gz

{pyturso-0.2.0rc15 → pyturso-0.2.2}/Cargo.lock

@@ -690,7 +690,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core_tester"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -2278,7 +2278,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_completion"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2286,7 +2286,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_crypto"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "blake3",
  "data-encoding",
@@ -2299,7 +2299,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_csv"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "csv",
  "mimalloc",
@@ -2309,7 +2309,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_fuzzy"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2317,7 +2317,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_ipaddr"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "ipnetwork",
  "mimalloc",
@@ -2326,7 +2326,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_percentile"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2334,7 +2334,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_regexp"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "mimalloc",
  "regex",
@@ -2343,7 +2343,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sim"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "bitmaps",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sqlite_test_ext"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "cc",
 ]
@@ -3116,7 +3116,7 @@ dependencies = [
 
 [[package]]
 name = "py-turso"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "pyo3",
@@ -3843,7 +3843,7 @@ checksum = "d372029cb5195f9ab4e4b9aef550787dce78b124fcaee8d82519925defcd6f0d"
 
 [[package]]
 name = "sql_generation"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "anarchist-readable-name-generator-lib 0.2.0",
  "anyhow",
@@ -4357,7 +4357,7 @@ dependencies = [
 
 [[package]]
 name = "turso"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "rand 0.9.2",
  "rand_chacha 0.9.0",
@@ -4369,7 +4369,7 @@ dependencies = [
 
 [[package]]
 name = "turso-java"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "jni",
  "thiserror 2.0.16",
@@ -4378,7 +4378,7 @@ dependencies = [
 
 [[package]]
 name = "turso_cli"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -4414,7 +4414,7 @@ dependencies = [
 
 [[package]]
 name = "turso_core"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "aegis",
  "aes",
@@ -4473,7 +4473,7 @@ dependencies = [
 
 [[package]]
 name = "turso_dart"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "flutter_rust_bridge",
  "turso_core",
@@ -4481,7 +4481,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "chrono",
  "getrandom 0.3.2",
@@ -4490,7 +4490,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext_tests"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "env_logger 0.11.7",
  "lazy_static",
@@ -4501,7 +4501,7 @@ dependencies = [
 
 [[package]]
 name = "turso_macros"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4510,7 +4510,7 @@ dependencies = [
 
 [[package]]
 name = "turso_node"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "chrono",
  "napi",
@@ -4523,7 +4523,7 @@ dependencies = [
 
 [[package]]
 name = "turso_parser"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "bitflags 2.9.4",
  "criterion",
@@ -4539,7 +4539,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sqlite3"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "env_logger 0.11.7",
  "libc",
@@ -4552,7 +4552,7 @@ dependencies = [
 
 [[package]]
 name = "turso_stress"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "anarchist-readable-name-generator-lib 0.1.2",
  "antithesis_sdk",
@@ -4568,7 +4568,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_engine"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "base64",
  "bytes",
@@ -4595,7 +4595,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_js"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "genawaiter",
  "napi",
@@ -4610,7 +4610,7 @@ dependencies = [
 
 [[package]]
 name = "turso_whopper"
-version = "0.2.0-pre.15"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "clap",

{pyturso-0.2.0rc15 → pyturso-0.2.2}/Cargo.toml

@@ -8,29 +8,29 @@ exclude = [
 ]
 
 [workspace.package]
-version = "0.2.0-pre.15"
+version = "0.2.2"
 authors = ["the Limbo authors"]
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/tursodatabase/turso"
 
 [workspace.dependencies]
-turso = { path = "bindings/rust", version = "0.2.0-pre.15" }
-turso_node = { path = "bindings/javascript", version = "0.2.0-pre.15" }
-limbo_completion = { path = "extensions/completion", version = "0.2.0-pre.15" }
-turso_core = { path = "core", version = "0.2.0-pre.15" }
-turso_sync_engine = { path = "sync/engine", version = "0.2.0-pre.15" }
-limbo_crypto = { path = "extensions/crypto", version = "0.2.0-pre.15" }
-limbo_csv = { path = "extensions/csv", version = "0.2.0-pre.15" }
-turso_ext = { path = "extensions/core", version = "0.2.0-pre.15" }
-turso_ext_tests = { path = "extensions/tests", version = "0.2.0-pre.15" }
-limbo_ipaddr = { path = "extensions/ipaddr", version = "0.2.0-pre.15" }
-turso_macros = { path = "macros", version = "0.2.0-pre.15" }
-limbo_percentile = { path = "extensions/percentile", version = "0.2.0-pre.15" }
-limbo_regexp = { path = "extensions/regexp", version = "0.2.0-pre.15" }
-limbo_uuid = { path = "extensions/uuid", version = "0.2.0-pre.15" }
-turso_parser = { path = "parser", version = "0.2.0-pre.15" }
-limbo_fuzzy = { path = "extensions/fuzzy", version = "0.2.0-pre.15" }
+turso = { path = "bindings/rust", version = "0.2.2" }
+turso_node = { path = "bindings/javascript", version = "0.2.2" }
+limbo_completion = { path = "extensions/completion", version = "0.2.2" }
+turso_core = { path = "core", version = "0.2.2" }
+turso_sync_engine = { path = "sync/engine", version = "0.2.2" }
+limbo_crypto = { path = "extensions/crypto", version = "0.2.2" }
+limbo_csv = { path = "extensions/csv", version = "0.2.2" }
+turso_ext = { path = "extensions/core", version = "0.2.2" }
+turso_ext_tests = { path = "extensions/tests", version = "0.2.2" }
+limbo_ipaddr = { path = "extensions/ipaddr", version = "0.2.2" }
+turso_macros = { path = "macros", version = "0.2.2" }
+limbo_percentile = { path = "extensions/percentile", version = "0.2.2" }
+limbo_regexp = { path = "extensions/regexp", version = "0.2.2" }
+limbo_uuid = { path = "extensions/uuid", version = "0.2.2" }
+turso_parser = { path = "parser", version = "0.2.2" }
+limbo_fuzzy = { path = "extensions/fuzzy", version = "0.2.2" }
 sql_generation = { path = "sql_generation" }
 strum = { version = "0.26", features = ["derive"] }
 strum_macros = "0.26"

{pyturso-0.2.0rc15 → pyturso-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyturso
-Version: 0.2.0rc15
+Version: 0.2.2
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pyturso-0.2.0rc15 → pyturso-0.2.2}/core/incremental/compiler.rs

@@ -2149,6 +2149,31 @@ impl DbspCompiler {
                     ))
                 }
             }
+            LogicalExpr::IsNull { expr, negated } => {
+                // Extract column index from the inner expression
+                if let LogicalExpr::Column(col) = expr.as_ref() {
+                    let column_idx = schema
+                        .columns
+                        .iter()
+                        .position(|c| c.name == col.name)
+                        .ok_or_else(|| {
+                            LimboError::ParseError(format!(
+                                "Column '{}' not found in schema for IS NULL filter",
+                                col.name
+                            ))
+                        })?;
+
+                    if *negated {
+                        Ok(FilterPredicate::IsNotNull { column_idx })
+                    } else {
+                        Ok(FilterPredicate::IsNull { column_idx })
+                    }
+                } else {
+                    Err(LimboError::ParseError(
+                        "IS NULL/IS NOT NULL expects a column reference".to_string(),
+                    ))
+                }
+            }
             _ => Err(LimboError::ParseError(format!(
                 "Unsupported filter expression: {expr:?}"
             ))),

{pyturso-0.2.0rc15 → pyturso-0.2.2}/core/incremental/filter_operator.rs

@@ -39,6 +39,11 @@ pub enum FilterPredicate {
     /// Column <= Column comparisons
     ColumnLessThanOrEqual { left_idx: usize, right_idx: usize },
 
+    /// Column IS NULL check
+    IsNull { column_idx: usize },
+    /// Column IS NOT NULL check
+    IsNotNull { column_idx: usize },
+
     /// Logical AND of two predicates
     And(Box<FilterPredicate>, Box<FilterPredicate>),
     /// Logical OR of two predicates
@@ -214,6 +219,18 @@ impl FilterOperator {
                 }
                 false
             }
+            FilterPredicate::IsNull { column_idx } => {
+                if let Some(v) = values.get(*column_idx) {
+                    return matches!(v, Value::Null);
+                }
+                false
+            }
+            FilterPredicate::IsNotNull { column_idx } => {
+                if let Some(v) = values.get(*column_idx) {
+                    return !matches!(v, Value::Null);
+                }
+                false
+            }
         }
     }
 }
@@ -293,3 +310,202 @@ impl IncrementalOperator for FilterOperator {
         self.tracker = Some(tracker);
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::types::Text;
+
+    #[test]
+    fn test_is_null_predicate() {
+        let predicate = FilterPredicate::IsNull { column_idx: 1 };
+        let filter = FilterOperator::new(predicate);
+
+        // Test with NULL value
+        let values_with_null = vec![
+            Value::Integer(1),
+            Value::Null,
+            Value::Text(Text::from("test")),
+        ];
+        assert!(filter.evaluate_predicate(&values_with_null));
+
+        // Test with non-NULL value
+        let values_without_null = vec![
+            Value::Integer(1),
+            Value::Integer(42),
+            Value::Text(Text::from("test")),
+        ];
+        assert!(!filter.evaluate_predicate(&values_without_null));
+
+        // Test with different non-NULL types
+        let values_with_text = vec![
+            Value::Integer(1),
+            Value::Text(Text::from("not null")),
+            Value::Text(Text::from("test")),
+        ];
+        assert!(!filter.evaluate_predicate(&values_with_text));
+
+        let values_with_blob = vec![
+            Value::Integer(1),
+            Value::Blob(vec![1, 2, 3]),
+            Value::Text(Text::from("test")),
+        ];
+        assert!(!filter.evaluate_predicate(&values_with_blob));
+    }
+
+    #[test]
+    fn test_is_not_null_predicate() {
+        let predicate = FilterPredicate::IsNotNull { column_idx: 1 };
+        let filter = FilterOperator::new(predicate);
+
+        // Test with NULL value
+        let values_with_null = vec![
+            Value::Integer(1),
+            Value::Null,
+            Value::Text(Text::from("test")),
+        ];
+        assert!(!filter.evaluate_predicate(&values_with_null));
+
+        // Test with non-NULL value (Integer)
+        let values_with_integer = vec![
+            Value::Integer(1),
+            Value::Integer(42),
+            Value::Text(Text::from("test")),
+        ];
+        assert!(filter.evaluate_predicate(&values_with_integer));
+
+        // Test with non-NULL value (Text)
+        let values_with_text = vec![
+            Value::Integer(1),
+            Value::Text(Text::from("not null")),
+            Value::Text(Text::from("test")),
+        ];
+        assert!(filter.evaluate_predicate(&values_with_text));
+
+        // Test with non-NULL value (Blob)
+        let values_with_blob = vec![
+            Value::Integer(1),
+            Value::Blob(vec![1, 2, 3]),
+            Value::Text(Text::from("test")),
+        ];
+        assert!(filter.evaluate_predicate(&values_with_blob));
+    }
+
+    #[test]
+    fn test_is_null_with_and() {
+        // Test: column_0 = 1 AND column_1 IS NULL
+        let predicate = FilterPredicate::And(
+            Box::new(FilterPredicate::Equals {
+                column_idx: 0,
+                value: Value::Integer(1),
+            }),
+            Box::new(FilterPredicate::IsNull { column_idx: 1 }),
+        );
+        let filter = FilterOperator::new(predicate);
+
+        // Should match: column_0 = 1 AND column_1 IS NULL
+        let values_match = vec![
+            Value::Integer(1),
+            Value::Null,
+            Value::Text(Text::from("test")),
+        ];
+        assert!(filter.evaluate_predicate(&values_match));
+
+        // Should not match: column_0 = 2 AND column_1 IS NULL
+        let values_wrong_first = vec![
+            Value::Integer(2),
+            Value::Null,
+            Value::Text(Text::from("test")),
+        ];
+        assert!(!filter.evaluate_predicate(&values_wrong_first));
+
+        // Should not match: column_0 = 1 AND column_1 IS NOT NULL
+        let values_not_null = vec![
+            Value::Integer(1),
+            Value::Integer(42),
+            Value::Text(Text::from("test")),
+        ];
+        assert!(!filter.evaluate_predicate(&values_not_null));
+    }
+
+    #[test]
+    fn test_is_not_null_with_or() {
+        // Test: column_0 = 1 OR column_1 IS NOT NULL
+        let predicate = FilterPredicate::Or(
+            Box::new(FilterPredicate::Equals {
+                column_idx: 0,
+                value: Value::Integer(1),
+            }),
+            Box::new(FilterPredicate::IsNotNull { column_idx: 1 }),
+        );
+        let filter = FilterOperator::new(predicate);
+
+        // Should match: column_0 = 1 (regardless of column_1)
+        let values_first_matches = vec![
+            Value::Integer(1),
+            Value::Null,
+            Value::Text(Text::from("test")),
+        ];
+        assert!(filter.evaluate_predicate(&values_first_matches));
+
+        // Should match: column_1 IS NOT NULL (regardless of column_0)
+        let values_second_matches = vec![
+            Value::Integer(2),
+            Value::Integer(42),
+            Value::Text(Text::from("test")),
+        ];
+        assert!(filter.evaluate_predicate(&values_second_matches));
+
+        // Should not match: column_0 != 1 AND column_1 IS NULL
+        let values_no_match = vec![
+            Value::Integer(2),
+            Value::Null,
+            Value::Text(Text::from("test")),
+        ];
+        assert!(!filter.evaluate_predicate(&values_no_match));
+    }
+
+    #[test]
+    fn test_complex_null_predicates() {
+        // Test: (column_0 IS NULL OR column_1 IS NOT NULL) AND column_2 = 'test'
+        let predicate = FilterPredicate::And(
+            Box::new(FilterPredicate::Or(
+                Box::new(FilterPredicate::IsNull { column_idx: 0 }),
+                Box::new(FilterPredicate::IsNotNull { column_idx: 1 }),
+            )),
+            Box::new(FilterPredicate::Equals {
+                column_idx: 2,
+                value: Value::Text(Text::from("test")),
+            }),
+        );
+        let filter = FilterOperator::new(predicate);
+
+        // Should match: column_0 IS NULL, column_2 = 'test'
+        let values1 = vec![Value::Null, Value::Null, Value::Text(Text::from("test"))];
+        assert!(filter.evaluate_predicate(&values1));
+
+        // Should match: column_1 IS NOT NULL, column_2 = 'test'
+        let values2 = vec![
+            Value::Integer(1),
+            Value::Integer(42),
+            Value::Text(Text::from("test")),
+        ];
+        assert!(filter.evaluate_predicate(&values2));
+
+        // Should not match: column_2 != 'test'
+        let values3 = vec![
+            Value::Null,
+            Value::Integer(42),
+            Value::Text(Text::from("other")),
+        ];
+        assert!(!filter.evaluate_predicate(&values3));
+
+        // Should not match: column_0 IS NOT NULL AND column_1 IS NULL AND column_2 = 'test'
+        let values4 = vec![
+            Value::Integer(1),
+            Value::Null,
+            Value::Text(Text::from("test")),
+        ];
+        assert!(!filter.evaluate_predicate(&values4));
+    }
+}

{pyturso-0.2.0rc15 → pyturso-0.2.2}/core/io/unix.rs

@@ -50,8 +50,9 @@ fn try_pwritev_raw(
     let mut iov_count = 0;
     for (i, b) in bufs.iter().enumerate().skip(start_idx).take(iov_len) {
         let s = b.as_slice();
-        let ptr = if i == start_idx { &s[start_off..] } else { s }.as_ptr();
-        let len = b.len();
+        let slice = if i == start_idx { &s[start_off..] } else { s };
+        let ptr = slice.as_ptr();
+        let len = slice.len();
 
         if let Some((last_ptr, last_len)) = last_end {
             // Check if this buffer is adjacent to the last

{pyturso-0.2.0rc15 → pyturso-0.2.2}/core/lib.rs

@@ -62,6 +62,7 @@ pub use io::{
 };
 use parking_lot::RwLock;
 use schema::Schema;
+use std::cell::Cell;
 use std::{
     borrow::Cow,
     cell::RefCell,
@@ -217,7 +218,7 @@ pub struct Database {
     shared_wal: Arc<RwLock<WalFileShared>>,
     db_state: Arc<AtomicDbState>,
     init_lock: Arc<Mutex<()>>,
-    open_flags: OpenFlags,
+    open_flags: Cell<OpenFlags>,
     builtin_syms: RwLock<SymbolTable>,
     opts: DatabaseOpts,
     n_connections: AtomicUsize,
@@ -231,7 +232,7 @@ impl fmt::Debug for Database {
         let mut debug_struct = f.debug_struct("Database");
         debug_struct
             .field("path", &self.path)
-            .field("open_flags", &self.open_flags);
+            .field("open_flags", &self.open_flags.get());
 
         // Database state information
         let db_state_value = match self.db_state.get() {
@@ -407,6 +408,31 @@ impl Database {
         opts: DatabaseOpts,
         encryption_opts: Option<EncryptionOpts>,
     ) -> Result<Arc<Database>> {
+        // Currently, if a non-zero-sized WAL file exists, the database cannot be opened in MVCC mode.
+        // FIXME: this should initiate immediate checkpoint from WAL->DB in MVCC mode.
+        if opts.enable_mvcc
+            && std::path::Path::exists(std::path::Path::new(wal_path))
+            && std::path::Path::new(wal_path).metadata().unwrap().len() > 0
+        {
+            return Err(LimboError::InvalidArgument(format!(
+                    "WAL file exists for database {path}, but MVCC is enabled. This is currently not supported. Open the database in non-MVCC mode and run PRAGMA wal_checkpoint(TRUNCATE) to truncate the WAL."
+                )));
+        }
+
+        // If a non-zero-sized logical log file exists, the database cannot be opened in non-MVCC mode,
+        // because the changes in the logical log would not be visible to the non-MVCC connections.
+        if !opts.enable_mvcc {
+            let db_path = std::path::Path::new(path);
+            let log_path = db_path.with_extension("db-log");
+            if std::path::Path::exists(log_path.as_path())
+                && log_path.as_path().metadata().unwrap().len() > 0
+            {
+                return Err(LimboError::InvalidArgument(format!(
+                    "MVCC logical log file exists for database {path}, but MVCC is disabled. This is not supported. Open the database in MVCC mode and run PRAGMA wal_checkpoint(TRUNCATE) to truncate the logical log.",
+                )));
+            }
+        }
+
         let shared_wal = WalFileShared::open_shared_if_exists(&io, wal_path)?;
 
         let mv_store = if opts.enable_mvcc {
@@ -443,7 +469,7 @@ impl Database {
             db_file,
             builtin_syms: syms.into(),
             io: io.clone(),
-            open_flags: flags,
+            open_flags: flags.into(),
             db_state: Arc::new(AtomicDbState::new(db_state)),
             init_lock: Arc::new(Mutex::new(())),
             opts,
@@ -574,7 +600,7 @@ impl Database {
     }
 
     pub fn is_readonly(&self) -> bool {
-        self.open_flags.contains(OpenFlags::ReadOnly)
+        self.open_flags.get().contains(OpenFlags::ReadOnly)
     }
 
     /// If we do not have a physical WAL file, but we know the database file is initialized on disk,
@@ -1502,9 +1528,7 @@ impl Connection {
         db_opts: DatabaseOpts,
         io: Arc<dyn IO>,
     ) -> Result<Arc<Database>> {
-        let mut opts = OpenOptions::parse(uri)?;
-        // FIXME: for now, only support read only attach
-        opts.mode = OpenMode::ReadOnly;
+        let opts = OpenOptions::parse(uri)?;
         let flags = opts.get_flags()?;
         let io = opts.vfs.map(Database::io_for_vfs).unwrap_or(Ok(io))?;
         let db = Database::open_file_with_flags(io.clone(), &opts.path, flags, db_opts, None)?;
@@ -2065,9 +2089,15 @@ impl Connection {
             .with_indexes(use_indexes)
             .with_views(use_views)
             .with_strict(use_strict);
-        let db = Self::from_uri_attached(path, db_opts, self.db.io.clone())?;
+        let io: Arc<dyn IO> = if path.contains(":memory:") {
+            Arc::new(MemoryIO::new())
+        } else {
+            Arc::new(PlatformIO::new()?)
+        };
+        let db = Self::from_uri_attached(path, db_opts, io)?;
         let pager = Arc::new(db.init_pager(None)?);
-
+        // FIXME: for now, only support read only attach
+        db.open_flags.set(OpenFlags::ReadOnly);
         self.attached_databases.write().insert(alias, (db, pager));
 
         Ok(())