[fix] fixes some compilertests due to renaming of an associated type.

coderPaddyS · coderPaddyS · commit bca7e686b9ec · 2024-06-20T18:43:16.000+02:00
diff --git a/diesel_compile_tests/tests/fail/copy_can_only_use_options_with_raw_variant.stderr b/diesel_compile_tests/tests/fail/copy_can_only_use_options_with_raw_variant.stderr
@@ -26,7 +26,7 @@ error[E0599]: the method `load` exists for struct `CopyToQuery<table, CopyToOpti
   ::: $DIESEL/src/pg/query_builder/copy/copy_to.rs
    |
    |   pub struct CopyToQuery<T, O> {
-   |   ---------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: Table`
+   |   ---------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: View`
    |
    = note: the following trait bounds were not satisfied:
            `CopyToQuery<users::table, pg::query_builder::copy::copy_to::CopyToOptions>: Table`
diff --git a/diesel_compile_tests/tests/fail/derive/aliases.stderr b/diesel_compile_tests/tests/fail/derive/aliases.stderr
@@ -1,8 +1,8 @@
-error[E0271]: type mismatch resolving `<id as Column>::Table == table`
+error[E0271]: type mismatch resolving `<id as Column>::Source == table`
   --> tests/fail/derive/aliases.rs:36:22
    |
 36 |     user_alias.field(posts::id);
-   |                ----- ^^^^^^^^^ type mismatch resolving `<id as Column>::Table == table`
+   |                ----- ^^^^^^^^^ type mismatch resolving `<id as Column>::Source == table`
    |                |
    |                required by a bound introduced by this call
    |
diff --git a/diesel_compile_tests/tests/fail/insert_cannot_reference_columns_from_other_table.stderr b/diesel_compile_tests/tests/fail/insert_cannot_reference_columns_from_other_table.stderr
@@ -1,8 +1,8 @@
-error[E0271]: type mismatch resolving `<id as Column>::Table == table`
+error[E0271]: type mismatch resolving `<id as Column>::Source == table`
   --> tests/fail/insert_cannot_reference_columns_from_other_table.rs:22:18
    |
 22 |         .values(&posts::id.eq(1));
-   |          ------  ^^^^^^^^^^^^^^^ type mismatch resolving `<id as Column>::Table == table`
+   |          ------  ^^^^^^^^^^^^^^^ type mismatch resolving `<id as Column>::Source == table`
    |          |
    |          required by a bound introduced by this call
    |
@@ -114,11 +114,11 @@ note: required by a bound in `IncompleteInsertStatement::<T, Op>::values`
    = note: consider using `--verbose` to print the full type name to the console
    = note: this error originates in the macro `table` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0271]: type mismatch resolving `<id as Column>::Table == table`
+error[E0271]: type mismatch resolving `<id as Column>::Source == table`
   --> tests/fail/insert_cannot_reference_columns_from_other_table.rs:25:18
    |
 25 |         .values(&(posts::id.eq(1), users::id.eq(2)));
-   |          ------  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type mismatch resolving `<id as Column>::Table == table`
+   |          ------  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type mismatch resolving `<id as Column>::Source == table`
    |          |
    |          required by a bound introduced by this call
    |
diff --git a/diesel_compile_tests/tests/fail/mysql_on_conflict_tests.stderr b/diesel_compile_tests/tests/fail/mysql_on_conflict_tests.stderr
@@ -69,14 +69,14 @@ error[E0277]: the trait bound `diesel::query_builder::upsert::on_conflict_target
    |          required by a bound introduced by this call
    |
    = help: the following other types implement trait `diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<Table>`:
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(T,)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5, T6)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(T,)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5, T6)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
            and $N others
 note: required by a bound in `diesel::upsert::on_conflict_extension::<impl InsertStatement<T, U, Op, Ret>>::on_conflict`
   --> $DIESEL/src/upsert/on_conflict_extension.rs
