itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2026-02-14 20:07:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

sqlite: SqliteResultValue -> SqliteValue to match other drivers

Browse Source
This commit is contained in:
Ryan Leckey 2020-03-15 01:54:43 -07:00
parent 426361f361
commit f667910cbf
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sqlx-core/src/sqlite/database.rs
View File

@ -21,12 +21,12 @@ impl<'c> HasRow<'c> for Sqlite {
type Row = super::SqliteRow<'c>;
}
impl<'s, 'q> HasCursor<'s, 'q> for Sqlite {
impl<'c, 'q> HasCursor<'c, 'q> for Sqlite {
type Database = Sqlite;
type Cursor = super::SqliteCursor<'s, 'q>;
type Cursor = super::SqliteCursor<'c, 'q>;
}
impl<'c> HasRawValue<'c> for Sqlite {
type RawValue = super::SqliteResultValue<'c>;
type RawValue = super::SqliteValue<'c>;
}

2
sqlx-core/src/sqlite/mod.rs
View File

@ -17,7 +17,7 @@ pub use database::Sqlite;
pub use error::SqliteError;
pub use row::SqliteRow;
pub use types::SqliteTypeInfo;
pub use value::SqliteResultValue;
pub use value::SqliteValue;
/// An alias for [`Pool`][crate::Pool], specialized for **Sqlite**.
pub type SqlitePool = crate::pool::Pool<SqliteConnection>;

6
sqlx-core/src/sqlite/row.rs
View File

@ -1,7 +1,7 @@
use crate::database::HasRow;
use crate::row::{ColumnIndex, Row};
use crate::sqlite::statement::SqliteStatement;
use crate::sqlite::value::SqliteResultValue;
use crate::sqlite::value::SqliteValue;
use crate::sqlite::{Sqlite, SqliteConnection};
pub struct SqliteRow<'c> {
@ -24,13 +24,13 @@ impl<'c> Row<'c> for SqliteRow<'c> {
self.values
}
fn try_get_raw<'r, I>(&'r self, index: I) -> crate::Result<SqliteResultValue<'r>>
fn try_get_raw<'r, I>(&'r self, index: I) -> crate::Result<SqliteValue<'r>>
where
'c: 'r,
I: ColumnIndex<Self::Database>,
{
let index = index.resolve(self)?;
let value = SqliteResultValue::new(self.statement(), index);
let value = SqliteValue::new(self.statement(), index);
Ok(value)
}

4
sqlx-core/src/sqlite/types/bool.rs
View File

