Skip to content

Commit 92d81f2

Browse files
committed
[fix] fixes some compilertests due to renaming of an associated type.
1 parent f1ffc68 commit 92d81f2

8 files changed

+54
-54
lines changed

diesel_compile_tests/tests/fail/copy_can_only_use_options_with_raw_variant.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ error[E0599]: the method `load` exists for struct `CopyToQuery<table, CopyToOpti
2626
::: $DIESEL/src/pg/query_builder/copy/copy_to.rs
2727
|
2828
| pub struct CopyToQuery<T, O> {
29-
| ---------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: Table`
29+
| ---------------------------- doesn't satisfy `_: RunQueryDsl<_>` or `_: View`
3030
|
3131
= note: the following trait bounds were not satisfied:
32-
`CopyToQuery<users::table, pg::query_builder::copy::copy_to::CopyToOptions>: Table`
32+
`CopyToQuery<users::table, pg::query_builder::copy::copy_to::CopyToOptions>: View`
3333
which is required by `CopyToQuery<users::table, pg::query_builder::copy::copy_to::CopyToOptions>: diesel::RunQueryDsl<_>`
34-
`&CopyToQuery<users::table, pg::query_builder::copy::copy_to::CopyToOptions>: Table`
34+
`&CopyToQuery<users::table, pg::query_builder::copy::copy_to::CopyToOptions>: View`
3535
which is required by `&CopyToQuery<users::table, pg::query_builder::copy::copy_to::CopyToOptions>: diesel::RunQueryDsl<_>`
36-
`&mut CopyToQuery<users::table, pg::query_builder::copy::copy_to::CopyToOptions>: Table`
36+
`&mut CopyToQuery<users::table, pg::query_builder::copy::copy_to::CopyToOptions>: View`
3737
which is required by `&mut CopyToQuery<users::table, pg::query_builder::copy::copy_to::CopyToOptions>: diesel::RunQueryDsl<_>`

diesel_compile_tests/tests/fail/derive/aliases.stderr

+8-8
Original file line numberDiff line numberDiff 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`
22
--> tests/fail/derive/aliases.rs:36:22
33
|
44
36 | user_alias.field(posts::id);
5-
| ----- ^^^^^^^^^ type mismatch resolving `<id as Column>::Table == table`
5+
| ----- ^^^^^^^^^ type mismatch resolving `<id as Column>::Source == table`
66
| |
77
| required by a bound introduced by this call
88
|
@@ -39,8 +39,8 @@ note: required by a bound in `Alias::<S>::field`
3939
| pub fn field<F>(&self, field: F) -> AliasedField<S, F>
4040
| ----- required by a bound in this associated function
4141
| where
42-
| F: Column<Table = S::Target>,
43-
| ^^^^^^^^^^^^^^^^^ required by this bound in `Alias::<S>::field`
42+
| F: Column<Source = S::Target>,
43+
| ^^^^^^^^^^^^^^^^^^ required by this bound in `Alias::<S>::field`
4444
= note: this error originates in the macro `table` (in Nightly builds, run with -Z macro-backtrace for more info)
4545

4646
error[E0271]: type mismatch resolving `<Once as Plus<Once>>::Output == Once`
@@ -102,9 +102,9 @@ error[E0599]: the method `select` exists for struct `SelectStatement<FromClause<
102102
|
103103
= note: consider using `--verbose` to print the full type name to the console
104104
= note: the following trait bounds were not satisfied:
105-
`&SelectStatement<FromClause<JoinOn<query_source::joins::Join<JoinOn<query_source::joins::Join<users::table, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>>>: Table`
105+
`&SelectStatement<FromClause<JoinOn<query_source::joins::Join<JoinOn<query_source::joins::Join<users::table, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>>>: View`
106106
which is required by `&SelectStatement<FromClause<JoinOn<query_source::joins::Join<JoinOn<query_source::joins::Join<users::table, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>>>: diesel::QueryDsl`
107-
`&mut SelectStatement<FromClause<JoinOn<query_source::joins::Join<JoinOn<query_source::joins::Join<users::table, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>>>: Table`
107+
`&mut SelectStatement<FromClause<JoinOn<query_source::joins::Join<JoinOn<query_source::joins::Join<users::table, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>>>: View`
108108
which is required by `&mut SelectStatement<FromClause<JoinOn<query_source::joins::Join<JoinOn<query_source::joins::Join<users::table, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>, Alias<posts2>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<NullableExpression<AliasedField<posts2, posts::columns::author>>, NullableExpression<users::columns::id>>>>>>: diesel::QueryDsl`
109109

