mirror of
https://github.com/isar/rusqlite.git
synced 2025-03-26 15:26:03 +08:00
Fix merge conflict
This commit is contained in:
parent
aa5a4a2cf0
commit
9f919459d0
@ -381,15 +381,6 @@ impl DatabaseName<'_> {
|
|||||||
DatabaseName::C(cs)
|
DatabaseName::C(cs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#[cfg(feature = "hooks")]
|
|
||||||
pub(crate) fn from_cstr(db_name: &std::ffi::CStr) -> DatabaseName<'_> {
|
|
||||||
let s = db_name.to_str().expect("illegal database name");
|
|
||||||
match s {
|
|
||||||
"main" => DatabaseName::Main,
|
|
||||||
"temp" => DatabaseName::Temp,
|
|
||||||
_ => DatabaseName::Attached(s),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A connection to a SQLite database.
|
/// A connection to a SQLite database.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user