Rename get_limit to limit

And do not test default limits, only updated ones
This commit is contained in:
gwenn 2017-02-06 17:43:32 +01:00
parent 359ec914d2
commit bbd6c73daa

View File

@ -9,19 +9,15 @@ use Connection;
impl Connection { impl Connection {
/// Returns the current value of a limit. /// Returns the current value of a limit.
pub fn get_limit(&self, limit: Limit) -> i32 { pub fn limit(&self, limit: Limit) -> i32 {
let c = self.db.borrow(); let c = self.db.borrow();
unsafe { unsafe { ffi::sqlite3_limit(c.db(), limit as c_int, -1) }
ffi::sqlite3_limit(c.db(), limit as c_int, -1)
}
} }
/// Changes the limit to `new_val`. /// Changes the limit to `new_val`.
/// And returns the prior value of the limit. /// And returns the prior value of the limit.
pub fn set_limit(&self, limit: Limit, new_val: i32) -> i32 { pub fn set_limit(&self, limit: Limit, new_val: i32) -> i32 {
let c = self.db.borrow_mut(); let c = self.db.borrow_mut();
unsafe { unsafe { ffi::sqlite3_limit(c.db(), limit as c_int, new_val) }
ffi::sqlite3_limit(c.db(), limit as c_int, new_val)
}
} }
} }
@ -33,38 +29,37 @@ mod test {
#[test] #[test]
fn test_limit() { fn test_limit() {
let db = Connection::open_in_memory().unwrap(); let db = Connection::open_in_memory().unwrap();
assert_eq!(2147483645, db.set_limit(Limit::SQLITE_LIMIT_LENGTH, 1024)); db.set_limit(Limit::SQLITE_LIMIT_LENGTH, 1024);
assert_eq!(1024, db.get_limit(Limit::SQLITE_LIMIT_LENGTH)); assert_eq!(1024, db.limit(Limit::SQLITE_LIMIT_LENGTH));
db.set_limit(Limit::SQLITE_LIMIT_SQL_LENGTH, 1024); db.set_limit(Limit::SQLITE_LIMIT_SQL_LENGTH, 1024);
assert_eq!(1024, db.get_limit(Limit::SQLITE_LIMIT_SQL_LENGTH)); assert_eq!(1024, db.limit(Limit::SQLITE_LIMIT_SQL_LENGTH));
assert_eq!(2000, db.set_limit(Limit::SQLITE_LIMIT_COLUMN, 64)); db.set_limit(Limit::SQLITE_LIMIT_COLUMN, 64);
assert_eq!(64, db.get_limit(Limit::SQLITE_LIMIT_COLUMN)); assert_eq!(64, db.limit(Limit::SQLITE_LIMIT_COLUMN));
assert_eq!(1000, db.set_limit(Limit::SQLITE_LIMIT_EXPR_DEPTH, 256)); db.set_limit(Limit::SQLITE_LIMIT_EXPR_DEPTH, 256);
assert_eq!(256, db.get_limit(Limit::SQLITE_LIMIT_EXPR_DEPTH)); assert_eq!(256, db.limit(Limit::SQLITE_LIMIT_EXPR_DEPTH));
assert_eq!(500, db.set_limit(Limit::SQLITE_LIMIT_COMPOUND_SELECT, 32)); db.set_limit(Limit::SQLITE_LIMIT_COMPOUND_SELECT, 32);
assert_eq!(32, db.get_limit(Limit::SQLITE_LIMIT_COMPOUND_SELECT)); assert_eq!(32, db.limit(Limit::SQLITE_LIMIT_COMPOUND_SELECT));
assert_eq!(127, db.set_limit(Limit::SQLITE_LIMIT_FUNCTION_ARG, 32)); db.set_limit(Limit::SQLITE_LIMIT_FUNCTION_ARG, 32);
assert_eq!(32, db.get_limit(Limit::SQLITE_LIMIT_FUNCTION_ARG)); assert_eq!(32, db.limit(Limit::SQLITE_LIMIT_FUNCTION_ARG));
assert_eq!(10, db.set_limit(Limit::SQLITE_LIMIT_ATTACHED, 2)); db.set_limit(Limit::SQLITE_LIMIT_ATTACHED, 2);
assert_eq!(2, db.get_limit(Limit::SQLITE_LIMIT_ATTACHED)); assert_eq!(2, db.limit(Limit::SQLITE_LIMIT_ATTACHED));
assert_eq!(50000, db.set_limit(Limit::SQLITE_LIMIT_LIKE_PATTERN_LENGTH, 128)); db.set_limit(Limit::SQLITE_LIMIT_LIKE_PATTERN_LENGTH, 128);
assert_eq!(128, db.get_limit(Limit::SQLITE_LIMIT_LIKE_PATTERN_LENGTH)); assert_eq!(128, db.limit(Limit::SQLITE_LIMIT_LIKE_PATTERN_LENGTH));
db.set_limit(Limit::SQLITE_LIMIT_VARIABLE_NUMBER, 99); db.set_limit(Limit::SQLITE_LIMIT_VARIABLE_NUMBER, 99);
assert_eq!(99, db.get_limit(Limit::SQLITE_LIMIT_VARIABLE_NUMBER)); assert_eq!(99, db.limit(Limit::SQLITE_LIMIT_VARIABLE_NUMBER));
assert_eq!(1000, db.set_limit(Limit::SQLITE_LIMIT_TRIGGER_DEPTH, 32)); db.set_limit(Limit::SQLITE_LIMIT_TRIGGER_DEPTH, 32);
assert_eq!(32, db.get_limit(Limit::SQLITE_LIMIT_TRIGGER_DEPTH)); assert_eq!(32, db.limit(Limit::SQLITE_LIMIT_TRIGGER_DEPTH));
assert_eq!(0, db.set_limit(Limit::SQLITE_LIMIT_WORKER_THREADS, 2)); db.set_limit(Limit::SQLITE_LIMIT_WORKER_THREADS, 2);
assert_eq!(2, db.get_limit(Limit::SQLITE_LIMIT_WORKER_THREADS)); assert_eq!(2, db.limit(Limit::SQLITE_LIMIT_WORKER_THREADS));
} }
} }