Merge pull request #3 from duckdb/main

DuckDB v0.10.1

.github/workflows/rust.yaml

@@ -38,7 +38,7 @@ jobs:
         name: Download duckdb
         with:
           repository: "duckdb/duckdb"
-          tag: "v0.10.0"
+          tag: "v0.10.1"
           fileName: ${{ matrix.duckdb }}
           out-file-path: .
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "duckdb"
-version = "0.10.0"
+version = "0.10.1"
 authors = ["wangfenjin <[email protected]>"]
 edition = "2021"
 description = "Ergonomic wrapper for DuckDB"
@@ -79,7 +79,7 @@ polars-core = "0.35.4"
 
 [dependencies.libduckdb-sys]
 path = "libduckdb-sys"
-version = "0.10.0"
+version = "0.10.1"
 
 [package.metadata.docs.rs]
 features = []

examples/appender.rs

@@ -1,5 +1,4 @@
 extern crate duckdb;
-use std::convert::TryFrom;
 
 use duckdb::{params, Connection, DropBehavior, Result};
 

libduckdb-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libduckdb-sys"
-version = "0.10.0"
+version = "0.10.1"
 authors = ["wangfenjin <[email protected]>"]
 edition = "2021"
 build = "build.rs"

libduckdb-sys/build.rs

@@ -7,7 +7,7 @@ mod openssl;
 /// `cfg!(windows)`, since the latter does not properly handle cross-compilation
 ///
 /// Note that there is no way to know at compile-time which system we'll be
