mirror of
https://github.com/isar/rusqlite.git
synced 2024-11-29 21:52:12 +08:00
Merge pull request #146 from jgallagher/gwenn-convenient
Add `insert` and `exists` convenience methods.
This commit is contained in:
commit
234624ae5c
@ -1,5 +1,7 @@
|
|||||||
# Version UPCOMING (...)
|
# Version UPCOMING (...)
|
||||||
|
|
||||||
|
* Adds `insert` convenience method to `Statement` which returns the row ID of an inserted row.
|
||||||
|
* Adds `exists` convenience method returning whether a query finds one or more rows.
|
||||||
* Adds support for serializing types from the `serde_json` crate. Requires the `serde_json` feature.
|
* Adds support for serializing types from the `serde_json` crate. Requires the `serde_json` feature.
|
||||||
* Adds support for serializing types from the `chrono` crate. Requires the `chrono` feature.
|
* Adds support for serializing types from the `chrono` crate. Requires the `chrono` feature.
|
||||||
* Removes `load_extension` feature from `libsqlite3-sys`. `load_extension` is still available
|
* Removes `load_extension` feature from `libsqlite3-sys`. `load_extension` is still available
|
||||||
|
86
src/convenient.rs
Normal file
86
src/convenient.rs
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
use {Error, Result, Statement};
|
||||||
|
use types::ToSql;
|
||||||
|
|
||||||
|
impl<'conn> Statement<'conn> {
|
||||||
|
/// Execute an INSERT and return the ROWID.
|
||||||
|
///
|
||||||
|
/// # Failure
|
||||||
|
/// Will return `Err` if no row is inserted or many rows are inserted.
|
||||||
|
pub fn insert(&mut self, params: &[&ToSql]) -> Result<i64> {
|
||||||
|
// Some non-insertion queries could still return 1 change (an UPDATE, for example), so
|
||||||
|
// to guard against that we can check that the connection's last_insert_rowid() changes
|
||||||
|
// after we execute the statement.
|
||||||
|
let prev_rowid = self.conn.last_insert_rowid();
|
||||||
|
let changes = try!(self.execute(params));
|
||||||
|
let new_rowid = self.conn.last_insert_rowid();
|
||||||
|
match changes {
|
||||||
|
1 if prev_rowid != new_rowid => Ok(new_rowid),
|
||||||
|
1 if prev_rowid == new_rowid => Err(Error::StatementFailedToInsertRow),
|
||||||
|
_ => Err(Error::StatementChangedRows(changes)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Return `true` if a query in the SQL statement it executes returns one or more rows
|
||||||
|
/// and `false` if the SQL returns an empty set.
|
||||||
|
pub fn exists(&mut self, params: &[&ToSql]) -> Result<bool> {
|
||||||
|
self.reset_if_needed();
|
||||||
|
let mut rows = try!(self.query(params));
|
||||||
|
match rows.next() {
|
||||||
|
Some(_) => Ok(true),
|
||||||
|
None => Ok(false),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use {Connection, Error};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_insert() {
|
||||||
|
let db = Connection::open_in_memory().unwrap();
|
||||||
|
db.execute_batch("CREATE TABLE foo(x INTEGER UNIQUE)").unwrap();
|
||||||
|
let mut stmt = db.prepare("INSERT OR IGNORE INTO foo (x) VALUES (?)").unwrap();
|
||||||
|
assert_eq!(stmt.insert(&[&1i32]).unwrap(), 1);
|
||||||
|
assert_eq!(stmt.insert(&[&2i32]).unwrap(), 2);
|
||||||
|
match stmt.insert(&[&1i32]).unwrap_err() {
|
||||||
|
Error::StatementChangedRows(0) => (),
|
||||||
|
err => panic!("Unexpected error {}", err),
|
||||||
|
}
|
||||||
|
let mut multi = db.prepare("INSERT INTO foo (x) SELECT 3 UNION ALL SELECT 4").unwrap();
|
||||||
|
match multi.insert(&[]).unwrap_err() {
|
||||||
|
Error::StatementChangedRows(2) => (),
|
||||||
|
err => panic!("Unexpected error {}", err),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_insert_failures() {
|
||||||
|
let db = Connection::open_in_memory().unwrap();
|
||||||
|
db.execute_batch("CREATE TABLE foo(x INTEGER UNIQUE)").unwrap();
|
||||||
|
let mut insert = db.prepare("INSERT INTO foo (x) VALUES (?)").unwrap();
|
||||||
|
let mut update = db.prepare("UPDATE foo SET x = ?").unwrap();
|
||||||
|
|
||||||
|
assert_eq!(insert.insert(&[&1i32]).unwrap(), 1);
|
||||||
|
|
||||||
|
match update.insert(&[&2i32]) {
|
||||||
|
Err(Error::StatementFailedToInsertRow) => (),
|
||||||
|
r => panic!("Unexpected result {:?}", r),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_exists() {
|
||||||
|
let db = Connection::open_in_memory().unwrap();
|
||||||
|
let sql = "BEGIN;
|
||||||
|
CREATE TABLE foo(x INTEGER);
|
||||||
|
INSERT INTO foo VALUES(1);
|
||||||
|
INSERT INTO foo VALUES(2);
|
||||||
|
END;";
|
||||||
|
db.execute_batch(sql).unwrap();
|
||||||
|
let mut stmt = db.prepare("SELECT 1 FROM foo WHERE x = ?").unwrap();
|
||||||
|
assert!(stmt.exists(&[&1i32]).unwrap());
|
||||||
|
assert!(stmt.exists(&[&2i32]).unwrap());
|
||||||
|
assert!(!stmt.exists(&[&0i32]).unwrap());
|
||||||
|
}
|
||||||
|
}
|
13
src/error.rs
13
src/error.rs
@ -56,6 +56,13 @@ pub enum Error {
|
|||||||
/// that column cannot be converted to the requested Rust type.
|
/// that column cannot be converted to the requested Rust type.
|
||||||
InvalidColumnType,
|
InvalidColumnType,
|
||||||
|
|
||||||
|
/// Error when a query that was expected to insert one row did not insert any or insert many.
|
||||||
|
StatementChangedRows(c_int),
|
||||||
|
|
||||||
|
/// Error when a query that was expected to insert a row did not change the connection's
|
||||||
|
/// last_insert_rowid().
|
||||||
|
StatementFailedToInsertRow,
|
||||||
|
|
||||||
/// Error returned by `functions::Context::get` when the function argument cannot be converted
|
/// Error returned by `functions::Context::get` when the function argument cannot be converted
|
||||||
/// to the requested type.
|
/// to the requested type.
|
||||||
#[cfg(feature = "functions")]
|
#[cfg(feature = "functions")]
|
||||||
@ -102,6 +109,8 @@ impl fmt::Display for Error {
|
|||||||
Error::InvalidColumnIndex(i) => write!(f, "Invalid column index: {}", i),
|
Error::InvalidColumnIndex(i) => write!(f, "Invalid column index: {}", i),
|
||||||
Error::InvalidColumnName(ref name) => write!(f, "Invalid column name: {}", name),
|
Error::InvalidColumnName(ref name) => write!(f, "Invalid column name: {}", name),
|
||||||
Error::InvalidColumnType => write!(f, "Invalid column type"),
|
Error::InvalidColumnType => write!(f, "Invalid column type"),
|
||||||
|
Error::StatementChangedRows(i) => write!(f, "Query changed {} rows", i),
|
||||||
|
Error::StatementFailedToInsertRow => write!(f, "Statement failed to insert new row"),
|
||||||
|
|
||||||
#[cfg(feature = "functions")]
|
#[cfg(feature = "functions")]
|
||||||
Error::InvalidFunctionParameterType => write!(f, "Invalid function parameter type"),
|
Error::InvalidFunctionParameterType => write!(f, "Invalid function parameter type"),
|
||||||
@ -132,6 +141,8 @@ impl error::Error for Error {
|
|||||||
Error::InvalidColumnIndex(_) => "invalid column index",
|
Error::InvalidColumnIndex(_) => "invalid column index",
|
||||||
Error::InvalidColumnName(_) => "invalid column name",
|
Error::InvalidColumnName(_) => "invalid column name",
|
||||||
Error::InvalidColumnType => "invalid column type",
|
Error::InvalidColumnType => "invalid column type",
|
||||||
|
Error::StatementChangedRows(_) => "query inserted zero or more than one row",
|
||||||
|
Error::StatementFailedToInsertRow => "statement failed to insert new row",
|
||||||
|
|
||||||
#[cfg(feature = "functions")]
|
#[cfg(feature = "functions")]
|
||||||
Error::InvalidFunctionParameterType => "invalid function parameter type",
|
Error::InvalidFunctionParameterType => "invalid function parameter type",
|
||||||
@ -157,6 +168,8 @@ impl error::Error for Error {
|
|||||||
Error::InvalidColumnName(_) |
|
Error::InvalidColumnName(_) |
|
||||||
Error::InvalidColumnType |
|
Error::InvalidColumnType |
|
||||||
Error::InvalidPath(_) => None,
|
Error::InvalidPath(_) => None,
|
||||||
|
Error::StatementChangedRows(_) => None,
|
||||||
|
Error::StatementFailedToInsertRow => None,
|
||||||
|
|
||||||
#[cfg(feature = "functions")]
|
#[cfg(feature = "functions")]
|
||||||
Error::InvalidFunctionParameterType => None,
|
Error::InvalidFunctionParameterType => None,
|
||||||
|
@ -87,6 +87,7 @@ pub mod types;
|
|||||||
mod transaction;
|
mod transaction;
|
||||||
mod named_params;
|
mod named_params;
|
||||||
mod error;
|
mod error;
|
||||||
|
mod convenient;
|
||||||
#[cfg(feature = "load_extension")]mod load_extension_guard;
|
#[cfg(feature = "load_extension")]mod load_extension_guard;
|
||||||
#[cfg(feature = "trace")]pub mod trace;
|
#[cfg(feature = "trace")]pub mod trace;
|
||||||
#[cfg(feature = "backup")]pub mod backup;
|
#[cfg(feature = "backup")]pub mod backup;
|
||||||
|
Loading…
Reference in New Issue
Block a user