Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: implement unsigned int support for sqlite #919

Merged
merged 1 commit into from
Jan 14, 2021
Merged

feat: implement unsigned int support for sqlite #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions sqlx-core/src/sqlite/types/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@
//! | Rust type | SQLite type(s) |
//! |---------------------------------------|------------------------------------------------------|
//! | `bool` | BOOLEAN |
//! | `i8` | INTEGER |
//! | `i16` | INTEGER |
//! | `i32` | INTEGER |
//! | `i64` | BIGINT, INT8 |
//! | `u8` | INTEGER |
//! | `u16` | INTEGER |
//! | `u32` | INTEGER |
//! | `i64` | BIGINT, INT8 |
mehcode marked this conversation as resolved.
Show resolved Hide resolved
//! | `f32` | REAL |
//! | `f64` | REAL |
//! | `&str`, `String` | TEXT |
Expand Down Expand Up @@ -47,5 +52,6 @@ mod int;
#[cfg(feature = "json")]
mod json;
mod str;
mod uint;
#[cfg(feature = "uuid")]
mod uuid;
104 changes: 104 additions & 0 deletions sqlx-core/src/sqlite/types/uint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
use std::convert::TryInto;

use crate::decode::Decode;
use crate::encode::{Encode, IsNull};
use crate::error::BoxDynError;
use crate::sqlite::type_info::DataType;
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteTypeInfo, SqliteValueRef};
use crate::types::Type;

impl Type<Sqlite> for u8 {
fn type_info() -> SqliteTypeInfo {
SqliteTypeInfo(DataType::Int)
}

fn compatible(ty: &SqliteTypeInfo) -> bool {
matches!(ty.0, DataType::Int | DataType::Int64)
}
}

impl<'q> Encode<'q, Sqlite> for u8 {
fn encode_by_ref(&self, args: &mut Vec<SqliteArgumentValue<'q>>) -> IsNull {
args.push(SqliteArgumentValue::Int(*self as i32));

IsNull::No
}
}

impl<'r> Decode<'r, Sqlite> for u8 {
fn decode(value: SqliteValueRef<'r>) -> Result<Self, BoxDynError> {
Ok(value.int().try_into()?)
}
}

impl Type<Sqlite> for u16 {
fn type_info() -> SqliteTypeInfo {
SqliteTypeInfo(DataType::Int)
}

fn compatible(ty: &SqliteTypeInfo) -> bool {
matches!(ty.0, DataType::Int | DataType::Int64)
}
}

impl<'q> Encode<'q, Sqlite> for u16 {
fn encode_by_ref(&self, args: &mut Vec<SqliteArgumentValue<'q>>) -> IsNull {
args.push(SqliteArgumentValue::Int(*self as i32));

IsNull::No
}
}

impl<'r> Decode<'r, Sqlite> for u16 {
fn decode(value: SqliteValueRef<'r>) -> Result<Self, BoxDynError> {
Ok(value.int().try_into()?)
}
}

impl Type<Sqlite> for u32 {
fn type_info() -> SqliteTypeInfo {
SqliteTypeInfo(DataType::Int64)
}

fn compatible(ty: &SqliteTypeInfo) -> bool {
matches!(ty.0, DataType::Int | DataType::Int64)
}
}

impl<'q> Encode<'q, Sqlite> for u32 {
fn encode_by_ref(&self, args: &mut Vec<SqliteArgumentValue<'q>>) -> IsNull {
args.push(SqliteArgumentValue::Int64(*self as i64));

IsNull::No
}
}

impl<'r> Decode<'r, Sqlite> for u32 {
fn decode(value: SqliteValueRef<'r>) -> Result<Self, BoxDynError> {
Ok(value.int64().try_into()?)
}
}

impl Type<Sqlite> for u64 {
fn type_info() -> SqliteTypeInfo {
SqliteTypeInfo(DataType::Int64)
}

fn compatible(ty: &SqliteTypeInfo) -> bool {
matches!(ty.0, DataType::Int | DataType::Int64)
}
}

impl<'q> Encode<'q, Sqlite> for u64 {
fn encode_by_ref(&self, args: &mut Vec<SqliteArgumentValue<'q>>) -> IsNull {
args.push(SqliteArgumentValue::Int64(*self as i64));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will result in data loss for u64 larger than std::i64::MAX.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be try_into() but Encode is not fallible (yet).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dignifiedquire Does your use case need u64 ? It might be safer to remove this one until we have a fallible Encode.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, you are right. I am fine not having u64 supported for the moment, so likely better to remove this.


IsNull::No
}
}

impl<'r> Decode<'r, Sqlite> for u64 {
fn decode(value: SqliteValueRef<'r>) -> Result<Self, BoxDynError> {
Ok(value.int64().try_into()?)
}
}