Merge pull request diesel-rs#1001 from Fiedzia/mysql_types

Try to add Tinyint

Author: Eijebong

diesel/src/mysql/mod.rs

@@ -1,8 +1,8 @@
 mod backend;
 mod connection;
-mod types;
 
 pub mod query_builder;
+pub mod types;
 
 pub use self::backend::{Mysql, MysqlType};
 pub use self::connection::MysqlConnection;

diesel/src/mysql/types/mod.rs

@@ -1,11 +1,29 @@
 #[cfg(feature = "chrono")]
 mod date_and_time;
 
+use byteorder::WriteBytesExt;
 use mysql::{Mysql, MysqlType};
 use std::error::Error as StdError;
 use std::io::Write;
 use types::{ToSql, IsNull, FromSql, HasSqlType};
 
+primitive_impls!(Tinyint -> (i8, mysql: (Tiny)));
+
+impl ToSql<::types::Tinyint, Mysql> for i8 {
+    fn to_sql<W: Write>(&self, out: &mut W) -> Result<IsNull, Box<StdError+Send+Sync>> {
+        out.write_i8(*self)
+            .map(|_| IsNull::No)
+            .map_err(|e| Box::new(e) as Box<StdError+Send+Sync>)
+    }
+}
+
+impl FromSql<::types::Tinyint, Mysql> for i8 {
+    fn from_sql(bytes: Option<&[u8]>) -> Result<Self, Box<StdError+Send+Sync>> {
+        let bytes = not_none!(bytes);
+        Ok(bytes[0] as i8)
+    }
+}
+
 impl ToSql<::types::Bool, Mysql> for bool {
     fn to_sql<W: Write>(&self, out: &mut W) -> Result<IsNull, Box<StdError+Send+Sync>> {
         let int_value = if *self {

diesel/src/types/mod.rs

@@ -58,6 +58,19 @@ use std::io::Write;
 /// [bool]: https://doc.rust-lang.org/nightly/std/primitive.bool.html
 #[derive(Debug, Clone, Copy, Default)] pub struct Bool;
 
+/// The tinyint SQL type. This is only available on MySQL.
+///
+/// ### [`ToSql`](/diesel/types/trait.ToSql.html) impls
+///
+/// - [`i8`][i8]
+///
+/// ### [`FromSql`](/diesel/types/trait.FromSql.html) impls
+///
+/// - [`i8`][i8]
+///
+/// [i8]: https://doc.rust-lang.org/nightly/std/primitive.i8.html
+#[derive(Debug, Clone, Copy, Default)] pub struct Tinyint;
+
 /// The small integer SQL type.
 ///
 /// ### [`ToSql`](/diesel/types/trait.ToSql.html) impls
@@ -276,6 +289,9 @@ pub type VarChar = Text;
 #[cfg(feature = "postgres")]
 pub use pg::types::sql_types::*;
 
+#[cfg(feature = "mysql")]
+pub use mysql::types::*;
+
 pub trait HasSqlType<ST>: TypeMetadata {
     fn metadata() -> Self::TypeMetadata;
 

diesel_tests/tests/types_roundtrip.rs

@@ -149,6 +149,7 @@ mod pg_types {
 mod mysql_types {
     use super::*;
 
+    test_round_trip!(i8_roundtrips, Tinyint, i8);
     test_round_trip!(naive_datetime_roundtrips, Timestamp, (i64, u32), mk_naive_datetime);
     test_round_trip!(naive_time_roundtrips, Time, (u32, u32), mk_naive_time);
     test_round_trip!(naive_date_roundtrips, Date, u32, mk_naive_date);