Skip to content

Commit 1a7968d

Browse files
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]>
1 parent 67d6c90 commit 1a7968d

File tree

10 files changed

+35
-37
lines changed

10 files changed

+35
-37
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ memchr = "2.3"
4747
uuid = { version = "1.0", optional = true }
4848
smallvec = "1.6.1"
4949
cast = { version = "0.3", features = ["std"] }
50-
arrow = { version = "25", default-features = false, features = ["prettyprint", "ffi"] }
50+
arrow = { version = "26", default-features = false, features = ["prettyprint", "ffi"] }
5151
rust_decimal = "1.14"
5252
strum = { version = "0.24", features = ["derive"] }
5353
r2d2 = { version = "0.8.9", optional = true }

libduckdb-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ cc = { version = "1.0", features = ["parallel"], optional = true }
2828
vcpkg = { version = "0.2", optional = true }
2929

3030
[dev-dependencies]
31-
arrow = { version = "25", default-features = false, features = ["ffi"] }
31+
arrow = { version = "26", default-features = false, features = ["ffi"] }

src/config.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ mod test {
144144
db.execute_batch("CREATE TABLE foo(x Text)")?;
145145

146146
let mut stmt = db.prepare("INSERT INTO foo(x) VALUES (?)")?;
147-
stmt.execute(&[&"a"])?;
148-
stmt.execute(&[&"b"])?;
149-
stmt.execute(&[&"c"])?;
147+
stmt.execute([&"a"])?;
148+
stmt.execute([&"b"])?;
149+
stmt.execute([&"c"])?;
150150
stmt.execute([Value::Null])?;
151151

152152
let val: Result<Vec<Option<String>>> = db
@@ -178,9 +178,9 @@ mod test {
178178
db.execute_batch("CREATE TABLE foo(x Text)")?;
179179

180180
let mut stmt = db.prepare("INSERT INTO foo(x) VALUES (?)")?;
181-
stmt.execute(&[&"a"])?;
182-
stmt.execute(&[&"b"])?;
183-
stmt.execute(&[&"c"])?;
181+
stmt.execute([&"a"])?;
182+
stmt.execute([&"b"])?;
183+
stmt.execute([&"c"])?;
184184
stmt.execute([Value::Null])?;
185185

186186
let val: Result<Vec<Option<String>>> = db

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ mod test {
623623
}
624624

625625
let path_string = path.to_str().unwrap();
626-
let db = Connection::open(&path_string)?;
626+
let db = Connection::open(path_string)?;
627627
let the_answer: Result<i64> = db.query_row("SELECT x FROM foo", [], |r| r.get(0));
628628

629629
assert_eq!(42i64, the_answer?);

src/r2d2.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,9 @@ mod test {
208208
conn.execute_batch("CREATE TABLE foo(x Text)")?;
209209

210210
let mut stmt = conn.prepare("INSERT INTO foo(x) VALUES (?)")?;
211-
stmt.execute(&[&"a"])?;
212-
stmt.execute(&[&"b"])?;
213-
stmt.execute(&[&"c"])?;
211+
stmt.execute([&"a"])?;
212+
stmt.execute([&"b"])?;
213+
stmt.execute([&"c"])?;
214214
stmt.execute([Value::Null])?;
215215

216216
let val: Result<Vec<Option<String>>> = conn

src/row.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ impl RowIndex for usize {
638638
impl RowIndex for &'_ str {
639639
#[inline]
640640
fn idx(&self, stmt: &Statement<'_>) -> Result<usize> {
641-
stmt.column_index(*self)
641+
stmt.column_index(self)
642642
}
643643
}
644644

src/statement.rs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -493,17 +493,17 @@ mod test {
493493
let db = Connection::open_in_memory()?;
494494
db.execute_batch("CREATE TABLE foo(x INTEGER)")?;
495495

496-
assert_eq!(db.execute("INSERT INTO foo(x) VALUES (?)", &[&2i32])?, 1);
497-
assert_eq!(db.execute("INSERT INTO foo(x) VALUES (?)", &[&3i32])?, 1);
496+
assert_eq!(db.execute("INSERT INTO foo(x) VALUES (?)", [&2i32])?, 1);
497+
assert_eq!(db.execute("INSERT INTO foo(x) VALUES (?)", [&3i32])?, 1);
498498

499499
// TODO(wangfenjin): No column type for SUM(x)?
500500
assert_eq!(
501501
5i32,
502-
db.query_row::<i32, _, _>("SELECT SUM(x) FROM foo WHERE x > ?", &[&0i32], |r| r.get(0))?
502+
db.query_row::<i32, _, _>("SELECT SUM(x) FROM foo WHERE x > ?", [&0i32], |r| r.get(0))?
503503
);
504504
assert_eq!(
505505
3i32,
506-
db.query_row::<i32, _, _>("SELECT SUM(x) FROM foo WHERE x > ?", &[&2i32], |r| r.get(0))?
506+
db.query_row::<i32, _, _>("SELECT SUM(x) FROM foo WHERE x > ?", [&2i32], |r| r.get(0))?
507507
);
508508
Ok(())
509509
}
@@ -518,10 +518,10 @@ mod test {
518518
db.execute_batch(sql)?;
519519

520520
let mut stmt = db.prepare("INSERT INTO test (name) VALUES (?)")?;
521-
stmt.execute(&[&"one"])?;
521+
stmt.execute([&"one"])?;
522522

523523
let mut stmt = db.prepare("SELECT COUNT(*) FROM test WHERE name = ?")?;
524-
assert_eq!(1i32, stmt.query_row::<i32, _, _>(&[&"one"], |r| r.get(0))?);
524+
assert_eq!(1i32, stmt.query_row::<i32, _, _>([&"one"], |r| r.get(0))?);
525525
Ok(())
526526
}
527527

@@ -536,7 +536,7 @@ mod test {
536536

537537
let mut stmt = db.prepare("SELECT id FROM test where name = ?")?;
538538
{
539-
let mut rows = stmt.query(&[&"one"])?;
539+
let mut rows = stmt.query([&"one"])?;
540540
let id: Result<i32> = rows.next()?.unwrap().get(0);
541541
assert_eq!(Ok(1), id);
542542
}
@@ -554,7 +554,7 @@ mod test {
554554
db.execute_batch(sql)?;
555555

556556
let mut stmt = db.prepare("SELECT id FROM test where name = ? ORDER BY id ASC")?;
557-
let mut rows = stmt.query_and_then(&[&"one"], |row| {
557+
let mut rows = stmt.query_and_then([&"one"], |row| {
558558
let id: i32 = row.get(0)?;
559559
if id == 1 {
560560
Ok(id)
@@ -584,7 +584,7 @@ mod test {
584584
db.execute_batch(sql)?;
585585

586586
let mut stmt = db.prepare("INSERT INTO test (x, y) VALUES (?, ?)")?;
587-
assert!(stmt.execute(&[&"one"]).is_err());
587+
assert!(stmt.execute([&"one"]).is_err());
588588
Ok(())
589589
}
590590

@@ -595,7 +595,7 @@ mod test {
595595
db.execute_batch(sql)?;
596596

597597
let mut stmt = db.prepare("INSERT INTO test (x) VALUES (?)")?;
598-
stmt.execute(&[&"one"])?;
598+
stmt.execute([&"one"])?;
599599

600600
let result: Option<String> = db.query_row("SELECT y FROM test WHERE x = 'one'", [], |row| row.get(0))?;
601601
assert!(result.is_none());
@@ -731,11 +731,9 @@ mod test {
731731
fn test_bind_parameters() -> Result<()> {
732732
let db = Connection::open_in_memory()?;
733733
// dynamic slice:
734-
db.query_row(
735-
"SELECT ?1, ?2, ?3",
736-
&[&1u8 as &dyn ToSql, &"one", &Some("one")],
737-
|row| row.get::<_, u8>(0),
738-
)?;
734+
db.query_row("SELECT ?1, ?2, ?3", [&1u8 as &dyn ToSql, &"one", &Some("one")], |row| {
735+
row.get::<_, u8>(0)
736+
})?;
739737
// existing collection:
740738
let data = vec![1, 2, 3];
741739
db.query_row("SELECT ?1, ?2, ?3", params_from_iter(&data), |row| row.get::<_, u8>(0))?;
@@ -792,7 +790,7 @@ mod test {
792790
assert_eq!("UTF-16le", encoding);
793791
db.execute_batch("CREATE TABLE foo(x TEXT)")?;
794792
let expected = "テスト";
795-
db.execute("INSERT INTO foo(x) VALUES (?)", &[&expected])?;
793+
db.execute("INSERT INTO foo(x) VALUES (?)", [&expected])?;
796794
let actual: String = db.query_row("SELECT x FROM foo", [], |row| row.get(0))?;
797795
assert_eq!(expected, actual);
798796
Ok(())

src/types/from_sql.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,14 +358,14 @@ mod test {
358358
T: Into<i128> + FromSql + ::std::fmt::Debug,
359359
{
360360
for n in out_of_range {
361-
let err = db.query_row("SELECT ?", &[n], |r| r.get::<_, T>(0)).unwrap_err();
361+
let err = db.query_row("SELECT ?", [n], |r| r.get::<_, T>(0)).unwrap_err();
362362
match err {
363363
Error::IntegralValueOutOfRange(_, value) => assert_eq!(*n, value),
364364
_ => panic!("unexpected error: {}", err),
365365
}
366366
}
367367
for n in in_range {
368-
assert_eq!(*n, db.query_row("SELECT ?", &[n], |r| r.get::<_, T>(0)).unwrap().into());
368+
assert_eq!(*n, db.query_row("SELECT ?", [n], |r| r.get::<_, T>(0)).unwrap().into());
369369
}
370370
}
371371

src/types/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ mod test {
191191
let db = checked_memory_handle()?;
192192

193193
let v1234 = vec![1u8, 2, 3, 4];
194-
db.execute("INSERT INTO foo(b) VALUES (?)", &[&v1234])?;
194+
db.execute("INSERT INTO foo(b) VALUES (?)", [&v1234])?;
195195

196196
let v: Vec<u8> = db.query_row("SELECT b FROM foo", [], |r| r.get(0))?;
197197
assert_eq!(v, v1234);
@@ -203,7 +203,7 @@ mod test {
203203
let db = checked_memory_handle()?;
204204

205205
let empty = vec![];
206-
db.execute("INSERT INTO foo(b) VALUES (?)", &[&empty])?;
206+
db.execute("INSERT INTO foo(b) VALUES (?)", [&empty])?;
207207

208208
let v: Vec<u8> = db.query_row("SELECT b FROM foo", [], |r| r.get(0))?;
209209
assert_eq!(v, empty);
@@ -215,7 +215,7 @@ mod test {
215215
let db = checked_memory_handle()?;
216216

217217
let s = "hello, world!";
218-
db.execute("INSERT INTO foo(t) VALUES (?)", &[&s])?;
218+
db.execute("INSERT INTO foo(t) VALUES (?)", [&s])?;
219219

220220
let from: String = db.query_row("SELECT t FROM foo", [], |r| r.get(0))?;
221221
assert_eq!(from, s);
@@ -254,8 +254,8 @@ mod test {
254254
let s = Some("hello, world!");
255255
let b = Some(vec![1u8, 2, 3, 4]);
256256

257-
db.execute("INSERT INTO foo(t) VALUES (?)", &[&s])?;
258-
db.execute("INSERT INTO foo(b) VALUES (?)", &[&b])?;
257+
db.execute("INSERT INTO foo(t) VALUES (?)", [&s])?;
258+
db.execute("INSERT INTO foo(b) VALUES (?)", [&b])?;
259259

260260
let mut stmt = db.prepare("SELECT t, b FROM foo ORDER BY ROWID ASC")?;
261261
let mut rows = stmt.query([])?;

src/types/serde_json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ mod test {
4545
let data: serde_json::Value = serde_json::from_str(json).unwrap();
4646
db.execute(
4747
"INSERT INTO foo (t, b) VALUES (?, ?)",
48-
&[&data as &dyn ToSql, &json.as_bytes()],
48+
[&data as &dyn ToSql, &json.as_bytes()],
4949
)?;
5050

5151
let t: serde_json::Value = db.query_row("SELECT t FROM foo", [], |r| r.get(0))?;

0 commit comments

Comments
 (0)