Merge pull request #3186 from weiznich/fix/allow_mysql_tables_with_datetime_and_json_sql_types

Allow mysql schemas that contain either a json or a datatime field

Author: weiznich

diesel_cli/src/print_schema.rs

@@ -144,6 +144,8 @@ fn mysql_diesel_types() -> HashSet<&'static str> {
 
     types.insert("TinyInt");
     types.insert("Tinyint");
+    types.insert("Datetime");
+    types.insert("Json");
     types
 }
 

diesel_cli/tests/print_schema.rs

@@ -124,6 +124,12 @@ fn print_schema_unsigned() {
     test_print_schema("print_schema_unsigned", vec!["--with-docs"]);
 }
 
+#[test]
+#[cfg(feature = "mysql")]
+fn print_schema_datetime_for_mysql() {
+    test_print_schema("print_schema_datetime_for_mysql", vec!["--with-docs"]);
+}
+
 #[test]
 #[cfg(not(windows))]
 fn print_schema_patch_file() {

diesel_cli/tests/print_schema/print_schema_datetime_for_mysql/diesel.toml

@@ -0,0 +1,3 @@
+[print_schema]
+file = "src/schema.rs"
+with_docs = true

diesel_cli/tests/print_schema/print_schema_datetime_for_mysql/mysql/expected.rs

@@ -0,0 +1,27 @@
+// @generated automatically by Diesel CLI.
+
+diesel::table! {
+    /// Representation of the `users` table.
+    ///
+    /// (Automatically generated by Diesel.)
+    users (id) {
+        /// The `id` column of the `users` table.
+        ///
+        /// Its SQL type is `Integer`.
+        ///
+        /// (Automatically generated by Diesel.)
+        id -> Integer,
+        /// The `datetime` column of the `users` table.
+        ///
+        /// Its SQL type is `Datetime`.
+        ///
+        /// (Automatically generated by Diesel.)
+        datetime -> Datetime,
+        /// The `nullable_datetime` column of the `users` table.
+        ///
+        /// Its SQL type is `Nullable<Datetime>`.
+        ///
+        /// (Automatically generated by Diesel.)
+        nullable_datetime -> Nullable<Datetime>,
+    }
+}

diesel_cli/tests/print_schema/print_schema_datetime_for_mysql/mysql/schema.sql

@@ -0,0 +1,5 @@
+CREATE TABLE users (
+    id INTEGER PRIMARY KEY,
+    datetime DATETIME NOT NULL,
+    nullable_datetime DATETIME
+);