dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Down with casting!

Browse Source
This commit is contained in:
Steven Fackler 2014-07-03 09:19:15 -07:00
parent 29e97749bf
commit 7e59c4584b
3 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -45,8 +45,7 @@ fn main() {
}; };
conn.execute("INSERT INTO person (name, time_created, data) conn.execute("INSERT INTO person (name, time_created, data)
VALUES ($1, $2, $3)", VALUES ($1, $2, $3)",
[&me.name as &ToSql, &me.time_created as &ToSql, [&me.name, &me.time_created, &me.data]).unwrap();
&me.data as &ToSql]).unwrap();
let stmt = conn.prepare("SELECT id, name, time_created, data FROM person") let stmt = conn.prepare("SELECT id, name, time_created, data FROM person")
.unwrap(); .unwrap();
@ -112,7 +111,7 @@ Both methods take an array of parameters to bind to the query represented as
query (or 0 if not applicable): query (or 0 if not applicable):
```rust ```rust
let stmt = try!(conn.prepare("UPDATE foo SET bar = $1 WHERE baz = $2")); let stmt = try!(conn.prepare("UPDATE foo SET bar = $1 WHERE baz = $2"));
let updates = try!(stmt.execute([&1i32 as &ToSql, &"biz" as &ToSql])); let updates = try!(stmt.execute([&1i32, &"biz"]));
println!("{} rows were updated", updates); println!("{} rows were updated", updates);
``` ```
`query` returns an iterator over the rows returned from the database. The `query` returns an iterator over the rows returned from the database. The
@ -131,7 +130,7 @@ In addition, `PostgresConnection` has a utility `execute` method which is useful
if a statement is only going to be executed once: if a statement is only going to be executed once:
```rust ```rust
let updates = try!(conn.execute("UPDATE foo SET bar = $1 WHERE baz = $2", let updates = try!(conn.execute("UPDATE foo SET bar = $1 WHERE baz = $2",
[&1i32 as &ToSql, &"biz" as &ToSql])); [&1i32, &"biz"]));
println!("{} rows were updated", updates); println!("{} rows were updated", updates);
``` ```

10
src/lib/lib.rs
View File

