Merge pull request diesel-rs#3782 from snf/queryable_multi_table

allowing Queryable to be used with multiple table names

diesel_compile_tests/tests/fail/derive/multiple_table_names.stderr

@@ -25,10 +25,3 @@ error: expected a single table name attribute
    |
 52 | #[diesel(table_name = users_)]
    |          ^^^^^^^^^^
-
-error: expected a single table name attribute
-       note: remove this attribute
-  --> tests/fail/derive/multiple_table_names.rs:59:30
-   |
-59 | #[diesel(table_name = users, table_name = users_)]
-   |                              ^^^^^^^^^^

diesel_derives/src/queryable.rs

@@ -7,7 +7,7 @@ use crate::model::Model;
 use crate::util::wrap_in_dummy_mod;
 
 pub fn derive(item: DeriveInput) -> Result<TokenStream> {
-    let model = Model::from_item(&item, false, false)?;
+    let model = Model::from_item(&item, false, true)?;
 
     let struct_name = &item.ident;
     let field_ty = &model

diesel_derives/tests/queryable.rs

@@ -39,3 +39,27 @@ fn tuple_struct_without_column_name_annotations() {
     let data = select(sql::<(Integer, Integer)>("1, 2")).get_result(conn);
     assert_eq!(Ok(MyStruct(1, 2)), data);
 }
+
+#[test]
+fn multiple_tables() {
+    #[derive(Debug, Clone, PartialEq, Eq, Queryable)]
+    #[diesel(table_name = users)]
+    #[diesel(table_name = users_)]
+    struct NewUser {
+        name: String,
+        hair_color: String,
+    }
+
+    let conn = &mut connection();
+    let data = select(sql::<(diesel::sql_types::Text, diesel::sql_types::Text)>(
+        "'red', 'red'",
+    ))
+    .get_result(conn);
+    assert_eq!(
+        Ok(NewUser {
+            name: "red".to_string(),
+            hair_color: "red".to_string()
+        }),
+        data
+    );
+}