Merge remote-tracking branch 'origin/main' into fix-convert-arrow-list-type

mlafeldt · mlafeldt · commit f37341f834e9 · 2025-08-21T10:33:12.000+02:00
diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml
@@ -114,15 +114,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      # Need nightly rust.
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly
-          components: "rust-src"
-      # Install LLVM tools
+          toolchain: nightly-2025-08-15
+          components: rust-src
       - name: Install LLVM
-        run: |
-          sudo apt-get install -y llvm
+        run: sudo apt-get install -y llvm
       - name: Tests with asan
         env:
           RUSTFLAGS: -Zsanitizer=address -C debuginfo=0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,14 +9,15 @@ members = [
 [workspace.package]
 version = "1.3.2"
 authors = ["wangfenjin <wangfenj@gmail.com>"]
-edition = "2021"
 repository = "https://github.com/duckdb/duckdb-rs"
 homepage = "https://github.com/duckdb/duckdb-rs"
 documentation = "http://docs.rs/duckdb/"
 readme = "README.md"
 keywords = ["duckdb", "database", "ffi"]
 license = "MIT"
 categories = ["database"]
+edition = "2021"
+rust-version = "1.82.0"
 
 [workspace.dependencies]
 duckdb = { version = "=1.3.2", path = "crates/duckdb" }
diff --git a/README.md b/README.md
@@ -200,6 +200,10 @@ If you use the `bundled` features, you will get pregenerated bindings for the
 bundled version of DuckDB. If you want to run `bindgen` at buildtime to
 produce your own bindings, use the `buildtime_bindgen` Cargo feature.
 
+## Rust version compatibility
+
+duckdb-rs is built and tested with stable Rust, and will keep a rolling MSRV (minimum supported Rust version) that can only be updated in major and minor releases on a need by basis (e.g. project dependencies bump their MSRV or a particular Rust feature is useful for us etc.). The new MSRV will be at least 6 months old. Patch releases are guaranteed to have the same MSRV.
+
 ## Contributing
 
 We welcome contributions! Take a look at [CONTRIBUTING.md](CONTRIBUTING.md) for more information.
diff --git a/crates/duckdb-loadable-macros/Cargo.toml b/crates/duckdb-loadable-macros/Cargo.toml
@@ -2,14 +2,15 @@
 name = "duckdb-loadable-macros"
 version = "0.1.9"
 authors = { workspace = true }
-edition = { workspace = true }
 license = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }
 keywords = { workspace = true }
 readme = { workspace = true }
 categories = ["external-ffi-bindings", "database"]
 description = "Native bindings to the libduckdb library, C API; build loadable extensions"
+edition = { workspace = true }
+rust-version = { workspace = true }
 
 [dependencies]
 darling = "0.20.10"
diff --git a/crates/duckdb/Cargo.toml b/crates/duckdb/Cargo.toml
@@ -2,7 +2,6 @@
 name = "duckdb"
 version = "1.3.2"
 authors = { workspace = true }
-edition = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }
 documentation = { workspace = true }
@@ -11,6 +10,8 @@ keywords = { workspace = true }
 license = { workspace = true }
 categories = { workspace = true }
 description = "Ergonomic wrapper for DuckDB"
+edition = { workspace = true }
+rust-version = { workspace = true }
 
 [lib]
 name = "duckdb"
diff --git a/crates/duckdb/src/appender_params.rs b/crates/duckdb/src/appender_params.rs
@@ -10,7 +10,7 @@ use sealed::Sealed;
 /// Trait used for [sets of parameter][params] passed into SQL
 /// statements/queries.
 ///
-/// [params]: https://www.sqlite.org/c3ref/bind_blob.html
+/// [params]: https://duckdb.org/docs/stable/clients/c/prepared.html
 ///
 /// Note: Currently, this trait can only be implemented inside this crate.
 /// Additionally, it's methods (which are `doc(hidden)`) should currently not be
diff --git a/crates/duckdb/src/lib.rs b/crates/duckdb/src/lib.rs
@@ -83,7 +83,7 @@ pub use crate::{
     params::{params_from_iter, Params, ParamsFromIter},
     row::{AndThenRows, Map, MappedRows, Row, RowIndex, Rows},
     statement::Statement,
-    transaction::{DropBehavior, Transaction, TransactionBehavior},
+    transaction::{DropBehavior, Transaction},
     types::ToSql,
 };
 #[cfg(feature = "polars")]
diff --git a/crates/duckdb/src/params.rs b/crates/duckdb/src/params.rs
@@ -10,16 +10,16 @@ use sealed::Sealed;
 /// Trait used for [sets of parameter][params] passed into SQL
 /// statements/queries.
 ///