@ -9,7 +9,6 @@
//! use time::Timespec; //! use time::Timespec;
//! //!
//! use postgres::{PostgresConnection, NoSsl}; //! use postgres::{PostgresConnection, NoSsl};
//! use postgres::types::ToSql;
//! //!
//! struct Person { //! struct Person {
//! id: i32, //! id: i32,
@ -36,8 +35,7 @@
//! }; //! };
//! conn.execute("INSERT INTO person (name, time_created, data) //! conn.execute("INSERT INTO person (name, time_created, data)
//! VALUES ($1, $2, $3)", //! VALUES ($1, $2, $3)",
//! [&me.name as &ToSql, &me.time_created as &ToSql, //! [&me.name, &me.time_created, &me.data]).unwrap();
//! &me.data as &ToSql]).unwrap();
//! //!
//! let stmt = conn.prepare("SELECT id, name, time_created, data FROM person") //! let stmt = conn.prepare("SELECT id, name, time_created, data FROM person")
//! .unwrap(); //! .unwrap();
@ -1214,12 +1212,11 @@ impl<'conn> PostgresStatement<'conn> {
/// ///
/// ```rust,no_run /// ```rust,no_run
/// # use postgres::{PostgresConnection, NoSsl}; /// # use postgres::{PostgresConnection, NoSsl};
/// # use postgres::types::ToSql;
/// # let conn = PostgresConnection::connect("", &NoSsl).unwrap(); /// # let conn = PostgresConnection::connect("", &NoSsl).unwrap();
/// # let bar = 1i32; /// # let bar = 1i32;
/// # let baz = true; /// # let baz = true;
/// let stmt = conn.prepare("UPDATE foo SET bar = $1 WHERE baz = $2").unwrap(); /// let stmt = conn.prepare("UPDATE foo SET bar = $1 WHERE baz = $2").unwrap();
/// match stmt.execute([&bar as &ToSql, &baz as &ToSql]) { /// match stmt.execute([&bar, &baz]) {
/// Ok(count) => println!("{} row(s) updated", count), /// Ok(count) => println!("{} row(s) updated", count),
/// Err(err) => println!("Error executing query: {}", err) /// Err(err) => println!("Error executing query: {}", err)
/// } /// }
@ -1259,11 +1256,10 @@ impl<'conn> PostgresStatement<'conn> {
/// ///
/// ```rust,no_run /// ```rust,no_run
/// # use postgres::{PostgresConnection, NoSsl}; /// # use postgres::{PostgresConnection, NoSsl};
/// # use postgres::types::ToSql;
/// # let conn = PostgresConnection::connect("", &NoSsl).unwrap(); /// # let conn = PostgresConnection::connect("", &NoSsl).unwrap();
/// let stmt = conn.prepare("SELECT foo FROM bar WHERE baz = $1").unwrap(); /// let stmt = conn.prepare("SELECT foo FROM bar WHERE baz = $1").unwrap();
/// # let baz = true; /// # let baz = true;
/// let mut rows = match stmt.query([&baz as &ToSql]) { /// let mut rows = match stmt.query([&baz]) {
/// Ok(rows) => rows, /// Ok(rows) => rows,
/// Err(err) => fail!("Error running query: {}", err) /// Err(err) => fail!("Error running query: {}", err)
/// }; /// };

36
src/test/test.rs
View File

@ -144,7 +144,7 @@ fn test_transaction_commit() {
or_fail!(conn.execute("CREATE TEMPORARY TABLE foo (id INT PRIMARY KEY)", [])); or_fail!(conn.execute("CREATE TEMPORARY TABLE foo (id INT PRIMARY KEY)", []));
let trans = or_fail!(conn.transaction()); let trans = or_fail!(conn.transaction());
or_fail!(trans.execute("INSERT INTO foo (id) VALUES ($1)", [&1i32 as &ToSql])); or_fail!(trans.execute("INSERT INTO foo (id) VALUES ($1)", [&1i32]));
drop(trans); drop(trans);
let stmt = or_fail!(conn.prepare("SELECT * FROM foo")); let stmt = or_fail!(conn.prepare("SELECT * FROM foo"));
@ -159,7 +159,7 @@ fn test_transaction_commit_finish() {
or_fail!(conn.execute("CREATE TEMPORARY TABLE foo (id INT PRIMARY KEY)", [])); or_fail!(conn.execute("CREATE TEMPORARY TABLE foo (id INT PRIMARY KEY)", []));
let trans = or_fail!(conn.transaction()); let trans = or_fail!(conn.transaction());
or_fail!(trans.execute("INSERT INTO foo (id) VALUES ($1)", [&1i32 as &ToSql])); or_fail!(trans.execute("INSERT INTO foo (id) VALUES ($1)", [&1i32]));
assert!(trans.finish().is_ok()); assert!(trans.finish().is_ok());
let stmt = or_fail!(conn.prepare("SELECT * FROM foo")); let stmt = or_fail!(conn.prepare("SELECT * FROM foo"));
@ -173,10 +173,10 @@ fn test_transaction_rollback() {
let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl)); let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl));
or_fail!(conn.execute("CREATE TEMPORARY TABLE foo (id INT PRIMARY KEY)", [])); or_fail!(conn.execute("CREATE TEMPORARY TABLE foo (id INT PRIMARY KEY)", []));
or_fail!(conn.execute("INSERT INTO foo (id) VALUES ($1)", [&1i32 as &ToSql])); or_fail!(conn.execute("INSERT INTO foo (id) VALUES ($1)", [&1i32]));
let trans = or_fail!(conn.transaction()); let trans = or_fail!(conn.transaction());
or_fail!(trans.execute("INSERT INTO foo (id) VALUES ($1)", [&2i32 as &ToSql])); or_fail!(trans.execute("INSERT INTO foo (id) VALUES ($1)", [&2i32]));
trans.set_rollback(); trans.set_rollback();
drop(trans); drop(trans);
@ -191,10 +191,10 @@ fn test_transaction_rollback_finish() {
let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl)); let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl));
or_fail!(conn.execute("CREATE TEMPORARY TABLE foo (id INT PRIMARY KEY)", [])); or_fail!(conn.execute("CREATE TEMPORARY TABLE foo (id INT PRIMARY KEY)", []));
or_fail!(conn.execute("INSERT INTO foo (id) VALUES ($1)", [&1i32 as &ToSql])); or_fail!(conn.execute("INSERT INTO foo (id) VALUES ($1)", [&1i32]));
let trans = or_fail!(conn.transaction()); let trans = or_fail!(conn.transaction());
or_fail!(trans.execute("INSERT INTO foo (id) VALUES ($1)", [&2i32 as &ToSql])); or_fail!(trans.execute("INSERT INTO foo (id) VALUES ($1)", [&2i32]));
trans.set_rollback(); trans.set_rollback();
assert!(trans.finish().is_ok()); assert!(trans.finish().is_ok());
@ -382,7 +382,7 @@ fn test_query() {
let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl)); let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl));
or_fail!(conn.execute("CREATE TEMPORARY TABLE foo (id BIGINT PRIMARY KEY)", [])); or_fail!(conn.execute("CREATE TEMPORARY TABLE foo (id BIGINT PRIMARY KEY)", []));
or_fail!(conn.execute("INSERT INTO foo (id) VALUES ($1), ($2)", or_fail!(conn.execute("INSERT INTO foo (id) VALUES ($1), ($2)",
[&1i64 as &ToSql, &2i64 as &ToSql])); [&1i64, &2i64]));
let stmt = or_fail!(conn.prepare("SELECT * from foo ORDER BY id")); let stmt = or_fail!(conn.prepare("SELECT * from foo ORDER BY id"));
let result = or_fail!(stmt.query([])); let result = or_fail!(stmt.query([]));
@ -407,7 +407,7 @@ fn test_lazy_query() {
let stmt = or_fail!(trans.prepare("INSERT INTO foo (id) VALUES ($1)")); let stmt = or_fail!(trans.prepare("INSERT INTO foo (id) VALUES ($1)"));
let values = vec!(0i32, 1, 2, 3, 4, 5); let values = vec!(0i32, 1, 2, 3, 4, 5);
for value in values.iter() { for value in values.iter() {
or_fail!(stmt.execute([value as &ToSql])); or_fail!(stmt.execute([value]));
} }
let stmt = or_fail!(trans.prepare("SELECT id FROM foo ORDER BY id")); let stmt = or_fail!(trans.prepare("SELECT id FROM foo ORDER BY id"));
let result = or_fail!(trans.lazy_query(&stmt, [], 2)); let result = or_fail!(trans.lazy_query(&stmt, [], 2));
@ -454,7 +454,7 @@ fn test_execute_counts() {
b INT b INT
)", []))); )", [])));
assert_eq!(3, or_fail!(conn.execute("INSERT INTO foo (b) VALUES ($1), ($2), ($2)", assert_eq!(3, or_fail!(conn.execute("INSERT INTO foo (b) VALUES ($1), ($2), ($2)",
[&1i32 as &ToSql, &2i32 as &ToSql]))); [&1i32, &2i32])));
assert_eq!(2, or_fail!(conn.execute("UPDATE foo SET b = 0 WHERE b = 2", []))); assert_eq!(2, or_fail!(conn.execute("UPDATE foo SET b = 0 WHERE b = 2", [])));
assert_eq!(3, or_fail!(conn.execute("SELECT * FROM foo", []))); assert_eq!(3, or_fail!(conn.execute("SELECT * FROM foo", [])));
} }
@ -467,7 +467,7 @@ fn test_type<T: PartialEq+FromSql+ToSql, S: Str>(sql_type: &str, checks: &[(T, S
assert!(val == &result); assert!(val == &result);
let stmt = or_fail!(conn.prepare(format!("SELECT $1::{}", sql_type).as_slice())); let stmt = or_fail!(conn.prepare(format!("SELECT $1::{}", sql_type).as_slice()));
let result = or_fail!(stmt.query([val as &ToSql])).next().unwrap()[0u]; let result = or_fail!(stmt.query([val])).next().unwrap()[0u];
assert!(val == &result); assert!(val == &result);
} }
} }
@ -546,8 +546,8 @@ fn test_bpchar_params() {
b CHAR(5) b CHAR(5)
)", [])); )", []));
or_fail!(conn.execute("INSERT INTO foo (b) VALUES ($1), ($2), ($3)", or_fail!(conn.execute("INSERT INTO foo (b) VALUES ($1), ($2), ($3)",
[&Some("12345") as &ToSql, &Some("123") as &ToSql, [&Some("12345"), &Some("123"),
&None::<&'static str> as &ToSql])); &None::<&'static str>]));
let stmt = or_fail!(conn.prepare("SELECT b FROM foo ORDER BY id")); let stmt = or_fail!(conn.prepare("SELECT b FROM foo ORDER BY id"));
let res = or_fail!(stmt.query([])); let res = or_fail!(stmt.query([]));
@ -808,7 +808,7 @@ fn test_nan_param<T: Float+ToSql+FromSql>(sql_type: &str) {
let nan: T = Float::nan(); let nan: T = Float::nan();
let stmt = or_fail!(conn.prepare(format!("SELECT $1::{}", sql_type).as_slice())); let stmt = or_fail!(conn.prepare(format!("SELECT $1::{}", sql_type).as_slice()));
let mut result = or_fail!(stmt.query([&nan as &ToSql])); let mut result = or_fail!(stmt.query([&nan]));
let val: T = result.next().unwrap()[0u]; let val: T = result.next().unwrap()[0u];
assert!(val.is_nan()) assert!(val.is_nan())
} }
@ -826,7 +826,7 @@ fn test_f64_nan_param() {
#[test] #[test]
fn test_wrong_param_type() { fn test_wrong_param_type() {
let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl)); let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl));
match conn.execute("SELECT $1::VARCHAR", [&1i32 as &ToSql]) { match conn.execute("SELECT $1::VARCHAR", [&1i32]) {
Err(PgWrongType(_)) => {} Err(PgWrongType(_)) => {}
res => fail!("unexpected result {}", res) res => fail!("unexpected result {}", res)
} }
@ -835,7 +835,7 @@ fn test_wrong_param_type() {
#[test] #[test]
fn test_too_few_params() { fn test_too_few_params() {
let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl)); let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl));
match conn.execute("SELECT $1::INT, $2::INT", [&1i32 as &ToSql]) { match conn.execute("SELECT $1::INT, $2::INT", [&1i32]) {
Err(PgWrongParamCount { expected: 2, actual: 1 }) => {}, Err(PgWrongParamCount { expected: 2, actual: 1 }) => {},
res => fail!("unexpected result {}", res) res => fail!("unexpected result {}", res)
} }
@ -844,9 +844,9 @@ fn test_too_few_params() {
#[test] #[test]
fn test_too_many_params() { fn test_too_many_params() {
let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl)); let conn = or_fail!(PostgresConnection::connect("postgres://postgres@localhost", &NoSsl));
match conn.execute("SELECT $1::INT, $2::INT", [&1i32 as &ToSql, match conn.execute("SELECT $1::INT, $2::INT", [&1i32,
&2i32 as &ToSql, &2i32,
&3i32 as &ToSql]) { &3i32]) {
Err(PgWrongParamCount { expected: 2, actual: 3 }) => {}, Err(PgWrongParamCount { expected: 2, actual: 3 }) => {},
res => fail!("unexpected result {}", res) res => fail!("unexpected result {}", res)
} }