Update arrow requirement from 25 to 26 (#96)

* Update arrow requirement from 25 to 26 Updates the requirements on [arrow](https://github.com/apache/arrow-rs) to permit the latest version. - [Release notes](https://github.com/apache/arrow-rs/releases) - [Changelog](https://github.com/apache/arrow-rs/blob/master/CHANGELOG.md) - [Commits](apache/arrow-rs@25.0.0...26.0.0) --- updated-dependencies: - dependency-name: arrow dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * fix clippy error Change-Id: Idb65d2547e1f706a510137904ab14d6f15a74741 Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: wangfenjin <[email protected]>
duckdb · Nov 8, 2022 · 1a7968d · 1a7968d
1 parent 67d6c90
commit 1a7968d
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 37 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,7 +47,7 @@ memchr = "2.3"
 uuid = { version = "1.0", optional = true }
 smallvec = "1.6.1"
 cast = { version = "0.3", features = ["std"] }
-arrow = { version = "25", default-features = false, features = ["prettyprint", "ffi"] }
+arrow = { version = "26", default-features = false, features = ["prettyprint", "ffi"] }
 rust_decimal = "1.14"
 strum = { version = "0.24", features = ["derive"] }
 r2d2 = { version = "0.8.9", optional = true }

diff --git a/libduckdb-sys/Cargo.toml b/libduckdb-sys/Cargo.toml
@@ -28,4 +28,4 @@ cc = { version = "1.0", features = ["parallel"], optional = true }
 vcpkg = { version = "0.2", optional = true }
 
 [dev-dependencies]
-arrow = { version = "25", default-features = false, features = ["ffi"] }
+arrow = { version = "26", default-features = false, features = ["ffi"] }
diff --git a/src/config.rs b/src/config.rs
@@ -144,9 +144,9 @@ mod test {
         db.execute_batch("CREATE TABLE foo(x Text)")?;
 
         let mut stmt = db.prepare("INSERT INTO foo(x) VALUES (?)")?;
-        stmt.execute(&[&"a"])?;
-        stmt.execute(&[&"b"])?;
-        stmt.execute(&[&"c"])?;
+        stmt.execute([&"a"])?;
+        stmt.execute([&"b"])?;
+        stmt.execute([&"c"])?;
         stmt.execute([Value::Null])?;
 
         let val: Result<Vec<Option<String>>> = db
@@ -178,9 +178,9 @@ mod test {
         db.execute_batch("CREATE TABLE foo(x Text)")?;
 
         let mut stmt = db.prepare("INSERT INTO foo(x) VALUES (?)")?;
-        stmt.execute(&[&"a"])?;
-        stmt.execute(&[&"b"])?;
-        stmt.execute(&[&"c"])?;
+        stmt.execute([&"a"])?;
+        stmt.execute([&"b"])?;
+        stmt.execute([&"c"])?;
         stmt.execute([Value::Null])?;
 
         let val: Result<Vec<Option<String>>> = db

diff --git a/src/lib.rs b/src/lib.rs
@@ -623,7 +623,7 @@ mod test {
         }
 
         let path_string = path.to_str().unwrap();
-        let db = Connection::open(&path_string)?;
+        let db = Connection::open(path_string)?;
         let the_answer: Result<i64> = db.query_row("SELECT x FROM foo", [], |r| r.get(0));
 
         assert_eq!(42i64, the_answer?);

diff --git a/src/r2d2.rs b/src/r2d2.rs
@@ -208,9 +208,9 @@ mod test {
         conn.execute_batch("CREATE TABLE foo(x Text)")?;
 
         let mut stmt = conn.prepare("INSERT INTO foo(x) VALUES (?)")?;
-        stmt.execute(&[&"a"])?;
-        stmt.execute(&[&"b"])?;
-        stmt.execute(&[&"c"])?;
+        stmt.execute([&"a"])?;
+        stmt.execute([&"b"])?;
+        stmt.execute([&"c"])?;
         stmt.execute([Value::Null])?;
 
         let val: Result<Vec<Option<String>>> = conn

diff --git a/src/row.rs b/src/row.rs
@@ -638,7 +638,7 @@ impl RowIndex for usize {
 impl RowIndex for &'_ str {
     #[inline]
     fn idx(&self, stmt: &Statement<'_>) -> Result<usize> {
-        stmt.column_index(*self)
+        stmt.column_index(self)
     }
 }
 

diff --git a/src/statement.rs b/src/statement.rs
@@ -493,17 +493,17 @@ mod test {
         let db = Connection::open_in_memory()?;
         db.execute_batch("CREATE TABLE foo(x INTEGER)")?;
 
-        assert_eq!(db.execute("INSERT INTO foo(x) VALUES (?)", &[&2i32])?, 1);
-        assert_eq!(db.execute("INSERT INTO foo(x) VALUES (?)", &[&3i32])?, 1);
+        assert_eq!(db.execute("INSERT INTO foo(x) VALUES (?)", [&2i32])?, 1);
+        assert_eq!(db.execute("INSERT INTO foo(x) VALUES (?)", [&3i32])?, 1);
 
         // TODO(wangfenjin): No column type for SUM(x)?
         assert_eq!(
             5i32,
-            db.query_row::<i32, _, _>("SELECT SUM(x) FROM foo WHERE x > ?", &[&0i32], |r| r.get(0))?
+            db.query_row::<i32, _, _>("SELECT SUM(x) FROM foo WHERE x > ?", [&0i32], |r| r.get(0))?
         );
         assert_eq!(
             3i32,
-            db.query_row::<i32, _, _>("SELECT SUM(x) FROM foo WHERE x > ?", &[&2i32], |r| r.get(0))?
+            db.query_row::<i32, _, _>("SELECT SUM(x) FROM foo WHERE x > ?", [&2i32], |r| r.get(0))?
         );
         Ok(())
     }
@@ -518,10 +518,10 @@ mod test {
         db.execute_batch(sql)?;
 
         let mut stmt = db.prepare("INSERT INTO test (name) VALUES (?)")?;
-        stmt.execute(&[&"one"])?;
+        stmt.execute([&"one"])?;
 
         let mut stmt = db.prepare("SELECT COUNT(*) FROM test WHERE name = ?")?;
-        assert_eq!(1i32, stmt.query_row::<i32, _, _>(&[&"one"], |r| r.get(0))?);
+        assert_eq!(1i32, stmt.query_row::<i32, _, _>([&"one"], |r| r.get(0))?);
         Ok(())
     }
 
@@ -536,7 +536,7 @@ mod test {
 
         let mut stmt = db.prepare("SELECT id FROM test where name = ?")?;
         {
-            let mut rows = stmt.query(&[&"one"])?;
+            let mut rows = stmt.query([&"one"])?;
             let id: Result<i32> = rows.next()?.unwrap().get(0);
             assert_eq!(Ok(1), id);
         }
@@ -554,7 +554,7 @@ mod test {
         db.execute_batch(sql)?;
 
         let mut stmt = db.prepare("SELECT id FROM test where name = ? ORDER BY id ASC")?;
-        let mut rows = stmt.query_and_then(&[&"one"], |row| {
+        let mut rows = stmt.query_and_then([&"one"], |row| {
             let id: i32 = row.get(0)?;
             if id == 1 {
                 Ok(id)
@@ -584,7 +584,7 @@ mod test {
         db.execute_batch(sql)?;
 
         let mut stmt = db.prepare("INSERT INTO test (x, y) VALUES (?, ?)")?;
-        assert!(stmt.execute(&[&"one"]).is_err());
+        assert!(stmt.execute([&"one"]).is_err());
         Ok(())
     }
 
@@ -595,7 +595,7 @@ mod test {
         db.execute_batch(sql)?;
 
         let mut stmt = db.prepare("INSERT INTO test (x) VALUES (?)")?;
-        stmt.execute(&[&"one"])?;
+        stmt.execute([&"one"])?;
 
         let result: Option<String> = db.query_row("SELECT y FROM test WHERE x = 'one'", [], |row| row.get(0))?;
         assert!(result.is_none());
@@ -731,11 +731,9 @@ mod test {
     fn test_bind_parameters() -> Result<()> {
         let db = Connection::open_in_memory()?;
         // dynamic slice:
-        db.query_row(
-            "SELECT ?1, ?2, ?3",
-            &[&1u8 as &dyn ToSql, &"one", &Some("one")],
-            |row| row.get::<_, u8>(0),
-        )?;
+        db.query_row("SELECT ?1, ?2, ?3", [&1u8 as &dyn ToSql, &"one", &Some("one")], |row| {
+            row.get::<_, u8>(0)
+        })?;
         // existing collection:
         let data = vec![1, 2, 3];
         db.query_row("SELECT ?1, ?2, ?3", params_from_iter(&data), |row| row.get::<_, u8>(0))?;
@@ -792,7 +790,7 @@ mod test {
         assert_eq!("UTF-16le", encoding);
         db.execute_batch("CREATE TABLE foo(x TEXT)")?;
         let expected = "テスト";
-        db.execute("INSERT INTO foo(x) VALUES (?)", &[&expected])?;
+        db.execute("INSERT INTO foo(x) VALUES (?)", [&expected])?;
         let actual: String = db.query_row("SELECT x FROM foo", [], |row| row.get(0))?;
         assert_eq!(expected, actual);
         Ok(())

diff --git a/src/types/from_sql.rs b/src/types/from_sql.rs
@@ -358,14 +358,14 @@ mod test {
             T: Into<i128> + FromSql + ::std::fmt::Debug,
         {
             for n in out_of_range {
-                let err = db.query_row("SELECT ?", &[n], |r| r.get::<_, T>(0)).unwrap_err();
+                let err = db.query_row("SELECT ?", [n], |r| r.get::<_, T>(0)).unwrap_err();
                 match err {
                     Error::IntegralValueOutOfRange(_, value) => assert_eq!(*n, value),
                     _ => panic!("unexpected error: {}", err),
                 }
             }
             for n in in_range {
-                assert_eq!(*n, db.query_row("SELECT ?", &[n], |r| r.get::<_, T>(0)).unwrap().into());
+                assert_eq!(*n, db.query_row("SELECT ?", [n], |r| r.get::<_, T>(0)).unwrap().into());
             }
         }
 

diff --git a/src/types/mod.rs b/src/types/mod.rs
@@ -191,7 +191,7 @@ mod test {
         let db = checked_memory_handle()?;
 
         let v1234 = vec![1u8, 2, 3, 4];
-        db.execute("INSERT INTO foo(b) VALUES (?)", &[&v1234])?;
+        db.execute("INSERT INTO foo(b) VALUES (?)", [&v1234])?;
 
         let v: Vec<u8> = db.query_row("SELECT b FROM foo", [], |r| r.get(0))?;
         assert_eq!(v, v1234);
@@ -203,7 +203,7 @@ mod test {
         let db = checked_memory_handle()?;
 
         let empty = vec![];
-        db.execute("INSERT INTO foo(b) VALUES (?)", &[&empty])?;
+        db.execute("INSERT INTO foo(b) VALUES (?)", [&empty])?;
 
         let v: Vec<u8> = db.query_row("SELECT b FROM foo", [], |r| r.get(0))?;
         assert_eq!(v, empty);
@@ -215,7 +215,7 @@ mod test {
         let db = checked_memory_handle()?;
 
         let s = "hello, world!";
-        db.execute("INSERT INTO foo(t) VALUES (?)", &[&s])?;
+        db.execute("INSERT INTO foo(t) VALUES (?)", [&s])?;
 
         let from: String = db.query_row("SELECT t FROM foo", [], |r| r.get(0))?;
         assert_eq!(from, s);
@@ -254,8 +254,8 @@ mod test {
         let s = Some("hello, world!");
         let b = Some(vec![1u8, 2, 3, 4]);
 
-        db.execute("INSERT INTO foo(t) VALUES (?)", &[&s])?;
-        db.execute("INSERT INTO foo(b) VALUES (?)", &[&b])?;
+        db.execute("INSERT INTO foo(t) VALUES (?)", [&s])?;
+        db.execute("INSERT INTO foo(b) VALUES (?)", [&b])?;
 
         let mut stmt = db.prepare("SELECT t, b FROM foo ORDER BY ROWID ASC")?;
         let mut rows = stmt.query([])?;

diff --git a/src/types/serde_json.rs b/src/types/serde_json.rs
@@ -45,7 +45,7 @@ mod test {
         let data: serde_json::Value = serde_json::from_str(json).unwrap();
         db.execute(
             "INSERT INTO foo (t, b) VALUES (?, ?)",
-            &[&data as &dyn ToSql, &json.as_bytes()],
+            [&data as &dyn ToSql, &json.as_bytes()],
         )?;
 
         let t: serde_json::Value = db.query_row("SELECT t FROM foo", [], |r| r.get(0))?;