-/// [params]: https://www.sqlite.org/c3ref/bind_blob.html
+/// [params]: https://duckdb.org/docs/stable/clients/c/prepared.html
 ///
 /// Note: Currently, this trait can only be implemented inside this crate.
-/// Additionally, it's methods (which are `doc(hidden)`) should currently not be
+/// Additionally, its methods (which are `doc(hidden)`) should currently not be
 /// considered part of the stable API, although it's possible they will
 /// stabilize in the future.
 ///
-/// # Passing parameters to SQLite
+/// # Passing parameters to DuckDB
 ///
-/// Many functions in this library let you pass parameters to SQLite. Doing this
+/// Many functions in this library let you pass parameters to DuckDB. Doing this
 /// lets you avoid any risk of SQL injection, and is simpler than escaping
 /// things manually. Aside from deprecated functions and a few helpers, this is
 /// indicated by the function taking a generic argument that implements `Params`
diff --git a/crates/duckdb/src/pragma.rs b/crates/duckdb/src/pragma.rs
@@ -146,9 +146,6 @@ impl Connection {
     ///
     /// Some pragmas will return multiple rows/values which cannot be retrieved
     /// with this method.
-    ///
-    /// Prefer [PRAGMA function](https://sqlite.org/pragma.html#pragfunc) introduced in DuckDB 3.20:
-    /// `SELECT user_version FROM pragma_user_version;`
     pub fn pragma_query_value<T, F>(&self, schema_name: Option<DatabaseName<'_>>, pragma_name: &str, f: F) -> Result<T>
     where
         F: FnOnce(&Row<'_>) -> Result<T>,
@@ -159,9 +156,6 @@ impl Connection {
     }
 
     /// Query the current rows/values of `pragma_name`.
-    ///
-    /// Prefer [PRAGMA function](https://sqlite.org/pragma.html#pragfunc) introduced in DuckDB 3.20:
-    /// `SELECT * FROM pragma_collation_list;`
     pub fn pragma_query<F>(&self, schema_name: Option<DatabaseName<'_>>, pragma_name: &str, mut f: F) -> Result<()>
     where
         F: FnMut(&Row<'_>) -> Result<()>,
@@ -176,15 +170,11 @@ impl Connection {
         Ok(())
     }
 
-    /// Query the current value(s) of `pragma_name` associated to
-    /// `pragma_value`.
+    /// Query the current value(s) of `pragma_name` associated to `pragma_value`.
     ///
     /// This method can be used with query-only pragmas which need an argument
     /// (e.g. `table_info('one_tbl')`) or pragmas which returns value(s)
     /// (e.g. `integrity_check`).
-    ///
-    /// Prefer [PRAGMA function](https://sqlite.org/pragma.html#pragfunc) introduced in DuckDB 3.20:
-    /// `SELECT * FROM pragma_table_info(?);`
     pub fn pragma<F>(
         &self,
         schema_name: Option<DatabaseName<'_>>,
diff --git a/crates/duckdb/src/transaction.rs b/crates/duckdb/src/transaction.rs
@@ -1,22 +1,6 @@
 use crate::{Connection, Result};
 use std::ops::Deref;
 
-/// Options for transaction behavior. See [BEGIN
-/// TRANSACTION](http://www.sqlite.org/lang_transaction.html) for details.
-#[derive(Copy, Clone)]
-#[non_exhaustive]
-pub enum TransactionBehavior {
-    /// DEFERRED means that the transaction does not actually start until the
-    /// database is first accessed.
-    Deferred,
-    /// IMMEDIATE cause the database connection to start a new write
-    /// immediately, without waiting for a writes statement.
-    Immediate,
-    /// EXCLUSIVE prevents other database connections from reading the database
-    /// while the transaction is underway.
-    Exclusive,
-}
-
 /// Options for how a Transaction should behave when it is dropped.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 #[non_exhaustive]
@@ -71,7 +55,7 @@ impl Transaction<'_> {
     /// where this is unacceptable, [`Transaction::new_unchecked`] is available.
     #[inline]
     pub fn new(conn: &mut Connection) -> Result<Transaction<'_>> {
-        Self::new_unchecked(conn, TransactionBehavior::Deferred)
+        Self::new_unchecked(conn)
     }
 
     /// Begin a new transaction, failing if a transaction is open.
@@ -80,14 +64,8 @@ impl Transaction<'_> {
     /// possible, [`Transaction::new`] should be preferred, as it provides a
     /// compile-time guarantee that transactions are not nested.
     #[inline]
-    fn new_unchecked(conn: &Connection, _: TransactionBehavior) -> Result<Transaction<'_>> {
-        // TODO(wangfenjin): not supported
-        // let query = match behavior {
-        //     TransactionBehavior::Deferred => "BEGIN DEFERRED",
-        //     TransactionBehavior::Immediate => "BEGIN IMMEDIATE",
-        //     TransactionBehavior::Exclusive => "BEGIN EXCLUSIVE",
-        // };
-        let query = "BEGIN Transaction";
+    pub fn new_unchecked(conn: &Connection) -> Result<Transaction<'_>> {
+        let query = "BEGIN TRANSACTION";
         conn.execute_batch(query).map(move |_| Transaction {
             conn,
             drop_behavior: DropBehavior::Rollback,
@@ -116,8 +94,7 @@ impl Transaction<'_> {
 
     #[inline]
     fn commit_(&mut self) -> Result<()> {
-        self.conn.execute_batch("COMMIT")?;
-        Ok(())
+        self.conn.execute_batch("COMMIT")
     }
 
     /// A convenience method which consumes and rolls back a transaction.
@@ -128,8 +105,7 @@ impl Transaction<'_> {
 
     #[inline]
     fn rollback_(&mut self) -> Result<()> {
-        self.conn.execute_batch("ROLLBACK")?;
-        Ok(())
+        self.conn.execute_batch("ROLLBACK")
     }
 
     /// Consumes the transaction, committing or rolling back according to the
@@ -206,19 +182,6 @@ impl Connection {
         Transaction::new(self)
     }
 
-    /// Begin a new transaction with a specified behavior.
-    ///
-    /// See [`transaction`](Connection::transaction).
-    ///
-    /// # Failure
-    ///
-    /// Will return `Err` if the underlying DuckDB call fails.
-    #[inline]
-    #[allow(dead_code)]
-    fn transaction_with_behavior(&mut self, behavior: TransactionBehavior) -> Result<Transaction<'_>> {
-        Transaction::new_unchecked(self, behavior)
-    }
-
     /// Begin a new transaction with the default behavior (DEFERRED).
     ///
     /// Attempt to open a nested transaction will result in a DuckDB error.
@@ -251,7 +214,7 @@ impl Connection {
     /// Will return `Err` if the underlying DuckDB call fails. The specific
     /// error returned if transactions are nested is currently unspecified.
     pub fn unchecked_transaction(&self) -> Result<Transaction<'_>> {
-        Transaction::new_unchecked(self, TransactionBehavior::Deferred)
+        Transaction::new_unchecked(self)
     }
 }
 
diff --git a/crates/duckdb/src/types/chrono.rs b/crates/duckdb/src/types/chrono.rs
@@ -1,4 +1,4 @@
-//! Convert most of the [Time Strings](http://sqlite.org/lang_datefunc.html) to chrono types.
+//! Convert most of the [Time Strings](https://duckdb.org/docs/stable/sql/functions/date) to chrono types.
 
 use chrono::{DateTime, Duration, Local, NaiveDate, NaiveDateTime, NaiveTime, TimeZone, Utc};
 use num_integer::Integer;
diff --git a/crates/duckdb/src/types/value.rs b/crates/duckdb/src/types/value.rs
@@ -1,8 +1,8 @@
 use super::{Null, OrderedMap, TimeUnit, Type};
 use rust_decimal::prelude::*;
 
-/// Owning [dynamic type value](http://sqlite.org/datatype3.html). Value's type is typically
-/// dictated by DuckDB (not by the caller).
+/// Owning [dynamic type value](https://duckdb.org/docs/stable/sql/data_types/overview.html).
+/// Value's type is typically dictated by DuckDB (not by the caller).
 ///
 /// See [`ValueRef`](crate::types::ValueRef) for a non-owning dynamic type
 /// value.
diff --git a/crates/libduckdb-sys/Cargo.toml b/crates/libduckdb-sys/Cargo.toml
@@ -2,7 +2,6 @@
 name = "libduckdb-sys"
 version = "1.3.2"
 authors = { workspace = true }
-edition = { workspace = true }
 license = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }
@@ -12,6 +11,8 @@ build = "build.rs"
 categories = ["external-ffi-bindings", "database"]
 description = "Native bindings to the libduckdb library, C API"
 exclude = ["duckdb-sources"]
+edition = { workspace = true }
+rust-version = { workspace = true }
 
 [features]
 default = ["vcpkg", "pkg-config"]
