Merge branch 'master' into fix_boxed_expression_for_having

diesel-rs · Jan 2, 2024 · b0e938b · b0e938b
2 parents 2aa169d + bb3bd2a
commit b0e938b
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 27 deletions.
diff --git a/diesel_cli/src/default_files/diesel.toml b/diesel_cli/src/default_files/diesel.toml
@@ -3,7 +3,7 @@
 
 [print_schema]
 file = "src/schema.rs"
-custom_type_derives = ["diesel::query_builder::QueryId"]
+custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
 
 [migrations_directory]
 dir = "migrations"
diff --git a/diesel_cli/tests/print_schema.rs b/diesel_cli/tests/print_schema.rs
@@ -292,6 +292,8 @@ fn print_schema_with_enum_set_types() {
             "--with-docs",
             "--custom-type-derives",
             "diesel::query_builder::QueryId",
+            "--custom-type-derives",
+            "Clone",
         ],
     )
 }

diff --git a/diesel_cli/tests/print_schema/print_schema_custom_types_check_default_derives/diesel.toml b/diesel_cli/tests/print_schema/print_schema_custom_types_check_default_derives/diesel.toml
@@ -1,4 +1,4 @@
 [print_schema]
 file = "src/schema.rs"
 with_docs = true
-custom_type_derives = ["diesel::query_builder::QueryId"]
+custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
diff --git a/...tests/print_schema/print_schema_custom_types_check_default_derives/postgres/expected.snap b/...tests/print_schema/print_schema_custom_types_check_default_derives/postgres/expected.snap
@@ -11,14 +11,14 @@ pub mod sql_types {
     /// The `my_type` SQL type
     ///
     /// (Automatically generated by Diesel.)
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "my_type"))]
     pub struct MyType;
 
     /// The `my_type2` SQL type
     ///
     /// (Automatically generated by Diesel.)
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "my_type2"))]
     pub struct MyType2;
 }
@@ -58,4 +58,3 @@ diesel::table! {
         custom_enum2 -> MyType2,
     }
 }
-
diff --git a/diesel_cli/tests/print_schema/print_schema_default_is_to_generate_custom_types/diesel.toml b/diesel_cli/tests/print_schema/print_schema_default_is_to_generate_custom_types/diesel.toml
@@ -1,4 +1,4 @@
 [print_schema]
 file = "src/schema.rs"
 with_docs = true
-custom_type_derives = ["diesel::query_builder::QueryId"]
+custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
diff --git a/...ests/print_schema/print_schema_default_is_to_generate_custom_types/postgres/expected.snap b/...ests/print_schema/print_schema_default_is_to_generate_custom_types/postgres/expected.snap
@@ -11,14 +11,14 @@ pub mod sql_types {
     /// The `my_type` SQL type
     ///
     /// (Automatically generated by Diesel.)
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "my_type"))]
     pub struct MyType;
 
     /// The `my_type2` SQL type
     ///
     /// (Automatically generated by Diesel.)
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "my_type2"))]
     pub struct MyType2;
 }
@@ -58,4 +58,3 @@ diesel::table! {
         custom_enum2 -> MyType2,
     }
 }
-
diff --git a/diesel_cli/tests/print_schema/print_schema_respects_type_name_case/diesel.toml b/diesel_cli/tests/print_schema/print_schema_respects_type_name_case/diesel.toml
@@ -1,4 +1,4 @@
 [print_schema]
 file = "src/schema.rs"
 with_docs = true
-custom_type_derives = ["diesel::query_builder::QueryId"]
+custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
diff --git a/diesel_cli/tests/print_schema/print_schema_respects_type_name_case/postgres/expected.snap b/diesel_cli/tests/print_schema/print_schema_respects_type_name_case/postgres/expected.snap
@@ -11,14 +11,14 @@ pub mod sql_types {
     /// The `MyType` SQL type
     ///
     /// (Automatically generated by Diesel.)
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "MyType"))]
     pub struct MyType;
 
     /// The `MyType2` SQL type
     ///
     /// (Automatically generated by Diesel.)
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "MyType2"))]
     pub struct MyType2;
 }
@@ -58,4 +58,3 @@ diesel::table! {
         custom_enum2 -> MyType2,
     }
 }
