fix build

Author: sgrif

diesel/src/doctest_setup.rs

@@ -256,18 +256,22 @@ mod schema {
             body -> VarChar,
         }
     }
+
     table! {
         posts {
             id -> Integer,
             user_id -> Integer,
             title -> VarChar,
         }
     }
+
     table! {
         users {
             id -> Integer,
             name -> VarChar,
         }
     }
+
+    joinable!(posts -> users (user_id));
+    allow_tables_to_appear_in_same_query!(comments, posts, users);
 }
-joinable!(schema::posts -> schema::users(user_id));

diesel/src/macros/mod.rs

@@ -907,8 +907,10 @@ macro_rules! __diesel_table_query_source_impl {
 /// # include!("../doctest_setup.rs");
 /// use schema::*;
 ///
+/// # /*
 /// joinable!(posts -> users (user_id));
 /// allow_tables_to_appear_in_same_query!(posts, users);
+/// # */
 ///
 /// # fn main() {
 /// let implicit_on_clause = users::table.inner_join(posts::table);

diesel_codegen/tests/associations.rs

@@ -26,6 +26,8 @@ fn simple_belongs_to() {
         }
     }
 
+    allow_tables_to_appear_in_same_query!(users, posts);
+
     #[derive(Identifiable)]
     pub struct User {
         id: i32,
@@ -91,6 +93,8 @@ fn custom_foreign_key() {
         }
     }
 
+    allow_tables_to_appear_in_same_query!(users, posts);
+
     #[derive(Identifiable)]
     pub struct User {
         id: i32,
@@ -148,7 +152,6 @@ fn self_referential() {
         }
     }
 
-
     #[derive(Associations, Identifiable)]
     #[belongs_to(Tree, foreign_key = "parent_id")]
     pub struct Tree {

diesel_compile_tests/tests/compile-fail/aggregate_expression_requires_column_from_same_table.rs

@@ -20,17 +20,13 @@ fn main() {
     let source = users::table.select(sum(posts::id));
     //~^ ERROR E0277
     //~| ERROR AppearsInFromClause
-    //~| ERROR E0277
     let source = users::table.select(avg(posts::id));
     //~^ ERROR E0277
     //~| ERROR AppearsInFromClause
-    //~| ERROR E0277
     let source = users::table.select(max(posts::id));
     //~^ ERROR E0277
     //~| ERROR AppearsInFromClause
-    //~| ERROR E0277
     let source = users::table.select(min(posts::id));
     //~^ ERROR E0277
     //~| ERROR AppearsInFromClause
-    //~| ERROR E0277
 }

diesel_compile_tests/tests/compile-fail/any_is_only_selectable_if_inner_expr_is_selectable.rs

@@ -30,7 +30,6 @@ fn main() {
 
     let _ = LoadDsl::load::<Stuff>(
     //~^ ERROR E0277
-    //~| ERROR E0271
         stuff.filter(name.eq(any(more_stuff::names))),
         &conn,
     );

diesel_compile_tests/tests/compile-fail/boxed_queries_require_selectable_expression_for_filter.rs

@@ -21,5 +21,4 @@ table! {
 fn main() {
     users::table.into_boxed::<Pg>().filter(posts::title.eq("Hello"));
     //~^ ERROR AppearsInFromClause
-    //~| ERROR E0277
 }

diesel_compile_tests/tests/compile-fail/boxed_queries_require_selectable_expression_for_order.rs

@@ -21,5 +21,4 @@ table! {
 fn main() {
     users::table.into_boxed::<Pg>().order(posts::title.desc());
     //~^ ERROR AppearsInFromClause
-    //~| ERROR E0277
 }

diesel_compile_tests/tests/compile-fail/cannot_join_to_non_joinable_table.rs

@@ -25,8 +25,7 @@ table! {
 }
 
 joinable!(comments -> posts (post_id));
-allow_tables_to_appear_in_same_query!(users, posts);
-allow_tables_to_appear_in_same_query!(users, comments);
+allow_tables_to_appear_in_same_query!(comments, posts, users);
 
 fn main() {
     let _ = users::table.inner_join(posts::table);

diesel_compile_tests/tests/compile-fail/custom_returning_requires_selectable_expression.rs

@@ -37,5 +37,4 @@ fn main() {
     let stmt = insert_into(users).values(&new_user).returning((name, bad::age));
     //~^ ERROR SelectableExpression
     //~| ERROR AppearsInFromClause
-    //~| ERROR E0277
 }

diesel_compile_tests/tests/compile-fail/order_requires_column_from_same_table.rs

@@ -18,5 +18,4 @@ table! {
 fn main() {
     let source = users::table.order(posts::id);
     //~^ ERROR E0277
-    //~| ERROR E0271
 }