Merge remote-tracking branch 'upstream/main' into cleanup-deps

Author: mlafeldt

.github/workflows/rust.yaml

@@ -35,7 +35,7 @@ jobs:
         name: Download duckdb
         with:
           repository: "duckdb/duckdb"
-          tag: "v1.3.0"
+          tag: "v1.3.1"
           fileName: ${{ matrix.duckdb }}
           out-file-path: .
 

Cargo.lock

@@ -7,7 +7,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.3.0"
+version = "1.3.1"
 authors = ["wangfenjin <[email protected]>"]
 edition = "2021"
 repository = "https://github.com/duckdb/duckdb-rs"
@@ -19,6 +19,10 @@ license = "MIT"
 categories = ["database"]
 
 [workspace.dependencies]
+duckdb = { version = "=1.3.1", path = "crates/duckdb" }
+duckdb-loadable-macros = { version = "=0.1.7", path = "crates/duckdb-loadable-macros" }
+libduckdb-sys = { version = "=1.3.1", path = "crates/libduckdb-sys" }
+
 arrow = { version = "55", default-features = false }
 bindgen = { version = "0.71.1", default-features = false }
 calamine = "0.28.0"
@@ -29,13 +33,10 @@ chrono = { version = "0.4.22", default-features = false, features = [
     "clock",
 ] }
 doc-comment = "0.3"
-duckdb = { version = "=1.3.0", path = "crates/duckdb" }
-duckdb-loadable-macros = { version = "=0.1.7", path = "crates/duckdb-loadable-macros" }
 fallible-iterator = "0.3"
 fallible-streaming-iterator = "0.1"
 flate2 = "1.0"
 hashlink = "0.10"
-libduckdb-sys = { version = "=1.3.0", path = "crates/libduckdb-sys" }
 num = { version = "0.4", default-features = false }
 num-integer = "0.1.46"
 pkg-config = "0.3.24"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "duckdb"
-version = "1.3.0"
+version = "1.3.1"
 authors = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }

crates/duckdb/Cargo.toml

@@ -22,9 +22,7 @@ fn test_large_arrow_types() -> crate::Result<()> {
 fn test_with_database(database: &Connection) -> crate::Result<()> {
     // uhugeint, time_tz, and dec38_10 aren't supported in the duckdb arrow layer
     // union is currently blocked by https://github.com/duckdb/duckdb/pull/11326
-    let excluded = [
-        "uhugeint", "time_tz", "dec38_10", "union", "varint", "dec_4_1", "dec_9_4", "dec_18_6",
-    ];
+    let excluded = ["uhugeint", "time_tz", "dec38_10", "union", "varint"];
 
     let mut binding = database.prepare(&format!(
         "SELECT * EXCLUDE ({}) FROM test_all_types()",

crates/duckdb/src/test_all_types.rs

@@ -1182,7 +1182,7 @@ mod test {
         db.register_table_function::<ArrowVTab>("arrow")?;
 
         let rbs: Vec<RecordBatch> = db
-            .prepare("SELECT value::DECIMAL(38,0) as value FROM read_parquet('./examples/int32_decimal.parquet');")?
+            .prepare("SELECT * FROM read_parquet('./examples/int32_decimal.parquet');")?
             .query_arrow([])?
             .collect();
         let param = arrow_recordbatch_to_query_params(rbs.into_iter().next().unwrap());
@@ -1192,7 +1192,7 @@ mod test {
         assert_eq!(rb.num_columns(), 1);
         let column = rb.column(0).as_any().downcast_ref::<Decimal128Array>().unwrap();
         assert_eq!(column.len(), 1);
-        assert_eq!(column.value(0), i128::from(300));
+        assert_eq!(column.value(0), i128::from(30000));
         Ok(())
     }
 
@@ -1620,12 +1620,12 @@ mod test {
 
         // With custom width and scale
         let array: PrimitiveArray<arrow::datatypes::Decimal128Type> =
-            Decimal128Array::from(vec![i128::from(12345)]).with_data_type(DataType::Decimal128(38, 10));
+            Decimal128Array::from(vec![i128::from(12345)]).with_data_type(DataType::Decimal128(5, 2));
         check_rust_primitive_array_roundtrip(array.clone(), array)?;
 
         // With width and zero scale
         let array: PrimitiveArray<arrow::datatypes::Decimal128Type> =
-            Decimal128Array::from(vec![i128::from(12345)]).with_data_type(DataType::Decimal128(38, 0));
+            Decimal128Array::from(vec![i128::from(12345)]).with_data_type(DataType::Decimal128(5, 0));
         check_rust_primitive_array_roundtrip(array.clone(), array)?;
 
         Ok(())

crates/duckdb/src/vtab/arrow.rs

@@ -1,6 +1,6 @@
 [package]
 name = "libduckdb-sys"
-version = "1.3.0"
+version = "1.3.1"
 authors = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }

crates/libduckdb-sys/Cargo.toml

@@ -12,7 +12,7 @@ mkdir -p "$SCRIPT_DIR/../../target" "$SCRIPT_DIR/duckdb"
 export DUCKDB_LIB_DIR="$SCRIPT_DIR/duckdb"
 
 # Download and extract amalgamation
-DUCKDB_VERSION=v1.3.0
+DUCKDB_VERSION=v1.3.1
 git submodule update --init --checkout
 cd "$SCRIPT_DIR/duckdb-sources"
 git fetch