-/// targetting, and this test must be made at run-time (of the build script) See
+/// targeting, and this test must be made at run-time (of the build script) See
 /// https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts
 #[allow(dead_code)]
 fn win_target() -> bool {

libduckdb-sys/upgrade.sh

@@ -10,7 +10,7 @@ export DUCKDB_LIB_DIR="$SCRIPT_DIR/duckdb"
 export DU_INCLUDE_DIR="$DUCKDB_LIB_DIR"
 
 # Download and extract amalgamation
-DUCKDB_VERSION=v0.10.0
+DUCKDB_VERSION=v0.10.1
 git submodule update --init --checkout
 cd "$SCRIPT_DIR/duckdb-sources" || { echo "fatal error" >&2; exit 1; }
 git fetch

src/appender/mod.rs

@@ -1,5 +1,5 @@
 use super::{ffi, AppenderParams, Connection, Result, ValueRef};
-use std::{ffi::c_void, fmt, iter::IntoIterator, os::raw::c_char};
+use std::{ffi::c_void, fmt, os::raw::c_char};
 
 use crate::{
     error::result_from_duckdb_appender,
@@ -170,7 +170,6 @@ impl fmt::Debug for Appender<'_> {
 #[cfg(test)]
 mod test {
     use crate::{Connection, Result};
-    use std::convert::TryFrom;
 
     #[test]
     fn test_append_one_row() -> Result<()> {

src/error.rs

@@ -81,7 +81,7 @@ pub enum Error {
     /// given, the 2nd is how many were expected.
     InvalidParameterCount(usize, usize),
 
-    /// Apppend Error
+    /// Append Error
     AppendError,
 }
 

src/lib.rs

@@ -60,7 +60,6 @@ pub use libduckdb_sys as ffi;
 use std::{
     cell::RefCell,
     convert,
-    default::Default,
     ffi::CString,
     fmt,
     path::{Path, PathBuf},

src/r2d2.rs

@@ -102,7 +102,7 @@ impl r2d2::ManageConnection for DuckdbConnectionManager {
 mod test {
     extern crate r2d2;
     use super::*;
-    use crate::{types::Value, Result};
+    use crate::types::Value;
     use std::{sync::mpsc, thread};
 
     use tempdir::TempDir;

src/raw_statement.rs

@@ -1,4 +1,4 @@
-use std::{convert::TryFrom, ffi::CStr, ptr, rc::Rc, sync::Arc};
+use std::{ffi::CStr, ptr, rc::Rc, sync::Arc};
 
 use arrow::{
     array::StructArray,

src/statement.rs

@@ -1,4 +1,4 @@
-use std::{convert, ffi::c_void, fmt, iter::IntoIterator, mem, os::raw::c_char, ptr, str};
+use std::{convert, ffi::c_void, fmt, mem, os::raw::c_char, ptr, str};
 
 use arrow::{array::StructArray, datatypes::DataType};
 

src/types/chrono.rs

@@ -63,12 +63,15 @@ impl FromSql for NaiveDateTime {
                     TimeUnit::Microsecond => (t / 1_000_000, (t % 1_000_000) * 1000),
                     TimeUnit::Nanosecond => (t / 1_000_000_000, t % 1_000_000_000),
                 };
-                Ok(NaiveDateTime::from_timestamp_opt(secs, nsecs as u32).unwrap())
-            }
-            ValueRef::Date32(d) => Ok(NaiveDateTime::from_timestamp_opt(24 * 3600 * (d as i64), 0).unwrap()),
-            ValueRef::Time64(TimeUnit::Microsecond, d) => {
-                Ok(NaiveDateTime::from_timestamp_opt(d / 1_000_000, ((d % 1_000_000) * 1_000) as u32).unwrap())
+                Ok(DateTime::from_timestamp(secs, nsecs as u32).unwrap().naive_utc())
             }
+            ValueRef::Date32(d) => Ok(DateTime::from_timestamp(24 * 3600 * (d as i64), 0).unwrap().naive_utc()),
+            ValueRef::Time64(TimeUnit::Microsecond, d) => Ok(DateTime::from_timestamp(
+                d / 1_000_000,
+                ((d % 1_000_000) * 1_000) as u32,
+            )
+            .unwrap()
+            .naive_utc()),
             ValueRef::Text(s) => {
                 let mut s = std::str::from_utf8(s).unwrap();
                 let format = match s.len() {
@@ -206,7 +209,7 @@ mod test {
         assert_eq!(utc, v2);
 
         let v3: DateTime<Utc> = db.query_row("SELECT '2016-02-23 23:56:04'", [], |r| r.get(0))?;
-        assert_eq!(utc - Duration::milliseconds(789), v3);
+        assert_eq!(utc - Duration::try_milliseconds(789).unwrap(), v3);
 
         let v4: DateTime<Utc> = db.query_row("SELECT '2016-02-23 23:56:04.789+00:00'", [], |r| r.get(0))?;
         assert_eq!(utc, v4);

src/types/from_sql.rs

@@ -272,7 +272,6 @@ impl FromSql for Value {
 mod test {
     use super::FromSql;
     use crate::{Connection, Error, Result};
-    use std::convert::TryFrom;
 
     #[test]
     fn test_timestamp_raw() -> Result<()> {

src/types/value.rs

@@ -36,7 +36,7 @@ pub enum Value {
     Double(f64),
     /// The value is a Decimal.
     Decimal(Decimal),
-    /// The value is a timestap.
+    /// The value is a timestamp.
     Timestamp(TimeUnit, i64),
     /// The value is a text string.
     Text(String),

src/types/value_ref.rs

@@ -39,19 +39,19 @@ pub enum ValueRef<'a> {
     HugeInt(i128),
     /// The value is a unsigned tiny integer.
     UTinyInt(u8),
-    /// The value is a usigned small integer.
+    /// The value is a unsigned small integer.
     USmallInt(u16),
-    /// The value is a usigned integer.
+    /// The value is a unsigned integer.
     UInt(u32),
-    /// The value is a usigned big integer.
+    /// The value is a unsigned big integer.
     UBigInt(u64),
     /// The value is a f32.
     Float(f32),
     /// The value is a f64.
     Double(f64),
     /// The value is a decimal
     Decimal(Decimal),
-    /// The value is a timestap.
+    /// The value is a timestamp.
     Timestamp(TimeUnit, i64),
     /// The value is a text string.
     Text(&'a [u8]),

src/vtab/arrow.rs

@@ -6,8 +6,8 @@ use super::{
 use crate::vtab::vector::Inserter;
 use arrow::array::{
     as_boolean_array, as_large_list_array, as_list_array, as_primitive_array, as_string_array, Array, ArrayData,
-    ArrowPrimitiveType, BooleanArray, Decimal128Array, FixedSizeListArray, GenericListArray, OffsetSizeTrait,
-    PrimitiveArray, StringArray, StructArray,
+    BooleanArray, Decimal128Array, FixedSizeListArray, GenericListArray, OffsetSizeTrait, PrimitiveArray, StringArray,
+    StructArray,
 };
 
 use arrow::{

src/vtab/excel.rs

@@ -110,7 +110,7 @@ impl VTab for ExcelVTab {
                         );
                     }
                     _ => {
-                        panic!("Shouldn't happend");
+                        panic!("Shouldn't happen");
                     }
                 }
             }

src/vtab/mod.rs

@@ -198,7 +198,6 @@ impl InnerConnection {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{Connection, Result};
     use std::{
         error::Error,
         ffi::{c_char, CString},