@@ -215,14 +215,14 @@ error[E0277]: the trait bound `diesel::query_builder::upsert::on_conflict_target
    |          required by a bound introduced by this call
    |
    = help: the following other types implement trait `diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<Table>`:
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(T,)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5, T6)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(T,)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5, T6)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
            and $N others
 note: required by a bound in `diesel::upsert::on_conflict_extension::<impl InsertStatement<T, U, Op, Ret>>::on_conflict`
   --> $DIESEL/src/upsert/on_conflict_extension.rs
@@ -277,14 +277,14 @@ error[E0277]: the trait bound `diesel::query_builder::upsert::on_conflict_target
    |          required by a bound introduced by this call
    |
    = help: the following other types implement trait `diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<Table>`:
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(T,)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
-             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5, T6)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Table>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(T,)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
+             <diesel::query_builder::upsert::on_conflict_target::ConflictTarget<(_T, T0, T1, T2, T3, T4, T5, T6)> as diesel::query_builder::upsert::on_conflict_target::OnConflictTarget<<_T as Column>::Source>>
            and $N others
 note: required by a bound in `diesel::upsert::on_conflict_extension::<impl InsertStatement<T, U, Op, Ret>>::on_conflict`
   --> $DIESEL/src/upsert/on_conflict_extension.rs
diff --git a/diesel_compile_tests/tests/fail/pg_on_conflict_requires_valid_conflict_target.stderr b/diesel_compile_tests/tests/fail/pg_on_conflict_requires_valid_conflict_target.stderr
@@ -1,8 +1,8 @@
-error[E0271]: type mismatch resolving `<id as Column>::Table == table`
+error[E0271]: type mismatch resolving `<id as Column>::Source == table`
   --> tests/fail/pg_on_conflict_requires_valid_conflict_target.rs:38:22
    |
 38 |         .on_conflict(posts::id);
-   |          ----------- ^^^^^^^^^ type mismatch resolving `<id as Column>::Table == table`
+   |          ----------- ^^^^^^^^^ type mismatch resolving `<id as Column>::Source == table`
    |          |
    |          required by a bound introduced by this call
    |
