diff options
Diffstat (limited to 'src/types/mod.rs')
-rw-r--r-- | src/types/mod.rs | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/types/mod.rs b/src/types/mod.rs index 4000ae2..eece984 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -102,7 +102,7 @@ mod value_ref; /// # use rusqlite::types::{Null}; /// /// fn insert_null(conn: &Connection) -> Result<usize> { -/// conn.execute("INSERT INTO people (name) VALUES (?)", [Null]) +/// conn.execute("INSERT INTO people (name) VALUES (?1)", [Null]) /// } /// ``` #[derive(Copy, Clone)] @@ -153,9 +153,9 @@ 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 (?1)", [&v1234])?; - let v: Vec<u8> = db.query_row("SELECT b FROM foo", [], |r| r.get(0))?; + let v: Vec<u8> = db.one_column("SELECT b FROM foo")?; assert_eq!(v, v1234); Ok(()) } @@ -165,9 +165,9 @@ 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 (?1)", [&empty])?; - let v: Vec<u8> = db.query_row("SELECT b FROM foo", [], |r| r.get(0))?; + let v: Vec<u8> = db.one_column("SELECT b FROM foo")?; assert_eq!(v, empty); Ok(()) } @@ -177,9 +177,9 @@ 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 (?1)", [&s])?; - let from: String = db.query_row("SELECT t FROM foo", [], |r| r.get(0))?; + let from: String = db.one_column("SELECT t FROM foo")?; assert_eq!(from, s); Ok(()) } @@ -189,9 +189,9 @@ mod test { let db = checked_memory_handle()?; let s = "hello, world!"; - db.execute("INSERT INTO foo(t) VALUES (?)", [s.to_owned()])?; + db.execute("INSERT INTO foo(t) VALUES (?1)", [s.to_owned()])?; - let from: String = db.query_row("SELECT t FROM foo", [], |r| r.get(0))?; + let from: String = db.one_column("SELECT t FROM foo")?; assert_eq!(from, s); Ok(()) } @@ -200,12 +200,9 @@ mod test { fn test_value() -> Result<()> { let db = checked_memory_handle()?; - db.execute("INSERT INTO foo(i) VALUES (?)", [Value::Integer(10)])?; + db.execute("INSERT INTO foo(i) VALUES (?1)", [Value::Integer(10)])?; - assert_eq!( - 10i64, - db.query_row::<i64, _, _>("SELECT i FROM foo", [], |r| r.get(0))? - ); + assert_eq!(10i64, db.one_column::<i64>("SELECT i FROM foo")?); Ok(()) } @@ -216,8 +213,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 (?1)", [&s])?; + db.execute("INSERT INTO foo(b) VALUES (?1)", [&b])?; let mut stmt = db.prepare("SELECT t, b FROM foo ORDER BY ROWID ASC")?; let mut rows = stmt.query([])?; |