Merge pull request #152 from weiznich/bump/diesel_2_2

Bump diesel to 2.2

Author: weiznich

.github/workflows/ci.yml

@@ -126,12 +126,12 @@ jobs:
       - name: Install mysql (MacOS)
         if: matrix.os == 'macos-13' && matrix.backend == 'mysql'
         run: |
-          brew install mariadb@11.3
-          /usr/local/opt/mariadb@11.3/bin/mysql_install_db
-          /usr/local/opt/mariadb@11.3/bin/mysql.server start
+          brew install mariadb@11.2
+          /usr/local/opt/mariadb@11.2/bin/mysql_install_db
+          /usr/local/opt/mariadb@11.2/bin/mysql.server start
           sleep 3
-          /usr/local/opt/mariadb@11.3/bin/mysqladmin -u runner password diesel
-          /usr/local/opt/mariadb@11.3/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
+          /usr/local/opt/mariadb@11.2/bin/mysqladmin -u runner password diesel
+          /usr/local/opt/mariadb@11.2/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
           echo "DATABASE_URL=mysql://runner:diesel@localhost/diesel_test" >> $GITHUB_ENV
 
       - name: Install mysql (MacOS M1)

Cargo.toml

@@ -13,7 +13,7 @@ description = "An async extension for Diesel the safe, extensible ORM and Query
 rust-version = "1.78.0"
 
 [dependencies]
-diesel = { version = "~2.1.1", default-features = false, features = [
+diesel = { version = "~2.2.0", default-features = false, features = [
         "i-implement-a-third-party-backend-and-opt-into-breaking-changes",
 ] }
 async-trait = "0.1.66"
@@ -47,8 +47,8 @@ scoped-futures = { version = "0.1", features = ["std"] }
 tokio = { version = "1.12.0", features = ["rt", "macros", "rt-multi-thread"] }
 cfg-if = "1"
 chrono = "0.4"
-diesel = { version = "2.1.0", default-features = false, features = ["chrono"] }
-diesel_migrations = "2.1.0"
+diesel = { version = "2.2.0", default-features = false, features = ["chrono"] }
+diesel_migrations = "2.2.0"
 
 [features]
 default = []
@@ -94,5 +94,3 @@ members = [
         "examples/sync-wrapper",
 ]
 
-[patch.crates-io]
-diesel = { git = "http://github.com/diesel-rs/diesel", "rev" = "f2eb9b2"}

src/async_connection_wrapper.rs

@@ -289,7 +289,7 @@ mod implementation {
         C: crate::AsyncConnection<Backend = <Self as diesel::Connection>::Backend>
             + crate::pooled_connection::PoolableConnection
             + 'static,
-        diesel::dsl::BareSelect<diesel::dsl::AsExprOf<i32, diesel::sql_types::Integer>>:
+        diesel::dsl::select<diesel::dsl::AsExprOf<i32, diesel::sql_types::Integer>>:
             crate::methods::ExecuteDsl<C>,
         diesel::query_builder::SqlQuery: crate::methods::ExecuteDsl<C>,
     {

src/pooled_connection/bb8.rs

@@ -63,7 +63,7 @@ pub type RunError = bb8::RunError<super::PoolError>;
 impl<C> ManageConnection for AsyncDieselConnectionManager<C>
 where
     C: PoolableConnection + 'static,
-    diesel::dsl::BareSelect<diesel::dsl::AsExprOf<i32, diesel::sql_types::Integer>>:
+    diesel::dsl::select<diesel::dsl::AsExprOf<i32, diesel::sql_types::Integer>>:
         crate::methods::ExecuteDsl<C>,
     diesel::query_builder::SqlQuery: QueryFragment<C::Backend>,
 {

src/pooled_connection/deadpool.rs

@@ -68,7 +68,7 @@ pub type HookError = deadpool::managed::HookError<super::PoolError>;
 impl<C> Manager for AsyncDieselConnectionManager<C>
 where
     C: PoolableConnection + Send + 'static,
-    diesel::dsl::BareSelect<diesel::dsl::AsExprOf<i32, diesel::sql_types::Integer>>:
+    diesel::dsl::select<diesel::dsl::AsExprOf<i32, diesel::sql_types::Integer>>:
         crate::methods::ExecuteDsl<C>,
     diesel::query_builder::SqlQuery: QueryFragment<C::Backend>,
 {

src/pooled_connection/mobc.rs

@@ -63,7 +63,7 @@ pub type Builder<C> = mobc::Builder<AsyncDieselConnectionManager<C>>;
 impl<C> Manager for AsyncDieselConnectionManager<C>
 where
     C: PoolableConnection + 'static,
-    diesel::dsl::BareSelect<diesel::dsl::AsExprOf<i32, diesel::sql_types::Integer>>:
+    diesel::dsl::select<diesel::dsl::AsExprOf<i32, diesel::sql_types::Integer>>:
         crate::methods::ExecuteDsl<C>,
     diesel::query_builder::SqlQuery: QueryFragment<C::Backend>,
 {

src/pooled_connection/mod.rs

@@ -316,7 +316,7 @@ pub trait PoolableConnection: AsyncConnection {
     async fn ping(&mut self, config: &RecyclingMethod<Self>) -> diesel::QueryResult<()>
     where
         for<'a> Self: 'a,
-        diesel::dsl::BareSelect<diesel::dsl::AsExprOf<i32, diesel::sql_types::Integer>>:
+        diesel::dsl::select<diesel::dsl::AsExprOf<i32, diesel::sql_types::Integer>>:
             crate::methods::ExecuteDsl<Self>,
         diesel::query_builder::SqlQuery: crate::methods::ExecuteDsl<Self>,
     {