diff --git a/diesel_compile_tests/tests/fail/pg_specific_expressions_cant_be_used_in_a_sqlite_query.stderr b/diesel_compile_tests/tests/fail/pg_specific_expressions_cant_be_used_in_a_sqlite_query.stderr
@@ -101,7 +101,7 @@ error[E0599]: the method `execute` exists for struct `IncompleteOnConflict<Inser
   ::: $DIESEL/src/upsert/on_conflict_extension.rs
    |
    |   pub struct IncompleteOnConflict<Stmt, Target> {
-   |   --------------------------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: Table`
+   |   --------------------------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: View`
    |
    = note: consider using `--verbose` to print the full type name to the console
    = note: the following trait bounds were not satisfied:
diff --git a/diesel_compile_tests/tests/fail/pg_upsert_do_update_requires_valid_update.stderr b/diesel_compile_tests/tests/fail/pg_upsert_do_update_requires_valid_update.stderr
@@ -13,7 +13,7 @@ error[E0599]: the method `execute` exists for struct `IncompleteDoUpdate<InsertS
   ::: $DIESEL/src/upsert/on_conflict_extension.rs
    |
    |   pub struct IncompleteDoUpdate<Stmt, Target> {
-   |   ------------------------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: Table`
+   |   ------------------------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: View`
    |
    = note: consider using `--verbose` to print the full type name to the console
    = note: the following trait bounds were not satisfied:
@@ -84,11 +84,11 @@ note: required for `posts::columns::title` to implement `AppearsOnTable<users::t
    = note: associated types for the current `impl` cannot be restricted in `where` clauses
    = note: required for `diesel::expression::operators::Eq<users::columns::name, posts::columns::title>` to implement `AsChangeset`
 
-error[E0271]: type mismatch resolving `<title as Column>::Table == table`
+error[E0271]: type mismatch resolving `<title as Column>::Source == table`
   --> tests/fail/pg_upsert_do_update_requires_valid_update.rs:65:10
    |
 65 |         .set(name.eq(excluded(posts::title)));
-   |          ^^^ type mismatch resolving `<title as Column>::Table == table`
+   |          ^^^ type mismatch resolving `<title as Column>::Source == table`
    |
 note: expected this to be `posts::table`
   --> tests/fail/pg_upsert_do_update_requires_valid_update.rs:16:9

Original file line number	Diff line number	Diff line change
@@ -26,7 +26,7 @@ error[E0599]: the method `load` exists for struct `CopyToQuery<table, CopyToOpti
`26`	`26`	`::: $DIESEL/src/pg/query_builder/copy/copy_to.rs`
`27`	`27`	`\|`
`28`	`28`	`\| pub struct CopyToQuery<T, O> {`
`29`		- \| ---------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: Table`
	`29`	+ \| ---------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: View`
`30`	`30`	`\|`
`31`	`31`	`= note: the following trait bounds were not satisfied:`
`32`	`32`	`CopyToQuery<users::table, pg::query_builder::copy::copy_to::CopyToOptions>: Table`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		-error[E0271]: type mismatch resolving `<id as Column>::Table == table`
	`1`	+error[E0271]: type mismatch resolving `<id as Column>::Source == table`
`2`	`2`	`--> tests/fail/derive/aliases.rs:36:22`
`3`	`3`	`\|`
`4`	`4`	`36 \| user_alias.field(posts::id);`
`5`		- \| ----- ^^^^^^^^^ type mismatch resolving `<id as Column>::Table == table`
	`5`	+ \| ----- ^^^^^^^^^ type mismatch resolving `<id as Column>::Source == table`
`6`	`6`	`\| \|`
`7`	`7`	`\| required by a bound introduced by this call`
`8`	`8`	`\|`
Original file line number	Diff line number	Diff line change
@@ -101,7 +101,7 @@ error[E0599]: the method `execute` exists for struct `IncompleteOnConflict<Inser
`101`	`101`	`::: $DIESEL/src/upsert/on_conflict_extension.rs`
`102`	`102`	`\|`
`103`	`103`	`\| pub struct IncompleteOnConflict<Stmt, Target> {`
`104`		- \| --------------------------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: Table`
	`104`	+ \| --------------------------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: View`
`105`	`105`	`\|`
`106`	`106`	= note: consider using `--verbose` to print the full type name to the console
`107`	`107`	`= note: the following trait bounds were not satisfied:`
Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ error[E0599]: the method `execute` exists for struct `IncompleteDoUpdate<InsertS
`13`	`13`	`::: $DIESEL/src/upsert/on_conflict_extension.rs`
`14`	`14`	`\|`
`15`	`15`	`\| pub struct IncompleteDoUpdate<Stmt, Target> {`
`16`		- \| ------------------------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: Table`
	`16`	+ \| ------------------------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: View`
`17`	`17`	`\|`
`18`	`18`	= note: consider using `--verbose` to print the full type name to the console
`19`	`19`	`= note: the following trait bounds were not satisfied:`
@@ -84,11 +84,11 @@ note: required for `posts::columns::title` to implement `AppearsOnTable<users::t
`84`	`84`	= note: associated types for the current `impl` cannot be restricted in `where` clauses
`85`	`85`	= note: required for `diesel::expression::operators::Eq<users::columns::name, posts::columns::title>` to implement `AsChangeset`
`86`	`86`
`87`		-error[E0271]: type mismatch resolving `<title as Column>::Table == table`
	`87`	+error[E0271]: type mismatch resolving `<title as Column>::Source == table`
`88`	`88`	`--> tests/fail/pg_upsert_do_update_requires_valid_update.rs:65:10`
`89`	`89`	`\|`
`90`	`90`	`65 \| .set(name.eq(excluded(posts::title)));`
`91`		- \| ^^^ type mismatch resolving `<title as Column>::Table == table`
	`91`	+ \| ^^^ type mismatch resolving `<title as Column>::Source == table`
`92`	`92`	`\|`
`93`	`93`	note: expected this to be `posts::table`
`94`	`94`	`--> tests/fail/pg_upsert_do_update_requires_valid_update.rs:16:9`