fluencelabs/sqlite-wasm-connector
1
0
Fork 0
mirror of https://github.com/fluencelabs/sqlite-wasm-connector synced 2025-03-15 06:20:50 +00:00
Code Issues Projects Releases Wiki Activity

Use AsRef<str> instead of &str

Browse Source
This commit is contained in:
Ivan Ukhov 2015-07-31 16:05:52 -04:00
parent 955172be04
commit 9df0978335
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/connection.rs
View File

@ -30,9 +30,9 @@ impl<'l> Connection<'l> {
/// Execute a query without processing the resulting rows if any.
#[inline]
pub fn execute(&self, sql: &str) -> Result<()> {
pub fn execute<T: AsRef<str>>(&self, query: T) -> Result<()> {
unsafe {
ok!(self.raw, ffi::sqlite3_exec(self.raw, str_to_cstr!(sql).as_ptr(), None,
ok!(self.raw, ffi::sqlite3_exec(self.raw, str_to_cstr!(query.as_ref()).as_ptr(), None,
0 as *mut _, 0 as *mut _));
}
Ok(())
@ -44,12 +44,12 @@ impl<'l> Connection<'l> {
/// no more rows will be processed. For large queries and non-string data
/// types, prepared statement are highly preferable; see `prepare`.
#[inline]
pub fn process<F>(&self, sql: &str, callback: F) -> Result<()>
pub fn process<T: AsRef<str>, F>(&self, query: T, callback: F) -> Result<()>
where F: FnMut(&[(&str, Option<&str>)]) -> bool
{
unsafe {
let callback = Box::new(callback);
ok!(self.raw, ffi::sqlite3_exec(self.raw, str_to_cstr!(sql).as_ptr(),
ok!(self.raw, ffi::sqlite3_exec(self.raw, str_to_cstr!(query.as_ref()).as_ptr(),
Some(process_callback::<F>),
&*callback as *const F as *mut F as *mut _,
0 as *mut _));
@ -59,8 +59,8 @@ impl<'l> Connection<'l> {
/// Create a prepared statement.
#[inline]
pub fn prepare(&'l self, sql: &str) -> Result<Statement<'l>> {
::statement::new(self.raw, sql)
pub fn prepare<T: AsRef<str>>(&'l self, query: T) -> Result<Statement<'l>> {
::statement::new(self.raw, query)
}
/// Set a callback for handling busy events.

6
src/statement.rs
View File

@ -143,11 +143,11 @@ impl Value for String {
}
#[inline]
pub fn new<'l>(raw1: *mut ffi::sqlite3, sql: &str) -> Result<Statement<'l>> {
pub fn new<'l, T: AsRef<str>>(raw1: *mut ffi::sqlite3, query: T) -> Result<Statement<'l>> {
let mut raw0 = 0 as *mut _;
unsafe {
ok!(raw1, ffi::sqlite3_prepare_v2(raw1, str_to_cstr!(sql).as_ptr(), -1, &mut raw0,
0 as *mut _));
ok!(raw1, ffi::sqlite3_prepare_v2(raw1, str_to_cstr!(query.as_ref()).as_ptr(), -1,
&mut raw0, 0 as *mut _));
}
Ok(Statement { raw: (raw0, raw1), phantom: PhantomData })
}