@ -1,7 +1,7 @@
use crate::decode::Decode;
use crate::encode::Encode;
use crate::sqlite::types::{SqliteType, SqliteTypeAffinity};
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteResultValue, SqliteTypeInfo};
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteTypeInfo, SqliteValue};
use crate::types::Type;
impl Type<Sqlite> for bool {
@ -17,7 +17,7 @@ impl Encode<Sqlite> for bool {
}
impl<'a> Decode<'a, Sqlite> for bool {
fn decode(value: SqliteResultValue<'a>) -> crate::Result<bool> {
fn decode(value: SqliteValue<'a>) -> crate::Result<bool> {
Ok(value.int() != 0)
}
}

6
sqlx-core/src/sqlite/types/bytes.rs
View File

@ -1,7 +1,7 @@
use crate::decode::Decode;
use crate::encode::Encode;
use crate::sqlite::types::{SqliteType, SqliteTypeAffinity};
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteResultValue, SqliteTypeInfo};
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteTypeInfo, SqliteValue};
use crate::types::Type;
impl Type<Sqlite> for [u8] {
@ -30,13 +30,13 @@ impl Encode<Sqlite> for Vec<u8> {
}
impl<'de> Decode<'de, Sqlite> for &'de [u8] {
fn decode(value: SqliteResultValue<'de>) -> crate::Result<&'de [u8]> {
fn decode(value: SqliteValue<'de>) -> crate::Result<&'de [u8]> {
Ok(value.blob())
}
}
impl<'de> Decode<'de, Sqlite> for Vec<u8> {
fn decode(value: SqliteResultValue<'de>) -> crate::Result<Vec<u8>> {
fn decode(value: SqliteValue<'de>) -> crate::Result<Vec<u8>> {
<&[u8] as Decode<Sqlite>>::decode(value).map(ToOwned::to_owned)
}
}

6
sqlx-core/src/sqlite/types/float.rs
View File

@ -1,7 +1,7 @@
use crate::decode::Decode;
use crate::encode::Encode;
use crate::sqlite::types::{SqliteType, SqliteTypeAffinity};
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteResultValue, SqliteTypeInfo};
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteTypeInfo, SqliteValue};
use crate::types::Type;
impl Type<Sqlite> for f32 {
@ -17,7 +17,7 @@ impl Encode<Sqlite> for f32 {
}
impl<'a> Decode<'a, Sqlite> for f32 {
fn decode(value: SqliteResultValue<'a>) -> crate::Result<f32> {
fn decode(value: SqliteValue<'a>) -> crate::Result<f32> {
Ok(value.double() as f32)
}
}
@ -35,7 +35,7 @@ impl Encode<Sqlite> for f64 {
}
impl<'a> Decode<'a, Sqlite> for f64 {
fn decode(value: SqliteResultValue<'a>) -> crate::Result<f64> {
fn decode(value: SqliteValue<'a>) -> crate::Result<f64> {
Ok(value.double())
}
}

6
sqlx-core/src/sqlite/types/int.rs
View File

@ -1,7 +1,7 @@
use crate::decode::Decode;
use crate::encode::Encode;
use crate::sqlite::types::{SqliteType, SqliteTypeAffinity};
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteResultValue, SqliteTypeInfo};
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteTypeInfo, SqliteValue};
use crate::types::Type;
impl Type<Sqlite> for i32 {
@ -17,7 +17,7 @@ impl Encode<Sqlite> for i32 {
}
impl<'a> Decode<'a, Sqlite> for i32 {
fn decode(value: SqliteResultValue<'a>) -> crate::Result<i32> {
fn decode(value: SqliteValue<'a>) -> crate::Result<i32> {
Ok(value.int())
}
}
@ -35,7 +35,7 @@ impl Encode<Sqlite> for i64 {
}
impl<'a> Decode<'a, Sqlite> for i64 {
fn decode(value: SqliteResultValue<'a>) -> crate::Result<i64> {
fn decode(value: SqliteValue<'a>) -> crate::Result<i64> {
Ok(value.int64())
}
}

4
sqlx-core/src/sqlite/types/mod.rs
View File

@ -1,7 +1,7 @@
use std::fmt::{self, Display};
use crate::decode::Decode;
use crate::sqlite::value::SqliteResultValue;
use crate::sqlite::value::SqliteValue;
use crate::sqlite::Sqlite;
use crate::types::TypeInfo;
@ -72,7 +72,7 @@ impl<'de, T> Decode<'de, Sqlite> for Option<T>
where
T: Decode<'de, Sqlite>,
{
fn decode(value: SqliteResultValue<'de>) -> crate::Result<Self> {
fn decode(value: SqliteValue<'de>) -> crate::Result<Self> {
match value.r#type() {
SqliteType::Null => Ok(None),
_ => <T as Decode<Sqlite>>::decode(value).map(Some),

6
sqlx-core/src/sqlite/types/str.rs
View File

@ -1,7 +1,7 @@
use crate::decode::Decode;
use crate::encode::Encode;
use crate::sqlite::types::{SqliteType, SqliteTypeAffinity};
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteResultValue, SqliteTypeInfo};
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteTypeInfo, SqliteValue};
use crate::types::Type;
impl Type<Sqlite> for str {
@ -30,13 +30,13 @@ impl Encode<Sqlite> for String {
}
impl<'de> Decode<'de, Sqlite> for &'de str {
fn decode(value: SqliteResultValue<'de>) -> crate::Result<&'de str> {
fn decode(value: SqliteValue<'de>) -> crate::Result<&'de str> {
Ok(value.text())
}
}
impl<'de> Decode<'de, Sqlite> for String {
fn decode(value: SqliteResultValue<'de>) -> crate::Result<String> {
fn decode(value: SqliteValue<'de>) -> crate::Result<String> {
<&str as Decode<Sqlite>>::decode(value).map(ToOwned::to_owned)
}
}

6
sqlx-core/src/sqlite/value.rs
View File

@ -12,12 +12,12 @@ use libsqlite3_sys::{
use crate::sqlite::statement::SqliteStatement;
use crate::sqlite::types::SqliteType;
pub struct SqliteResultValue<'c> {
pub struct SqliteValue<'c> {
index: usize,
statement: &'c SqliteStatement,
}
impl<'c> SqliteResultValue<'c> {
impl<'c> SqliteValue<'c> {
#[inline]
pub(super) fn new(statement: &'c SqliteStatement, index: usize) -> Self {
Self { statement, index }
@ -29,7 +29,7 @@ impl<'c> SqliteResultValue<'c> {
// These routines return information about a single column of the current result row of a query.
impl<'c> SqliteResultValue<'c> {
impl<'c> SqliteValue<'c> {
/// Returns the initial data type of the result column.
pub(super) fn r#type(&self) -> SqliteType {
#[allow(unsafe_code)]