From f667910cbf458619aeaada49e8dbfd667d30c273 Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Sun, 15 Mar 2020 01:54:43 -0700 Subject: [PATCH] sqlite: SqliteResultValue -> SqliteValue to match other drivers --- sqlx-core/src/sqlite/database.rs | 6 +++--- sqlx-core/src/sqlite/mod.rs | 2 +- sqlx-core/src/sqlite/row.rs | 6 +++--- sqlx-core/src/sqlite/types/bool.rs | 4 ++-- sqlx-core/src/sqlite/types/bytes.rs | 6 +++--- sqlx-core/src/sqlite/types/float.rs | 6 +++--- sqlx-core/src/sqlite/types/int.rs | 6 +++--- sqlx-core/src/sqlite/types/mod.rs | 4 ++-- sqlx-core/src/sqlite/types/str.rs | 6 +++--- sqlx-core/src/sqlite/value.rs | 6 +++--- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sqlx-core/src/sqlite/database.rs b/sqlx-core/src/sqlite/database.rs index 746c41c2..efd40ca1 100644 --- a/sqlx-core/src/sqlite/database.rs +++ b/sqlx-core/src/sqlite/database.rs @@ -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>; } diff --git a/sqlx-core/src/sqlite/mod.rs b/sqlx-core/src/sqlite/mod.rs index 7f24d965..21221c4f 100644 --- a/sqlx-core/src/sqlite/mod.rs +++ b/sqlx-core/src/sqlite/mod.rs @@ -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; diff --git a/sqlx-core/src/sqlite/row.rs b/sqlx-core/src/sqlite/row.rs index 81f03491..b274e4f7 100644 --- a/sqlx-core/src/sqlite/row.rs +++ b/sqlx-core/src/sqlite/row.rs @@ -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> + fn try_get_raw<'r, I>(&'r self, index: I) -> crate::Result> where 'c: 'r, I: ColumnIndex, { let index = index.resolve(self)?; - let value = SqliteResultValue::new(self.statement(), index); + let value = SqliteValue::new(self.statement(), index); Ok(value) } diff --git a/sqlx-core/src/sqlite/types/bool.rs b/sqlx-core/src/sqlite/types/bool.rs index 4d014671..7b4e4c2f 100644 --- a/sqlx-core/src/sqlite/types/bool.rs +++ b/sqlx-core/src/sqlite/types/bool.rs @@ -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 for bool { @@ -17,7 +17,7 @@ impl Encode for bool { } impl<'a> Decode<'a, Sqlite> for bool { - fn decode(value: SqliteResultValue<'a>) -> crate::Result { + fn decode(value: SqliteValue<'a>) -> crate::Result { Ok(value.int() != 0) } } diff --git a/sqlx-core/src/sqlite/types/bytes.rs b/sqlx-core/src/sqlite/types/bytes.rs index 8eaf96db..9766349e 100644 --- a/sqlx-core/src/sqlite/types/bytes.rs +++ b/sqlx-core/src/sqlite/types/bytes.rs @@ -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 for [u8] { @@ -30,13 +30,13 @@ impl Encode for Vec { } 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 { - fn decode(value: SqliteResultValue<'de>) -> crate::Result> { + fn decode(value: SqliteValue<'de>) -> crate::Result> { <&[u8] as Decode>::decode(value).map(ToOwned::to_owned) } } diff --git a/sqlx-core/src/sqlite/types/float.rs b/sqlx-core/src/sqlite/types/float.rs index 9367e2ef..1e37ece2 100644 --- a/sqlx-core/src/sqlite/types/float.rs +++ b/sqlx-core/src/sqlite/types/float.rs @@ -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 for f32 { @@ -17,7 +17,7 @@ impl Encode for f32 { } impl<'a> Decode<'a, Sqlite> for f32 { - fn decode(value: SqliteResultValue<'a>) -> crate::Result { + fn decode(value: SqliteValue<'a>) -> crate::Result { Ok(value.double() as f32) } } @@ -35,7 +35,7 @@ impl Encode for f64 { } impl<'a> Decode<'a, Sqlite> for f64 { - fn decode(value: SqliteResultValue<'a>) -> crate::Result { + fn decode(value: SqliteValue<'a>) -> crate::Result { Ok(value.double()) } } diff --git a/sqlx-core/src/sqlite/types/int.rs b/sqlx-core/src/sqlite/types/int.rs index c3869e1b..8f8d6be9 100644 --- a/sqlx-core/src/sqlite/types/int.rs +++ b/sqlx-core/src/sqlite/types/int.rs @@ -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 for i32 { @@ -17,7 +17,7 @@ impl Encode for i32 { } impl<'a> Decode<'a, Sqlite> for i32 { - fn decode(value: SqliteResultValue<'a>) -> crate::Result { + fn decode(value: SqliteValue<'a>) -> crate::Result { Ok(value.int()) } } @@ -35,7 +35,7 @@ impl Encode for i64 { } impl<'a> Decode<'a, Sqlite> for i64 { - fn decode(value: SqliteResultValue<'a>) -> crate::Result { + fn decode(value: SqliteValue<'a>) -> crate::Result { Ok(value.int64()) } } diff --git a/sqlx-core/src/sqlite/types/mod.rs b/sqlx-core/src/sqlite/types/mod.rs index cfeb2c6e..dc1eb3d8 100644 --- a/sqlx-core/src/sqlite/types/mod.rs +++ b/sqlx-core/src/sqlite/types/mod.rs @@ -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 where T: Decode<'de, Sqlite>, { - fn decode(value: SqliteResultValue<'de>) -> crate::Result { + fn decode(value: SqliteValue<'de>) -> crate::Result { match value.r#type() { SqliteType::Null => Ok(None), _ => >::decode(value).map(Some), diff --git a/sqlx-core/src/sqlite/types/str.rs b/sqlx-core/src/sqlite/types/str.rs index e233f533..e22efd17 100644 --- a/sqlx-core/src/sqlite/types/str.rs +++ b/sqlx-core/src/sqlite/types/str.rs @@ -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 for str { @@ -30,13 +30,13 @@ impl Encode 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 { + fn decode(value: SqliteValue<'de>) -> crate::Result { <&str as Decode>::decode(value).map(ToOwned::to_owned) } } diff --git a/sqlx-core/src/sqlite/value.rs b/sqlx-core/src/sqlite/value.rs index 3e19628a..36c81289 100644 --- a/sqlx-core/src/sqlite/value.rs +++ b/sqlx-core/src/sqlite/value.rs @@ -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)]