diff --git a/src/limits.rs b/src/limits.rs index 5bb9f67..c13ed3d 100644 --- a/src/limits.rs +++ b/src/limits.rs @@ -9,19 +9,15 @@ use Connection; impl Connection { /// 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(); - unsafe { - ffi::sqlite3_limit(c.db(), limit as c_int, -1) - } + unsafe { ffi::sqlite3_limit(c.db(), limit as c_int, -1) } } /// Changes the limit to `new_val`. /// And returns the prior value of the limit. pub fn set_limit(&self, limit: Limit, new_val: i32) -> i32 { let c = self.db.borrow_mut(); - unsafe { - ffi::sqlite3_limit(c.db(), limit as c_int, new_val) - } + unsafe { ffi::sqlite3_limit(c.db(), limit as c_int, new_val) } } } @@ -33,38 +29,37 @@ mod test { #[test] fn test_limit() { let db = Connection::open_in_memory().unwrap(); - assert_eq!(2147483645, db.set_limit(Limit::SQLITE_LIMIT_LENGTH, 1024)); - assert_eq!(1024, db.get_limit(Limit::SQLITE_LIMIT_LENGTH)); + db.set_limit(Limit::SQLITE_LIMIT_LENGTH, 1024); + assert_eq!(1024, db.limit(Limit::SQLITE_LIMIT_LENGTH)); 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)); - assert_eq!(64, db.get_limit(Limit::SQLITE_LIMIT_COLUMN)); + db.set_limit(Limit::SQLITE_LIMIT_COLUMN, 64); + assert_eq!(64, db.limit(Limit::SQLITE_LIMIT_COLUMN)); - assert_eq!(1000, db.set_limit(Limit::SQLITE_LIMIT_EXPR_DEPTH, 256)); - assert_eq!(256, db.get_limit(Limit::SQLITE_LIMIT_EXPR_DEPTH)); + db.set_limit(Limit::SQLITE_LIMIT_EXPR_DEPTH, 256); + assert_eq!(256, db.limit(Limit::SQLITE_LIMIT_EXPR_DEPTH)); - assert_eq!(500, db.set_limit(Limit::SQLITE_LIMIT_COMPOUND_SELECT, 32)); - assert_eq!(32, db.get_limit(Limit::SQLITE_LIMIT_COMPOUND_SELECT)); + db.set_limit(Limit::SQLITE_LIMIT_COMPOUND_SELECT, 32); + assert_eq!(32, db.limit(Limit::SQLITE_LIMIT_COMPOUND_SELECT)); - assert_eq!(127, db.set_limit(Limit::SQLITE_LIMIT_FUNCTION_ARG, 32)); - assert_eq!(32, db.get_limit(Limit::SQLITE_LIMIT_FUNCTION_ARG)); + db.set_limit(Limit::SQLITE_LIMIT_FUNCTION_ARG, 32); + assert_eq!(32, db.limit(Limit::SQLITE_LIMIT_FUNCTION_ARG)); - assert_eq!(10, db.set_limit(Limit::SQLITE_LIMIT_ATTACHED, 2)); - assert_eq!(2, db.get_limit(Limit::SQLITE_LIMIT_ATTACHED)); + db.set_limit(Limit::SQLITE_LIMIT_ATTACHED, 2); + assert_eq!(2, db.limit(Limit::SQLITE_LIMIT_ATTACHED)); - assert_eq!(50000, db.set_limit(Limit::SQLITE_LIMIT_LIKE_PATTERN_LENGTH, 128)); - assert_eq!(128, db.get_limit(Limit::SQLITE_LIMIT_LIKE_PATTERN_LENGTH)); + db.set_limit(Limit::SQLITE_LIMIT_LIKE_PATTERN_LENGTH, 128); + assert_eq!(128, db.limit(Limit::SQLITE_LIMIT_LIKE_PATTERN_LENGTH)); 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)); - assert_eq!(32, db.get_limit(Limit::SQLITE_LIMIT_TRIGGER_DEPTH)); + db.set_limit(Limit::SQLITE_LIMIT_TRIGGER_DEPTH, 32); + assert_eq!(32, db.limit(Limit::SQLITE_LIMIT_TRIGGER_DEPTH)); - assert_eq!(0, db.set_limit(Limit::SQLITE_LIMIT_WORKER_THREADS, 2)); - assert_eq!(2, db.get_limit(Limit::SQLITE_LIMIT_WORKER_THREADS)); + db.set_limit(Limit::SQLITE_LIMIT_WORKER_THREADS, 2); + assert_eq!(2, db.limit(Limit::SQLITE_LIMIT_WORKER_THREADS)); } } - \ No newline at end of file