110110
error[E0277]: Cannot select `users::columns::id` from `Alias<users2>`
@@ -274,7 +274,7 @@ error[E0599]: the method `select` exists for struct `SelectStatement<FromClause<
274274
|
275275
= note: consider using `--verbose` to print the full type name to the console
276276
= note: the following trait bounds were not satisfied:
277-
`&SelectStatement<FromClause<JoinOn<query_source::joins::Join<Alias<posts2>, Alias<posts3>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<AliasedField<posts2, posts::columns::author>, AliasedField<posts3, posts::columns::author>>>>>>: Table`
277+
`&SelectStatement<FromClause<JoinOn<query_source::joins::Join<Alias<posts2>, Alias<posts3>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<AliasedField<posts2, posts::columns::author>, AliasedField<posts3, posts::columns::author>>>>>>: View`
278278
which is required by `&SelectStatement<FromClause<JoinOn<query_source::joins::Join<Alias<posts2>, Alias<posts3>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<AliasedField<posts2, posts::columns::author>, AliasedField<posts3, posts::columns::author>>>>>>: diesel::QueryDsl`
279-
`&mut SelectStatement<FromClause<JoinOn<query_source::joins::Join<Alias<posts2>, Alias<posts3>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<AliasedField<posts2, posts::columns::author>, AliasedField<posts3, posts::columns::author>>>>>>: Table`
279+
`&mut SelectStatement<FromClause<JoinOn<query_source::joins::Join<Alias<posts2>, Alias<posts3>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<AliasedField<posts2, posts::columns::author>, AliasedField<posts3, posts::columns::author>>>>>>: View`
280280
which is required by `&mut SelectStatement<FromClause<JoinOn<query_source::joins::Join<Alias<posts2>, Alias<posts3>, Inner>, diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<AliasedField<posts2, posts::columns::author>, AliasedField<posts3, posts::columns::author>>>>>>: diesel::QueryDsl`

diesel_compile_tests/tests/fail/insert_cannot_reference_columns_from_other_table.stderr

+4-4
Original file line numberDiff line numberDiff 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`
22
--> tests/fail/insert_cannot_reference_columns_from_other_table.rs:22:18
33
|
44
22 | .values(&posts::id.eq(1));
5-
| ------ ^^^^^^^^^^^^^^^ type mismatch resolving `<id as Column>::Table == table`
5+
| ------ ^^^^^^^^^^^^^^^ type mismatch resolving `<id as Column>::Source == table`
66
| |
77
| required by a bound introduced by this call
88
|
@@ -114,11 +114,11 @@ note: required by a bound in `IncompleteInsertStatement::<T, Op>::values`
114114
= note: consider using `--verbose` to print the full type name to the console
115115
= note: this error originates in the macro `table` (in Nightly builds, run with -Z macro-backtrace for more info)
116116

117-
error[E0271]: type mismatch resolving `<id as Column>::Table == table`
117+
error[E0271]: type mismatch resolving `<id as Column>::Source == table`
118118
--> tests/fail/insert_cannot_reference_columns_from_other_table.rs:25:18
119119
|
120120
25 | .values(&(posts::id.eq(1), users::id.eq(2)));
121-
| ------ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type mismatch resolving `<id as Column>::Table == table`
121+
| ------ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type mismatch resolving `<id as Column>::Source == table`
122122
| |
123123
| required by a bound introduced by this call
124124
|

0 commit comments

Comments
 (0)