pyturso 0.4.0rc17__tar.gz → 0.4.0rc18__tar.gz

{pyturso-0.4.0rc17 → pyturso-0.4.0rc18}/Cargo.lock

@@ -877,7 +877,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core_tester"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -887,6 +887,7 @@ dependencies = [
  "rand 0.9.2",
  "rand_chacha 0.9.0",
  "rusqlite",
+ "similar-asserts",
  "sql_generation",
  "tempfile",
  "test-log",
@@ -2632,7 +2633,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_completion"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2640,7 +2641,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_crypto"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "blake3",
  "data-encoding",
@@ -2653,7 +2654,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_csv"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "csv",
  "mimalloc",
@@ -2663,7 +2664,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_fuzzy"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2671,7 +2672,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_ipaddr"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "ipnetwork",
  "mimalloc",
@@ -2680,7 +2681,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_percentile"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2688,7 +2689,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_regexp"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "mimalloc",
  "regex",
@@ -2697,7 +2698,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sim"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "anyhow",
  "bitflags 2.9.4",
@@ -2734,7 +2735,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sqlite_test_ext"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "cc",
 ]
@@ -3560,7 +3561,7 @@ dependencies = [
 
 [[package]]
 name = "py-turso"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "anyhow",
  "pyo3",
@@ -4320,7 +4321,7 @@ checksum = "d372029cb5195f9ab4e4b9aef550787dce78b124fcaee8d82519925defcd6f0d"
 
 [[package]]
 name = "sql_generation"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "anarchist-readable-name-generator-lib",
  "anyhow",
@@ -4948,7 +4949,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "turso"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "mimalloc",
  "rand 0.9.2",
@@ -4961,9 +4962,16 @@ dependencies = [
  "turso_core",
 ]
 
+[[package]]
+name = "turso-dotnet"
+version = "0.4.0-pre.18"
+dependencies = [
+ "turso_core",
+]
+
 [[package]]
 name = "turso-java"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "jni",
  "thiserror 2.0.16",
@@ -4972,7 +4980,7 @@ dependencies = [
 
 [[package]]
 name = "turso_cli"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -5009,7 +5017,7 @@ dependencies = [
 
 [[package]]
 name = "turso_core"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "aegis",
  "aes",
@@ -5074,7 +5082,7 @@ dependencies = [
 
 [[package]]
 name = "turso_dart"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "flutter_rust_bridge",
  "turso_core",
@@ -5082,7 +5090,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "chrono",
  "getrandom 0.3.2",
@@ -5091,7 +5099,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext_tests"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "env_logger 0.11.7",
  "lazy_static",
@@ -5102,7 +5110,7 @@ dependencies = [
 
 [[package]]
 name = "turso_macros"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5111,7 +5119,7 @@ dependencies = [
 
 [[package]]
 name = "turso_node"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "chrono",
  "napi",
@@ -5124,7 +5132,7 @@ dependencies = [
 
 [[package]]
 name = "turso_parser"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "bitflags 2.9.4",
  "criterion",
@@ -5140,7 +5148,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sdk_kit"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "bindgen",
  "env_logger 0.11.7",
@@ -5153,7 +5161,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sdk_kit_macros"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5162,7 +5170,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sqlite3"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "env_logger 0.11.7",
  "libc",
@@ -5175,7 +5183,7 @@ dependencies = [
 
 [[package]]
 name = "turso_stress"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "antithesis_sdk",
  "clap",
@@ -5192,7 +5200,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_engine"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -5220,7 +5228,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_js"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "genawaiter",
  "napi",
@@ -5235,7 +5243,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_sdk_kit"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "bindgen",
  "env_logger 0.11.7",
@@ -5252,7 +5260,7 @@ dependencies = [
 
 [[package]]
 name = "turso_whopper"
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 dependencies = [
  "anyhow",
  "clap",

{pyturso-0.4.0rc17 → pyturso-0.4.0rc18}/Cargo.toml

@@ -6,32 +6,32 @@ members = ["bindings/python"]
 exclude = ["perf/latency/limbo"]
 
 [workspace.package]
-version = "0.4.0-pre.17"
+version = "0.4.0-pre.18"
 authors = ["the Limbo authors"]
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/tursodatabase/turso"
 
 [workspace.dependencies]
-turso = { path = "bindings/rust", version = "0.4.0-pre.17" }
-turso_node = { path = "bindings/javascript", version = "0.4.0-pre.17" }
-turso_sdk_kit = { path = "sdk-kit", version = "0.4.0-pre.17" }
-turso_sdk_kit_macros = { path = "sdk-kit-macros", version = "0.4.0-pre.17" }
-turso_sync_sdk_kit = { path = "sync/sdk-kit", version = "0.4.0-pre.17" }
-limbo_completion = { path = "extensions/completion", version = "0.4.0-pre.17" }
-turso_core = { path = "core", version = "0.4.0-pre.17" }
-turso_sync_engine = { path = "sync/engine", version = "0.4.0-pre.17" }
-limbo_crypto = { path = "extensions/crypto", version = "0.4.0-pre.17" }
-limbo_csv = { path = "extensions/csv", version = "0.4.0-pre.17" }
-turso_ext = { path = "extensions/core", version = "0.4.0-pre.17" }
-turso_ext_tests = { path = "extensions/tests", version = "0.4.0-pre.17" }
-limbo_ipaddr = { path = "extensions/ipaddr", version = "0.4.0-pre.17" }
-turso_macros = { path = "macros", version = "0.4.0-pre.17" }
-limbo_percentile = { path = "extensions/percentile", version = "0.4.0-pre.17" }
-limbo_regexp = { path = "extensions/regexp", version = "0.4.0-pre.17" }
-limbo_uuid = { path = "extensions/uuid", version = "0.4.0-pre.17" }
-turso_parser = { path = "parser", version = "0.4.0-pre.17" }
-limbo_fuzzy = { path = "extensions/fuzzy", version = "0.4.0-pre.17" }
+turso = { path = "bindings/rust", version = "0.4.0-pre.18" }
+turso_node = { path = "bindings/javascript", version = "0.4.0-pre.18" }
+turso_sdk_kit = { path = "sdk-kit", version = "0.4.0-pre.18" }
+turso_sdk_kit_macros = { path = "sdk-kit-macros", version = "0.4.0-pre.18" }
+turso_sync_sdk_kit = { path = "sync/sdk-kit", version = "0.4.0-pre.18" }
+limbo_completion = { path = "extensions/completion", version = "0.4.0-pre.18" }
+turso_core = { path = "core", version = "0.4.0-pre.18" }
+turso_sync_engine = { path = "sync/engine", version = "0.4.0-pre.18" }
+limbo_crypto = { path = "extensions/crypto", version = "0.4.0-pre.18" }
+limbo_csv = { path = "extensions/csv", version = "0.4.0-pre.18" }
+turso_ext = { path = "extensions/core", version = "0.4.0-pre.18" }
+turso_ext_tests = { path = "extensions/tests", version = "0.4.0-pre.18" }
+limbo_ipaddr = { path = "extensions/ipaddr", version = "0.4.0-pre.18" }
+turso_macros = { path = "macros", version = "0.4.0-pre.18" }
+limbo_percentile = { path = "extensions/percentile", version = "0.4.0-pre.18" }
+limbo_regexp = { path = "extensions/regexp", version = "0.4.0-pre.18" }
+limbo_uuid = { path = "extensions/uuid", version = "0.4.0-pre.18" }
+turso_parser = { path = "parser", version = "0.4.0-pre.18" }
+limbo_fuzzy = { path = "extensions/fuzzy", version = "0.4.0-pre.18" }
 sql_generation = { path = "sql_generation" }
 strum = { version = "0.26", features = ["derive"] }
 strum_macros = "0.26"

{pyturso-0.4.0rc17 → pyturso-0.4.0rc18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyturso
-Version: 0.4.0rc17
+Version: 0.4.0rc18
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

pyturso-0.4.0rc18/bindings/rust/src/connection.rs

@@ -0,0 +1,281 @@
+use crate::transaction::DropBehavior;
+use crate::transaction::TransactionBehavior;
+use crate::Error;
+use crate::IntoParams;
+use crate::Row;
+use crate::Rows;
+use crate::Statement;
+use std::fmt::Debug;
+use std::sync::atomic::AtomicU8;
+use std::sync::atomic::Ordering;
+use std::sync::MutexGuard;
+use std::sync::{Arc, Mutex};
+#[cfg(feature = "conn_raw_api")]
+use turso_core::types::WalFrameInfo;
+pub type Result<T> = std::result::Result<T, Error>;
+
+/// Atomic wrapper for [DropBehavior]
+pub(crate) struct AtomicDropBehavior {
+    inner: AtomicU8,
+}
+
+impl AtomicDropBehavior {
+    fn new(behavior: DropBehavior) -> Self {
+        Self {
+            inner: AtomicU8::new(behavior.into()),
+        }
+    }
+
+    fn load(&self, ordering: Ordering) -> DropBehavior {
+        self.inner.load(ordering).into()
+    }
+
+    pub(crate) fn store(&self, behavior: DropBehavior, ordering: Ordering) {
+        self.inner.store(behavior.into(), ordering);
+    }
+}
+
+// A database connection.
+pub struct Connection {
+    /// Inner is an Option so that when a Connection is dropped we can take the inner
+    /// (Actual connection) out of it and put it back into the ConnectionPool
+    /// the only time inner will be None is just before the Connection is freed after the
+    /// inner connection has been recyled into the connection pool
+    inner: Option<Arc<Mutex<Arc<turso_core::Connection>>>>,
+    pub(crate) transaction_behavior: TransactionBehavior,
+    /// If there is a dangling transaction after it was dropped without being finished,
+    /// [Connection::dangling_tx] will be set to the [DropBehavior] of the dangling transaction,
+    /// and the corresponding action will be taken when a new transaction is requested
+    /// or the connection queries/executes.
+    /// We cannot do this eagerly on Drop because drop is not async.
+    ///
+    /// By default, the value is [DropBehavior::Ignore] which effectively does nothing.
+    pub(crate) dangling_tx: AtomicDropBehavior,
+}
+
+impl Clone for Connection {
+    fn clone(&self) -> Self {
+        let i = self.inner.clone();
+
+        Self {
+            inner: i,
+            //inner: Arc::clone(&self.inner),
+            transaction_behavior: self.transaction_behavior,
+            dangling_tx: AtomicDropBehavior::new(self.dangling_tx.load(Ordering::SeqCst)),
+        }
+    }
+}
+
+unsafe impl Send for Connection {}
+unsafe impl Sync for Connection {}
+
+impl Connection {
+    pub fn create(conn: Arc<turso_core::Connection>) -> Self {
+        #[allow(clippy::arc_with_non_send_sync)]
+        let connection = Connection {
+            inner: Some(Arc::new(Mutex::new(conn))),
+            transaction_behavior: TransactionBehavior::Deferred,
+            dangling_tx: AtomicDropBehavior::new(DropBehavior::Ignore),
+        };
+        connection
+    }
+
+    pub(crate) async fn maybe_handle_dangling_tx(&self) -> Result<()> {
+        match self.dangling_tx.load(Ordering::SeqCst) {
+            DropBehavior::Rollback => {
+                let mut stmt = self.prepare("ROLLBACK").await?;
+                stmt.execute(()).await?;
+                self.dangling_tx
+                    .store(DropBehavior::Ignore, Ordering::SeqCst);
+            }
+            DropBehavior::Commit => {
+                let mut stmt = self.prepare("COMMIT").await?;
+                stmt.execute(()).await?;
+                self.dangling_tx
+                    .store(DropBehavior::Ignore, Ordering::SeqCst);
+            }
+            DropBehavior::Ignore => {}
+            DropBehavior::Panic => {
+                panic!("Transaction dropped unexpectedly.");
+            }
+        }
+        Ok(())
+    }
+
+    /// Query the database with SQL.
+    pub async fn query(&self, sql: &str, params: impl IntoParams) -> Result<Rows> {
+        self.maybe_handle_dangling_tx().await?;
+        let mut stmt = self.prepare(sql).await?;
+        stmt.query(params).await
+    }
+
+    /// Execute SQL statement on the database.
+    pub async fn execute(&self, sql: &str, params: impl IntoParams) -> Result<u64> {
+        self.maybe_handle_dangling_tx().await?;
+        let mut stmt = self.prepare(sql).await?;
+        stmt.execute(params).await
+    }
+
+    /// get the inner connection
+    fn get_inner_connection(&self) -> Result<MutexGuard<'_, Arc<turso_core::Connection>>> {
+        match &self.inner {
+            Some(inner) => Ok(inner.lock().map_err(|e| Error::MutexError(e.to_string()))?),
+            None => Err(Error::MutexError(
+                "Inner connection can't be none".to_string(),
+            )),
+        }
+    }
+
+    #[cfg(feature = "conn_raw_api")]
+    pub fn wal_frame_count(&self) -> Result<u64> {
+        let conn = self.get_inner_connection()?;
+        conn.wal_state()
+            .map_err(|e| Error::WalOperationError(format!("wal_insert_begin failed: {e}")))
+            .map(|state| state.max_frame)
+    }
+
+    #[cfg(feature = "conn_raw_api")]
+    pub fn try_wal_watermark_read_page(
+        &self,
+        page_idx: u32,
+        page: &mut [u8],
+        frame_watermark: Option<u64>,
+    ) -> Result<bool> {
+        let conn = self.get_inner_connection()?;
+        conn.try_wal_watermark_read_page(page_idx, page, frame_watermark)
+            .map_err(|e| {
+                Error::WalOperationError(format!("try_wal_watermark_read_page failed: {e}"))
+            })
+    }
+
+    #[cfg(feature = "conn_raw_api")]
+    pub fn wal_changed_pages_after(&self, frame_watermark: u64) -> Result<Vec<u32>> {
+        let conn = self.get_inner_connection()?;
+        conn.wal_changed_pages_after(frame_watermark)
+            .map_err(|e| Error::WalOperationError(format!("wal_changed_pages_after failed: {e}")))
+    }
+
+    #[cfg(feature = "conn_raw_api")]
+    pub fn wal_insert_begin(&self) -> Result<()> {
+        let conn = self.get_inner_connection()?;
+        conn.wal_insert_begin()
+            .map_err(|e| Error::WalOperationError(format!("wal_insert_begin failed: {e}")))
+    }
+
+    #[cfg(feature = "conn_raw_api")]
+    pub fn wal_insert_end(&self, force_commit: bool) -> Result<()> {
+        let conn = self.get_inner_connection()?;
+        conn.wal_insert_end(force_commit)
+            .map_err(|e| Error::WalOperationError(format!("wal_insert_end failed: {e}")))
+    }
+
+    #[cfg(feature = "conn_raw_api")]
+    pub fn wal_insert_frame(&self, frame_no: u64, frame: &[u8]) -> Result<WalFrameInfo> {
+        let conn = self.get_inner_connection()?;
+        conn.wal_insert_frame(frame_no, frame)
+            .map_err(|e| Error::WalOperationError(format!("wal_insert_frame failed: {e}")))
+    }
+
+    #[cfg(feature = "conn_raw_api")]
+    pub fn wal_get_frame(&self, frame_no: u64, frame: &mut [u8]) -> Result<WalFrameInfo> {
+        let conn = self.get_inner_connection()?;
+        conn.wal_get_frame(frame_no, frame)
+            .map_err(|e| Error::WalOperationError(format!("wal_insert_frame failed: {e}")))
+    }
+
+    /// Execute a batch of SQL statements on the database.
+    pub async fn execute_batch(&self, sql: &str) -> Result<()> {
+        self.maybe_handle_dangling_tx().await?;
+        self.prepare_execute_batch(sql).await?;
+        Ok(())
+    }
+
+    /// Prepare a SQL statement for later execution.
+    pub async fn prepare(&self, sql: &str) -> Result<Statement> {
+        let conn = self.get_inner_connection()?;
+        let stmt = conn.prepare(sql)?;
+
+        #[allow(clippy::arc_with_non_send_sync)]
+        let statement = Statement {
+            inner: Arc::new(Mutex::new(stmt)),
+        };
+        Ok(statement)
+    }
+
+    async fn prepare_execute_batch(&self, sql: impl AsRef<str>) -> Result<()> {
+        self.maybe_handle_dangling_tx().await?;
+        let conn = self.get_inner_connection()?;
+        conn.prepare_execute_batch(sql)?;
+        Ok(())
+    }
+
+    /// Query a pragma.
+    pub fn pragma_query<F>(&self, pragma_name: &str, mut f: F) -> Result<()>
+    where
+        F: FnMut(&Row) -> turso_core::Result<()>,
+    {
+        let conn = self.get_inner_connection()?;
+        let rows: Vec<Row> = conn
+            .pragma_query(pragma_name)
+            .map_err(|e| Error::SqlExecutionFailure(e.to_string()))?
+            .iter()
+            .map(|row| row.iter().collect::<Row>())
+            .collect();
+
+        rows.iter().try_for_each(|row| {
+            f(row).map_err(|e| {
+                Error::SqlExecutionFailure(format!("Error executing user defined function: {e}"))
+            })
+        })?;
+        Ok(())
+    }
+
+    /// Returns the rowid of the last row inserted.
+    pub fn last_insert_rowid(&self) -> i64 {
+        let conn = self.get_inner_connection().unwrap();
+        conn.last_insert_rowid()
+    }
+
+    /// Flush dirty pages to disk.
+    /// This will write the dirty pages to the WAL.
+    pub fn cacheflush(&self) -> Result<()> {
+        let conn = self.get_inner_connection()?;
+        let completions = conn.cacheflush()?;
+        let pager = conn.get_pager();
+        for c in completions {
+            pager.io.wait_for_completion(c)?;
+        }
+        Ok(())
+    }
+
+    pub fn is_autocommit(&self) -> Result<bool> {
+        let conn = self.get_inner_connection()?;
+        Ok(conn.get_auto_commit())
+    }
+
+    /// Sets maximum total accumuated timeout. If the duration is None or Zero, we unset the busy handler for this Connection
+    ///
+    /// This api defers slighty from: https://www.sqlite.org/c3ref/busy_timeout.html
+    ///
+    /// Instead of sleeping for linear amount of time specified by the user,
+    /// we will sleep in phases, until the the total amount of time is reached.
+    /// This means we first sleep of 1ms, then if we still return busy, we sleep for 2 ms, and repeat until a maximum of 100 ms per phase.
+    ///
+    /// Example:
+    /// 1. Set duration to 5ms
+    /// 2. Step through query -> returns Busy -> sleep/yield for 1 ms
+    /// 3. Step through query -> returns Busy -> sleep/yield for 2 ms
+    /// 4. Step through query -> returns Busy -> sleep/yield for 2 ms (totaling 5 ms of sleep)
+    /// 5. Step through query -> returns Busy -> return Busy to user
+    pub fn busy_timeout(&self, duration: std::time::Duration) -> Result<()> {
+        let conn = self.get_inner_connection()?;
+        conn.set_busy_timeout(duration);
+        Ok(())
+    }
+}
+
+impl Debug for Connection {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Connection").finish()
+    }
+}