fluencelabs/sqlite-wasm-connector
1
0
Fork 0
mirror of https://github.com/fluencelabs/sqlite-wasm-connector synced 2025-04-08 09:18:05 +00:00
Code Issues Projects Releases Wiki Activity

Rename Value to Readable and Parameter to Bindable

Browse Source
This commit is contained in:
Ivan Ukhov 2015-08-02 20:15:15 -04:00
parent 3cdedd7db6
commit 611beaebb9
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib.rs
View File

@ -117,9 +117,9 @@ pub type Result<T> = std::result::Result<T, Error>;
pub enum Type { pub enum Type {
/// The binary type. /// The binary type.
Binary, Binary,
/// The floating-point type (64-bit). /// The floating-point type.
Float, Float,
/// The integer type (64-bit, signed). /// The integer type.
Integer, Integer,
/// The null type. /// The null type.
Null, Null,
@ -151,7 +151,7 @@ mod connection;
mod statement; mod statement;
pub use connection::Connection; pub use connection::Connection;
pub use statement::{Statement, State, Parameter, Value}; pub use statement::{Statement, State, Bindable, Readable};
/// Open a connection to a new or existing database. /// Open a connection to a new or existing database.
#[inline] #[inline]

36
src/statement.rs
View File

@ -19,17 +19,17 @@ pub enum State {
Done, Done,
} }
/// A parameter of a prepared statement. /// A type suitable for binding to a parameter of a prepared statement.
pub trait Parameter { pub trait Bindable {
/// Bind the parameter at a specific location. /// Bind to a particular parameter.
/// ///
/// The leftmost location has the index 1. /// The leftmost parameter has the index 1.
fn bind(&self, &mut Statement, usize) -> Result<()>; fn bind(&self, &mut Statement, usize) -> Result<()>;
} }
/// A value stored in a prepared statement. /// A type suitable for reading from a column of a prepared statement.
pub trait Value { pub trait Readable {
/// Read the value stored in a specific column. /// Read from a particular column.
/// ///
/// The leftmost column has the index 0. /// The leftmost column has the index 0.
fn read(&Statement, usize) -> Result<Self>; fn read(&Statement, usize) -> Result<Self>;
@ -61,7 +61,7 @@ impl<'l> Statement<'l> {
/// ///
/// The leftmost location has the index 1. /// The leftmost location has the index 1.
#[inline] #[inline]
pub fn bind<T: Parameter>(&mut self, i: usize, parameter: T) -> Result<()> { pub fn bind<T: Bindable>(&mut self, i: usize, parameter: T) -> Result<()> {
parameter.bind(self, i) parameter.bind(self, i)
} }
@ -69,8 +69,8 @@ impl<'l> Statement<'l> {
/// ///
/// The leftmost column has the index 0. /// The leftmost column has the index 0.
#[inline] #[inline]
pub fn read<T: Value>(&self, i: usize) -> Result<T> { pub fn read<T: Readable>(&self, i: usize) -> Result<T> {
Value::read(self, i) Readable::read(self, i)
} }
/// Evaluate the statement one step at a time. /// Evaluate the statement one step at a time.
@ -100,7 +100,7 @@ impl<'l> Drop for Statement<'l> {
} }
} }
impl Parameter for f64 { impl Bindable for f64 {
#[inline] #[inline]
fn bind(&self, statement: &mut Statement, i: usize) -> Result<()> { fn bind(&self, statement: &mut Statement, i: usize) -> Result<()> {
debug_assert!(i > 0, "the indexing starts from 1"); debug_assert!(i > 0, "the indexing starts from 1");
@ -112,7 +112,7 @@ impl Parameter for f64 {
} }
} }
impl Parameter for i64 { impl Bindable for i64 {
#[inline] #[inline]
fn bind(&self, statement: &mut Statement, i: usize) -> Result<()> { fn bind(&self, statement: &mut Statement, i: usize) -> Result<()> {
debug_assert!(i > 0, "the indexing starts from 1"); debug_assert!(i > 0, "the indexing starts from 1");
@ -124,7 +124,7 @@ impl Parameter for i64 {
} }
} }
impl<'l> Parameter for &'l str { impl<'l> Bindable for &'l str {
#[inline] #[inline]
fn bind(&self, statement: &mut Statement, i: usize) -> Result<()> { fn bind(&self, statement: &mut Statement, i: usize) -> Result<()> {
debug_assert!(i > 0, "the indexing starts from 1"); debug_assert!(i > 0, "the indexing starts from 1");
@ -136,7 +136,7 @@ impl<'l> Parameter for &'l str {
} }
} }
impl<'l> Parameter for &'l [u8] { impl<'l> Bindable for &'l [u8] {
#[inline] #[inline]
fn bind(&self, statement: &mut Statement, i: usize) -> Result<()> { fn bind(&self, statement: &mut Statement, i: usize) -> Result<()> {
debug_assert!(i > 0, "the indexing starts from 1"); debug_assert!(i > 0, "the indexing starts from 1");
@ -149,21 +149,21 @@ impl<'l> Parameter for &'l [u8] {
} }
} }
impl Value for f64 { impl Readable for f64 {
#[inline] #[inline]
fn read(statement: &Statement, i: usize) -> Result<Self> { fn read(statement: &Statement, i: usize) -> Result<Self> {
Ok(unsafe { ffi::sqlite3_column_double(statement.raw.0, i as c_int) as f64 }) Ok(unsafe { ffi::sqlite3_column_double(statement.raw.0, i as c_int) as f64 })
} }
} }
impl Value for i64 { impl Readable for i64 {
#[inline] #[inline]
fn read(statement: &Statement, i: usize) -> Result<Self> { fn read(statement: &Statement, i: usize) -> Result<Self> {
Ok(unsafe { ffi::sqlite3_column_int64(statement.raw.0, i as c_int) as i64 }) Ok(unsafe { ffi::sqlite3_column_int64(statement.raw.0, i as c_int) as i64 })
} }
} }
impl Value for String { impl Readable for String {
#[inline] #[inline]
fn read(statement: &Statement, i: usize) -> Result<Self> { fn read(statement: &Statement, i: usize) -> Result<Self> {
unsafe { unsafe {
@ -176,7 +176,7 @@ impl Value for String {
} }
} }
impl Value for Vec<u8> { impl Readable for Vec<u8> {
#[inline] #[inline]
fn read(statement: &Statement, i: usize) -> Result<Self> { fn read(statement: &Statement, i: usize) -> Result<Self> {
use std::ptr::copy_nonoverlapping as copy; use std::ptr::copy_nonoverlapping as copy;