ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-11-26 11:31:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use &str instead of String inside BackupName

Browse Source
This commit is contained in:
John Gallagher 2015-12-09 00:48:40 -05:00
parent e2f8e73635
commit 5ebbf5a1a2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backup.rs
View File

@ -56,21 +56,21 @@ pub enum StepResult {
/// Name for the database to back up. Can be specified for both the source and /// Name for the database to back up. Can be specified for both the source and
/// destination. /// destination.
pub enum BackupName { pub enum BackupName<'a> {
/// The main database. This is typically what you want. /// The main database. This is typically what you want.
Main, Main,
/// Back up the temporary database (e.g., any "CREATE TEMPORARY TABLE" tables). /// Back up the temporary database (e.g., any "CREATE TEMPORARY TABLE" tables).
Temp, Temp,
/// Backup a database that has been attached via "ATTACH DATABASE ...". /// Backup a database that has been attached via "ATTACH DATABASE ...".
Attached(String), Attached(&'a str),
} }
impl BackupName { impl<'a> BackupName<'a> {
fn to_cstring(self) -> SqliteResult<CString> { fn to_cstring(self) -> SqliteResult<CString> {
match self { match self {
BackupName::Main => str_to_cstring("main"), BackupName::Main => str_to_cstring("main"),
BackupName::Temp => str_to_cstring("temp"), BackupName::Temp => str_to_cstring("temp"),
BackupName::Attached(s) => str_to_cstring(&s), BackupName::Attached(s) => str_to_cstring(s),
} }
} }
} }
@ -303,7 +303,7 @@ mod test {
let mut dst = SqliteConnection::open_in_memory().unwrap(); let mut dst = SqliteConnection::open_in_memory().unwrap();
{ {
let backup = Backup::new_with_names(&src, BackupName::Attached("my_attached".into()), let backup = Backup::new_with_names(&src, BackupName::Attached("my_attached"),
&mut dst, BackupName::Main).unwrap(); &mut dst, BackupName::Main).unwrap();
backup.step(-1).unwrap(); backup.step(-1).unwrap();
} }
@ -314,7 +314,7 @@ mod test {
src.execute_batch("INSERT INTO foo VALUES(43)").unwrap(); src.execute_batch("INSERT INTO foo VALUES(43)").unwrap();
{ {
let backup = Backup::new_with_names(&src, BackupName::Attached("my_attached".into()), let backup = Backup::new_with_names(&src, BackupName::Attached("my_attached"),
&mut dst, BackupName::Main).unwrap(); &mut dst, BackupName::Main).unwrap();
backup.run_to_completion(5, Duration::from_millis(250), None).unwrap(); backup.run_to_completion(5, Duration::from_millis(250), None).unwrap();
} }