-
diff --git a/...l_cli/tests/print_schema/print_schema_specifying_schema_name_with_custom_type/diesel.toml b/...l_cli/tests/print_schema/print_schema_specifying_schema_name_with_custom_type/diesel.toml
@@ -2,4 +2,4 @@
 file = "src/schema.rs"
 with_docs = true
 schema = "custom_schema"
-custom_type_derives = ["diesel::query_builder::QueryId"]
+custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
diff --git a/.../print_schema/print_schema_specifying_schema_name_with_custom_type/postgres/expected.snap b/.../print_schema/print_schema_specifying_schema_name_with_custom_type/postgres/expected.snap
@@ -12,7 +12,7 @@ pub mod custom_schema {
         /// The `custom_schema.my_enum` SQL type
         ///
         /// (Automatically generated by Diesel.)
-        #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+        #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
         #[diesel(postgres_type(name = "my_enum", schema = "custom_schema"))]
         pub struct MyEnum;
     }
@@ -40,4 +40,3 @@ pub mod custom_schema {
         }
     }
 }
-
diff --git a/diesel_cli/tests/print_schema/print_schema_type_renaming/diesel.toml b/diesel_cli/tests/print_schema/print_schema_type_renaming/diesel.toml
@@ -1,4 +1,4 @@
 [print_schema]
 file = "src/schema.rs"
 with_docs = true
-custom_type_derives = ["diesel::query_builder::QueryId"]
+custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
diff --git a/diesel_cli/tests/print_schema/print_schema_type_renaming/postgres/expected.snap b/diesel_cli/tests/print_schema/print_schema_type_renaming/postgres/expected.snap
@@ -11,7 +11,7 @@ pub mod sql_types {
     /// The `user_job` SQL type
     ///
     /// (Automatically generated by Diesel.)
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "user_job"))]
     pub struct UserJob;
 }
@@ -38,4 +38,3 @@ diesel::table! {
         job -> UserJob,
     }
 }
-
diff --git a/diesel_cli/tests/print_schema/print_schema_with_enum_set_types/diesel.toml b/diesel_cli/tests/print_schema/print_schema_with_enum_set_types/diesel.toml
@@ -1,4 +1,4 @@
 [print_schema]
 file = "src/schema.rs"
 with_docs = true
-custom_type_derives = ["diesel::query_builder::QueryId"]
+custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
diff --git a/diesel_cli/tests/print_schema/print_schema_with_enum_set_types/mysql/expected.snap b/diesel_cli/tests/print_schema/print_schema_with_enum_set_types/mysql/expected.snap
@@ -12,15 +12,15 @@ pub mod sql_types {
     /// [`users1::enabled_features`](super::users1::enabled_features)) column
     ///
     /// (Automatically generated by Diesel.)
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
     #[diesel(mysql_type(name = "Set"))]
     pub struct Users1EnabledFeaturesSet;
 
     /// The `enum` SQL type for the
     /// [`users1::user_state`](super::users1::user_state)) column
     ///
     /// (Automatically generated by Diesel.)
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
     #[diesel(mysql_type(name = "Enum"))]
     pub struct Users1UserStateEnum;
 }
@@ -56,4 +56,3 @@ diesel::table! {
         enabled_features -> Users1EnabledFeaturesSet,
     }
 }
-
diff --git a/diesel_cli/tests/print_schema/print_schema_with_enum_set_types/postgres/expected.snap b/diesel_cli/tests/print_schema/print_schema_with_enum_set_types/postgres/expected.snap
@@ -11,14 +11,14 @@ pub mod sql_types {
     /// The `some_enum` SQL type
     ///
     /// (Automatically generated by Diesel.)
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "some_enum"))]
     pub struct SomeEnum;
 
     /// The `some_enum_2` SQL type
     ///
     /// (Automatically generated by Diesel.)
-    #[derive(diesel::query_builder::QueryId, diesel::sql_types::SqlType)]
+    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
     #[diesel(postgres_type(name = "some_enum_2"))]
     pub struct SomeEnum2;
 }
@@ -52,4 +52,3 @@ diesel::table! {
         some_field_2 -> SomeEnum2,
     }
 }
-
diff --git a/examples/postgres/composite_types/diesel.toml b/examples/postgres/composite_types/diesel.toml
@@ -3,7 +3,7 @@
 
 [print_schema]
 file = "src/schema.rs"
-custom_type_derives = ["diesel::query_builder::QueryId"]
+custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
 
 [migrations_directory]
 dir = "migrations"