Merge pull request #257 from weiznich/bump/diesel_2_3

Author: weiznich

.github/workflows/ci.yml

@@ -232,11 +232,11 @@ jobs:
       - name: Check formating
         run: cargo +stable fmt --all -- --check
   minimal_rust_version:
-    name: Check Minimal supported rust version (1.84.0)
+    name: Check Minimal supported rust version (1.86.0)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.84.0
+      - uses: dtolnay/rust-toolchain@1.86.0
       - uses: dtolnay/rust-toolchain@nightly
       - uses: taiki-e/install-action@cargo-hack
       - uses: taiki-e/install-action@cargo-minimal-versions
@@ -245,7 +245,7 @@ jobs:
         # has broken min-version dependencies
         # cannot test sqlite yet as that crate
         # as broken min-version dependencies as well
-        run: cargo +1.84.0 minimal-versions check -p diesel-async --features "postgres bb8 deadpool mobc"
+        run: cargo +1.86.0 minimal-versions check -p diesel-async --features "postgres bb8 deadpool mobc"
   all_features_build:
     name: Check all feature combination build
     runs-on: ubuntu-latest

Cargo.toml

@@ -38,13 +38,11 @@ mobc = { version = ">=0.7,<0.10", optional = true }
 scoped-futures = { version = "0.1", features = ["std"] }
 
 [dependencies.diesel]
-version = "~2.2.0"
+version = "~2.3.0"
 default-features = false
 features = [
   "i-implement-a-third-party-backend-and-opt-into-breaking-changes",
 ]
-git = "https://github.com/diesel-rs/diesel"
-branch = "master"
 
 [dev-dependencies]
 tokio = { version = "1.12.0", features = ["rt", "macros", "rt-multi-thread"] }
@@ -53,18 +51,14 @@ chrono = "0.4"
 assert_matches = "1.0.1"
 
 [dev-dependencies.diesel]
-version = "~2.2.0"
+version = "~2.3.0"
 default-features = false
 features = [
   "chrono"
 ]
-git = "https://github.com/diesel-rs/diesel"
-branch = "master"
 
 [dev-dependencies.diesel_migrations]
-version = "2.2.0"
-git = "https://github.com/diesel-rs/diesel"
-branch = "master"
+version = "2.3.0"
 
 [features]
 default = []

examples/postgres/pooled-with-rustls/Cargo.toml

@@ -16,7 +16,5 @@ tokio-postgres-rustls = "0.13.0"
 
 
 [dependencies.diesel]
-version = "2.2.0"
+version = "2.3.0"
 default-features = false
-git = "https://github.com/diesel-rs/diesel"
-branch = "master"

examples/postgres/run-pending-migrations-with-rustls/Cargo.toml

@@ -15,12 +15,8 @@ tokio-postgres = "0.7.7"
 tokio-postgres-rustls = "0.13.0"
 
 [dependencies.diesel]
-version = "2.2.0"
+version = "2.3.0"
 default-features = false
-git = "https://github.com/diesel-rs/diesel"
-branch = "master"
 
 [dependencies.diesel_migrations]
-version = "2.2.0"
-git = "https://github.com/diesel-rs/diesel"
-branch = "master"
+version = "2.3.0"

examples/sync-wrapper/Cargo.toml

@@ -11,16 +11,12 @@ futures-util = "0.3.21"
 tokio = { version = "1.2.0", default-features = false, features = ["macros", "rt-multi-thread"] }
 
 [dependencies.diesel]
-version = "2.2.0"
+version = "2.3.0"
 default-features = false
 features = ["returning_clauses_for_sqlite_3_35"]
-git = "https://github.com/diesel-rs/diesel"
-branch = "master"
 
 [dependencies.diesel_migrations]
-version = "2.2.0"
-git = "https://github.com/diesel-rs/diesel"
-branch = "master"
+version = "2.3.0"
 
 [features]
 default = ["sqlite"]

src/pooled_connection/mod.rs

@@ -306,28 +306,6 @@ where
     }
 }
 
-#[derive(diesel::query_builder::QueryId)]
-struct CheckConnectionQuery;
-
-impl<DB> diesel::query_builder::QueryFragment<DB> for CheckConnectionQuery
-where
-    DB: diesel::backend::Backend,
-{
-    fn walk_ast<'b>(
-        &'b self,
-        mut pass: diesel::query_builder::AstPass<'_, 'b, DB>,
-    ) -> diesel::QueryResult<()> {
-        pass.push_sql("SELECT 1");
-        Ok(())
-    }
-}
-
-impl diesel::query_builder::Query for CheckConnectionQuery {
-    type SqlType = diesel::sql_types::Integer;
-}
-
-impl<C> diesel::query_dsl::RunQueryDsl<C> for CheckConnectionQuery {}
-
 #[doc(hidden)]
 pub trait PoolableConnection: AsyncConnection {
     /// Check if a connection is still valid