Merge pull request diesel-rs#904 from Eijebong/chrono_sqlite

Correctly infer datetime types for SQLite

Author: Eijebong

diesel_infer_schema/src/sqlite.rs

@@ -85,25 +85,36 @@ pub fn get_primary_keys(conn: &SqliteConnection, table: &TableData) -> QueryResu
         .collect())
 }
 
+fn diesel_type(t: &str) -> Vec<String> {
+    vec!["diesel".into(), "types".into(), t.into()]
+}
+
 pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box<Error>> {
     let type_name = attr.type_name.to_lowercase();
     let path = if is_bool(&type_name) {
-        vec!["diesel".into(), "types".into(), "Bool".into()]
+        diesel_type("Bool")
     } else if is_smallint(&type_name) {
-        vec!["diesel".into(), "types".into(), "SmallInt".into()]
+        diesel_type("SmallInt")
     } else if is_bigint(&type_name) {
-        vec!["diesel".into(), "types".into(), "BigInt".into()]
+        diesel_type("BigInt")
     } else if type_name.contains("int") {
-        vec!["diesel".into(), "types".into(), "Integer".into()]
+        diesel_type("Integer")
     } else if is_text(&type_name) {
-        vec!["diesel".into(), "types".into(), "Text".into()]
+        diesel_type("Text")
     } else if type_name.contains("blob") || type_name.is_empty() {
-        vec!["diesel".into(), "types".into(), "Binary".into()]
+        diesel_type("Binary")
     } else if is_float(&type_name) {
-        vec!["diesel".into(), "types".into(), "Float".into()]
+        diesel_type("Float")
     } else if is_double(&type_name) {
-        vec!["diesel".into(), "types".into(), "Double".into()]
-    } else {
+        diesel_type("Double")
+    } else if type_name == "datetime" || type_name == "timestamp" {
+        diesel_type("Timestamp")
+    } else if type_name == "date" {
+        diesel_type("Date")
+    } else if type_name == "time" {
+        diesel_type("Time")
+    }
+    else {
         return Err(format!("Unsupported type: {}", type_name).into())
     };
 

diesel_tests/tests/schema_inference.rs

@@ -1,7 +1,10 @@
+extern crate chrono;
+
 #[cfg(feature = "sqlite")]
 mod sqlite {
     use diesel::*;
     use schema::*;
+    use super::chrono::*;
 
     #[derive(Queryable, PartialEq, Debug, Insertable)]
     #[table_name="infer_all_the_ints"]
@@ -132,4 +135,31 @@ mod sqlite {
 
         assert_eq!(Ok(vec![inferred_floats]), infer_all_the_floats::table.load(&conn));
     }
+
+    #[derive(Queryable, PartialEq, Debug, Insertable)]
+    #[table_name="infer_all_the_datetime_types"]
+    struct InferredDatetimeTypes {
+        dt: NaiveDateTime,
+        date: NaiveDate,
+        time: NaiveTime,
+        timestamp: NaiveDateTime,
+    }
+
+    #[test]
+    fn datetime_types_are_correctly_inferred() {
+        let conn = connection();
+
+        let dt = NaiveDate::from_ymd(2016, 7, 8).and_hms(9, 10, 11);
+        let inferred_datetime_types = InferredDatetimeTypes {
+            dt: dt,
+            date: dt.date(),
+            time: dt.time(),
+            timestamp: dt,
+        };
+
+        insert(&inferred_datetime_types).into(infer_all_the_datetime_types::table)
+            .execute(&conn).unwrap();
+
+        assert_eq!(Ok(vec![inferred_datetime_types]), infer_all_the_datetime_types::table.load(&conn));
+    }
 }

migrations/sqlite/20170513174919_infer_all_the_datetime_types/down.sql

@@ -0,0 +1 @@
+DROP TABLE infer_all_the_datetime_types;

migrations/sqlite/20170513174919_infer_all_the_datetime_types/up.sql

@@ -0,0 +1,6 @@
+CREATE TABLE infer_all_the_datetime_types (
+    dt DATETIME PRIMARY KEY NOT NULL,
+    date DATE NOT NULL,
+    time TIME NOT NULL,
+    timestamp TIMESTAMP NOT NULL
+);