Fix compile fail tests

Oh boy we're back to rustc vomitting nonsense when a constraint fails...

Author: sgrif

diesel/src/macros/mod.rs

@@ -416,7 +416,7 @@ macro_rules! table_body {
             }
 
             impl<T> AppearsInFromClause<T> for table where
-                T: Table + JoinTo<table> + AppearsInFromClause<PleaseGenerateInverseJoinImpls<table>, Count=Never>,
+                T: Table + JoinTo<table>,
             {
                 type Count = Never;
             }
@@ -548,9 +548,6 @@ macro_rules! joinable_inner {
         primary_key_ty = $primary_key_ty:ty,
         primary_key_expr = $primary_key_expr:expr,
     ) => {
-        impl $crate::query_source::AppearsInFromClause<$right_table_ty> for $left_table_ty {
-            type Count = $crate::query_source::Never;
-        }
         impl $crate::JoinTo<$right_table_ty> for $left_table_ty {
             type JoinOnClause = $crate::expression::helper_types::Eq<
                 $crate::expression::nullable::Nullable<$foreign_key>,

diesel_compile_tests/tests/compile-fail/aggregate_expression_requires_column_from_same_table.rs

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

diesel_compile_tests/tests/compile-fail/any_is_only_selectable_if_inner_expr_is_selectable.rs

@@ -22,4 +22,8 @@ fn main() {
 
     stuff.filter(name.eq(any(more_stuff::names)));
     //~^ ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0271
 }

diesel_compile_tests/tests/compile-fail/boxed_queries_require_selectable_expression_for_filter.rs

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

diesel_compile_tests/tests/compile-fail/boxed_queries_require_selectable_expression_for_order.rs

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

diesel_compile_tests/tests/compile-fail/cannot_join_to_non_joinable_table.rs

@@ -30,13 +30,13 @@ enable_multi_table_joins!(users, comments);
 
 fn main() {
     let _ = users::table.inner_join(posts::table);
-    //~^ ERROR users::table: diesel::JoinTo<posts::table>
+    //~^ ERROR 0275
     let _ = users::table.left_outer_join(posts::table);
-    //~^ ERROR users::table: diesel::JoinTo<posts::table>
+    // We would get an error here but 0275 halts everything
 
     // Sanity check to make sure the error is when users
     // become involved
     let join = posts::table.inner_join(comments::table);
     let _ = users::table.inner_join(join);
-    //~^ ERROR users::table: diesel::JoinTo<posts::table>
+    // We would get an error here but 0275 halts everything
 }

diesel_compile_tests/tests/compile-fail/custom_returning_requires_selectable_expression.rs

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

diesel_compile_tests/tests/compile-fail/filter_cannot_take_comparison_for_columns_from_another_table.rs

@@ -20,6 +20,14 @@ table! {
 fn main() {
     let _ = users::table.filter(posts::id.eq(1));
     //~^ ERROR AppearsInFromClause
+    //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0277
     let _ = users::table.filter(users::name.eq(posts::title));
     //~^ ERROR AppearsInFromClause
+    //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0277
 }

diesel_compile_tests/tests/compile-fail/order_requires_column_from_same_table.rs

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

diesel_compile_tests/tests/compile-fail/pg_upsert_do_update_requires_valid_update.rs

@@ -42,6 +42,10 @@ fn main() {
     insert(&NewUser("Sean").on_conflict(id, do_update().set(name.eq(posts::title)))).into(users).execute(&connection);
     //~^ ERROR E0277
     //~| ERROR no method named `execute`
+    //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0271
 
     // Update column with excluded value that is not selectable
     insert(&NewUser("Sean").on_conflict(id, do_update().set(name.eq(excluded(posts::title))))).into(users).execute(&connection);