ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-10-29 21:08:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into path-reform

Browse Source
This commit is contained in:
John Gallagher
2015-02-23 21:44:29 -05:00
parent 1dc78b66da 17200cf578
commit f971d57396
11 changed files with 215 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/types.rs
View File

@@ -55,12 +55,11 @@
extern crate time;
use libc::{c_int, c_double, c_char};
use std::ffi as std_ffi;
use std::ffi::{CString};
use std::ffi::{CStr};
use std::mem;
use std::str;
use super::ffi;
use super::{SqliteResult, SqliteError};
use super::{SqliteResult, SqliteError, str_to_cstring};
const SQLITE_DATETIME_FMT: &'static str = "%Y-%m-%d %H:%M:%S";
@@ -90,8 +89,11 @@ raw_to_impl!(c_double, sqlite3_bind_double);
impl<'a> ToSql for &'a str {
unsafe fn bind_parameter(&self, stmt: *mut ffi::sqlite3_stmt, col: c_int) -> c_int {
let c_str = CString::from_slice(self.as_bytes());
ffi::sqlite3_bind_text(stmt, col, c_str.as_ptr(), -1, Some(ffi::SQLITE_TRANSIENT()))
if let Ok(c_str) = str_to_cstring(self) {
ffi::sqlite3_bind_text(stmt, col, c_str.as_ptr(), -1, Some(ffi::SQLITE_TRANSIENT()))
} else {
ffi::SQLITE_MISUSE
}
}
}
@@ -177,8 +179,7 @@ impl FromSql for String {
if c_text.is_null() {
Ok("".to_string())
} else {
let c_text = c_text as *const c_char;
let c_slice = std_ffi::c_str_to_bytes(&c_text);
let c_slice = CStr::from_ptr(c_text as *const c_char).to_bytes();
let utf8_str = str::from_utf8(c_slice);
utf8_str
.map(|s| { s.to_string() })