Skip to content

Commit 8d593e6

Browse files
committed
More CI fixes
1 parent 4ac57ae commit 8d593e6

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

diesel_cli/src/infer_schema_internals/information_schema.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ use diesel::query_builder::{QueryFragment, QueryId};
1313
use diesel::*;
1414

1515
use self::information_schema::{
16-
columns, key_column_usage, referential_constraints, table_constraints, tables,
16+
columns, key_column_usage, table_constraints, tables,
1717
};
18+
#[cfg(feature = "postgres")]
19+
use self::information_schema::referential_constraints;
1820
use super::data_structures::*;
1921
use super::inference;
2022
use super::table_data::TableName;

diesel_compile_tests/tests/ui/mysql_does_not_support_offset_without_limit.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ error[E0277]: the trait bound `diesel::query_builder::limit_offset_clause::Limit
55
| ^^^^^^^^^^ the trait `diesel::query_builder::QueryFragment<diesel::mysql::Mysql>` is not implemented for `diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::NoLimitClause, diesel::query_builder::offset_clause::OffsetClause<diesel::expression::bound::Bound<diesel::sql_types::BigInt, i64>>>`
66
|
77
= help: the following implementations were found:
8+
<diesel::query_builder::limit_offset_clause::LimitOffsetClause<L, O> as diesel::query_builder::QueryFragment<diesel::pg::Pg>>
9+
<diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::LimitClause<L>, diesel::query_builder::offset_clause::NoOffsetClause> as diesel::query_builder::QueryFragment<diesel::mysql::Mysql>>
810
<diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::LimitClause<L>, diesel::query_builder::offset_clause::NoOffsetClause> as diesel::query_builder::QueryFragment<diesel::sqlite::Sqlite>>
911
<diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::LimitClause<L>, diesel::query_builder::offset_clause::OffsetClause<O>> as diesel::query_builder::QueryFragment<diesel::mysql::Mysql>>
10-
<diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::LimitClause<L>, diesel::query_builder::offset_clause::OffsetClause<O>> as diesel::query_builder::QueryFragment<diesel::sqlite::Sqlite>>
11-
<diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::NoLimitClause, diesel::query_builder::offset_clause::OffsetClause<O>> as diesel::query_builder::QueryFragment<diesel::sqlite::Sqlite>>
1212
and 4 others
1313
= note: required because of the requirements on the impl of `diesel::query_builder::QueryFragment<diesel::mysql::Mysql>` for `diesel::query_builder::SelectStatement<users::table, diesel::query_builder::select_clause::DefaultSelectClause, diesel::query_builder::distinct_clause::NoDistinctClause, diesel::query_builder::where_clause::NoWhereClause, diesel::query_builder::order_clause::NoOrderClause, diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::NoLimitClause, diesel::query_builder::offset_clause::OffsetClause<diesel::expression::bound::Bound<diesel::sql_types::BigInt, i64>>>>`
1414
= note: required because of the requirements on the impl of `diesel::query_dsl::LoadQuery<diesel::MysqlConnection, (i32, std::string::String)>` for `diesel::query_builder::SelectStatement<users::table, diesel::query_builder::select_clause::DefaultSelectClause, diesel::query_builder::distinct_clause::NoDistinctClause, diesel::query_builder::where_clause::NoWhereClause, diesel::query_builder::order_clause::NoOrderClause, diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::NoLimitClause, diesel::query_builder::offset_clause::OffsetClause<diesel::expression::bound::Bound<diesel::sql_types::BigInt, i64>>>>`
@@ -21,9 +21,9 @@ error[E0277]: the trait bound `diesel::query_builder::limit_offset_clause::Boxed
2121
|
2222
= help: the following implementations were found:
2323
<diesel::query_builder::limit_offset_clause::BoxedLimitOffsetClause<'a, diesel::mysql::Mysql> as std::convert::From<diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::LimitClause<L>, diesel::query_builder::offset_clause::NoOffsetClause>>>
24+
<diesel::query_builder::limit_offset_clause::BoxedLimitOffsetClause<'a, diesel::mysql::Mysql> as std::convert::From<diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::LimitClause<L>, diesel::query_builder::offset_clause::OffsetClause<O>>>>
25+
<diesel::query_builder::limit_offset_clause::BoxedLimitOffsetClause<'a, diesel::mysql::Mysql> as std::convert::From<diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::NoLimitClause, diesel::query_builder::offset_clause::NoOffsetClause>>>
2426
<diesel::query_builder::limit_offset_clause::BoxedLimitOffsetClause<'a, diesel::pg::Pg> as std::convert::From<diesel::query_builder::limit_offset_clause::LimitOffsetClause<L, O>>>
25-
<diesel::query_builder::limit_offset_clause::BoxedLimitOffsetClause<'a, diesel::sqlite::Sqlite> as std::convert::From<diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::LimitClause<L>, diesel::query_builder::offset_clause::NoOffsetClause>>>
26-
<diesel::query_builder::limit_offset_clause::BoxedLimitOffsetClause<'a, diesel::sqlite::Sqlite> as std::convert::From<diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::NoLimitClause, diesel::query_builder::offset_clause::NoOffsetClause>>>
2727
and 4 others
2828
= note: required because of the requirements on the impl of `std::convert::Into<diesel::query_builder::limit_offset_clause::BoxedLimitOffsetClause<'_, diesel::mysql::Mysql>>` for `diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::NoLimitClause, diesel::query_builder::offset_clause::OffsetClause<diesel::expression::bound::Bound<diesel::sql_types::BigInt, i64>>>`
2929
= note: required because of the requirements on the impl of `diesel::query_dsl::boxed_dsl::BoxedDsl<'_, diesel::mysql::Mysql>` for `diesel::query_builder::SelectStatement<users::table, diesel::query_builder::select_clause::DefaultSelectClause, diesel::query_builder::distinct_clause::NoDistinctClause, diesel::query_builder::where_clause::NoWhereClause, diesel::query_builder::order_clause::NoOrderClause, diesel::query_builder::limit_offset_clause::LimitOffsetClause<diesel::query_builder::limit_clause::NoLimitClause, diesel::query_builder::offset_clause::OffsetClause<diesel::expression::bound::Bound<diesel::sql_types::BigInt, i64>>>>`

0 commit comments

Comments
 (0)