.github/workflows/ci.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+      - 0.3.x
+      - 0.4.x
       - 0.2.x
 
 name: CI Tests
@@ -21,19 +23,16 @@ jobs:
       fail-fast: false
       matrix:
         rust: ["stable", "beta", "nightly"]
-        backend: ["postgres", "mysql"]
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        backend: ["postgres", "mysql", "sqlite"]
+        os: [ubuntu-latest, macos-13, macos-14, windows-2019]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Cache cargo registry
-        uses: actions/cache@v2
+        uses: Swatinem/rust-cache@v2
         with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
           key: ${{ runner.os }}-${{ matrix.backend }}-cargo-${{ hashFiles('**/Cargo.toml') }}
 
       - name: Set environment variables
@@ -44,9 +43,19 @@ jobs:
 
       - name: Set environment variables
         shell: bash
-        if: matrix.rust == 'nightly'
+        if: matrix.backend == 'postgres' && matrix.os == 'windows-2019'
         run: |
-          echo "RUSTFLAGS=--cap-lints=warn" >> $GITHUB_ENV
+          echo "AWS_LC_SYS_NO_ASM=1"
+
+      - name: Set environment variables
+        shell: bash
+        if: matrix.rust != 'nightly'
+        run: |
+          echo "RUSTFLAGS=-D warnings" >> $GITHUB_ENV
+          echo "RUSTDOCFLAGS=-D warnings" >> $GITHUB_ENV
+
+      - uses: ilammy/setup-nasm@v1
+        if: matrix.backend == 'postgres' && matrix.os == 'windows-2019'
 
       - name: Install postgres (Linux)
         if: runner.os == 'Linux' && matrix.backend == 'postgres'
@@ -66,24 +75,87 @@ jobs:
           mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'root'@'localhost';" -uroot -proot
           echo "DATABASE_URL=mysql://root:root@localhost/diesel_test" >> $GITHUB_ENV
 
+      - name: Install sqlite (Linux)
+        if: runner.os == 'Linux' && matrix.backend == 'sqlite'
+        run: |
+          curl -fsS --retry 3 -o sqlite-autoconf-3400100.tar.gz https://www.sqlite.org/2022/sqlite-autoconf-3400100.tar.gz
+          tar zxf sqlite-autoconf-3400100.tar.gz
+          cd sqlite-autoconf-3400100
+          CFLAGS="$CFLAGS -O2 -fno-strict-aliasing \
+              -DSQLITE_DEFAULT_FOREIGN_KEYS=1 \
+              -DSQLITE_SECURE_DELETE \
+              -DSQLITE_ENABLE_COLUMN_METADATA \
+              -DSQLITE_ENABLE_FTS3_PARENTHESIS \
+              -DSQLITE_ENABLE_RTREE=1 \
+              -DSQLITE_SOUNDEX=1 \
+              -DSQLITE_ENABLE_UNLOCK_NOTIFY \
+              -DSQLITE_OMIT_LOOKASIDE=1 \
+              -DSQLITE_ENABLE_DBSTAT_VTAB \
+              -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
+              -DSQLITE_ENABLE_LOAD_EXTENSION \
+              -DSQLITE_ENABLE_JSON1 \
+              -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
+              -DSQLITE_THREADSAFE=1 \
+              -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
+              -DSQLITE_MAX_SCHEMA_RETRY=25 \
+              -DSQLITE_ENABLE_PREUPDATE_HOOK \
+              -DSQLITE_ENABLE_SESSION \
+              -DSQLITE_ENABLE_STMTVTAB \
+              -DSQLITE_MAX_VARIABLE_NUMBER=250000" \
+          ./configure --prefix=/usr \
+              --enable-threadsafe \
+              --enable-dynamic-extensions \
+              --libdir=/usr/lib/x86_64-linux-gnu \
+              --libexecdir=/usr/lib/x86_64-linux-gnu/sqlite3
+          sudo make
+          sudo make install
+          echo "DATABASE_URL=/tmp/test.db" >> $GITHUB_ENV
+
       - name: Install postgres (MacOS)
-        if: runner.os == 'macOS' && matrix.backend == 'postgres'
+        if: matrix.os == 'macos-13' && matrix.backend == 'postgres'
         run: |
-          initdb -D /usr/local/var/postgres
-          pg_ctl -D /usr/local/var/postgres start
+          brew install postgresql@14
+          brew services start postgresql@14
           sleep 3
           createuser -s postgres
           echo "DATABASE_URL=postgres://postgres@localhost/" >> $GITHUB_ENV
 
+      - name: Install postgres (MacOS M1)
+        if: matrix.os == 'macos-14' && matrix.backend == 'postgres'
+        run: |
+          brew install postgresql@14
+          brew services start postgresql@14
+          sleep 3
+          createuser -s postgres
+          echo "DATABASE_URL=postgres://postgres@localhost/" >> $GITHUB_ENV
+
+      - name: Install sqlite (MacOS)
+        if: runner.os == 'macOS' && matrix.backend == 'sqlite'
+        run: |
+          brew install sqlite
+          echo "DATABASE_URL=/tmp/test.db" >> $GITHUB_ENV
+
       - name: Install mysql (MacOS)
-        if: runner.os == 'macOS' && matrix.backend == 'mysql'
+        if: matrix.os == 'macos-13' && matrix.backend == 'mysql'
         run: |
-          brew install --overwrite mariadb@10.8
-          /usr/local/opt/mariadb@10.8/bin/mysql_install_db
-          /usr/local/opt/mariadb@10.8/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@10.8/bin/mysql -e "ALTER USER 'runner'@'localhost' IDENTIFIED BY 'diesel';" -urunner
-          /usr/local/opt/mariadb@10.8/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner -pdiesel
+          /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)
+        if: matrix.os == 'macos-14' && matrix.backend == 'mysql'
+        run: |
+          brew install mariadb@11.2
+          ls /opt/homebrew/opt/mariadb@11.2
+          /opt/homebrew/opt/mariadb@11.2/bin/mysql_install_db
+          /opt/homebrew/opt/mariadb@11.2/bin/mysql.server start
+          sleep 3
+          /opt/homebrew/opt/mariadb@11.2/bin/mysqladmin -u runner password diesel
+          /opt/homebrew/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 postgres (Windows)
@@ -106,6 +178,22 @@ jobs:
         run: |
           echo "DATABASE_URL=mysql://root@localhost/diesel_test" >> $GITHUB_ENV
 
+      - name: Install sqlite (Windows)
+        if: runner.os == 'Windows' && matrix.backend == 'sqlite'
+        shell: cmd
+        run: |
+          choco install sqlite
+          cd /D C:\ProgramData\chocolatey\lib\SQLite\tools
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          lib /machine:x64 /def:sqlite3.def /out:sqlite3.lib
+      - name: Set variables for sqlite (Windows)
+        if: runner.os == 'Windows' && matrix.backend == 'sqlite'
+        shell: bash
+        run: |
+          echo "C:\ProgramData\chocolatey\lib\SQLite\tools" >> $GITHUB_PATH
+          echo "SQLITE3_LIB_DIR=C:\ProgramData\chocolatey\lib\SQLite\tools" >> $GITHUB_ENV
+          echo "DATABASE_URL=C:\test.db" >> $GITHUB_ENV
+
       - name: Install rust toolchain
         uses: dtolnay/rust-toolchain@master
         with:
@@ -115,24 +203,29 @@ jobs:
 
       - name: Test diesel_async
         run: cargo +${{ matrix.rust }} test --manifest-path Cargo.toml --no-default-features --features "${{ matrix.backend }} deadpool bb8 mobc"
-      - name: Run examples
+
+      - name: Run examples (Postgres)
         if: matrix.backend == 'postgres'
-        run: cargo +${{ matrix.rust }} check --manifest-path examples/postgres/pooled-with-rustls/Cargo.toml
+        run: |
+          cargo +${{ matrix.rust }} check --manifest-path examples/postgres/pooled-with-rustls/Cargo.toml
+          cargo +${{ matrix.rust }} check --manifest-path examples/postgres/run-pending-migrations-with-rustls/Cargo.toml
+
+      - name: Run examples (Sqlite)
+        if: matrix.backend == 'sqlite'
+        run: |
+          cargo +${{ matrix.rust }} check --manifest-path examples/sync-wrapper/Cargo.toml
 
   rustfmt_and_clippy:
     name: Check rustfmt style && run clippy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy, rustfmt
       - name: Cache cargo registry
-        uses: actions/cache@v2
+        uses: Swatinem/rust-cache@v2
         with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
           key: clippy-cargo-${{ hashFiles('**/Cargo.toml') }}
 
       - name: Remove potential newer clippy.toml from dependencies
@@ -142,20 +235,22 @@ jobs:
           find ~/.cargo/registry -iname "*clippy.toml" -delete
 
       - name: Run clippy
-        run: cargo +stable clippy --all
+        run: cargo +stable clippy --all --all-features
 
       - name: Check formating
         run: cargo +stable fmt --all -- --check
   minimal_rust_version:
-    name: Check Minimal supported rust version (1.65.0)
+    name: Check Minimal supported rust version (1.78.0)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.65.0
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@1.78.0
       - uses: dtolnay/rust-toolchain@nightly
       - uses: taiki-e/install-action@cargo-hack
       - uses: taiki-e/install-action@cargo-minimal-versions
       - name: Check diesel-async
         # cannot test mysql yet as that crate
         # has broken min-version dependencies
-        run: cargo +stable minimal-versions check -p diesel-async --features "postgres bb8 deadpool mobc"
+        # cannot test sqlite yet as that crate
+        # as broken min-version dependencies as well
+        run: cargo +1.78.0 minimal-versions check -p diesel-async --features "postgres bb8 deadpool mobc"

CHANGELOG.md

@@ -4,6 +4,21 @@ All user visible changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/), as described
 for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/text/1105-api-evolution.md)
 
+## [Unreleased]
+
+## [0.5.0] - 2024-07-19
+
+* Added type `diesel_async::pooled_connection::mobc::PooledConnection`
+* MySQL/MariaDB now use `CLIENT_FOUND_ROWS` capability to allow consistent behaviour with PostgreSQL regarding return value of UPDATe commands.
+* The minimal supported rust version is now 1.78.0
+* Add a `SyncConnectionWrapper` type that turns a sync connection into an async one. This enables SQLite support for diesel-async
+* Add support for `diesel::connection::Instrumentation` to support logging and other instrumentation for any of the provided connection impls.
+* Bump minimal supported mysql_async version to 0.34
+
+## [0.4.1] - 2023-09-01
+
+* Fixed feature flags for docs.rs
+
 ## [0.4.0] - 2023-09-01
 
 * Add a `AsyncConnectionWrapper` type to turn a `diesel_async::AsyncConnection` into a `diesel::Connection`. This might be used to execute migrations via `diesel_migrations`. 
@@ -48,7 +63,6 @@ in the pool should be checked if they are still valid
 
 * Fix prepared statement leak for the mysql backend implementation
 
-
 ## 0.1.0 - 2022-09-27
 
 * Initial release
@@ -60,3 +74,7 @@ in the pool should be checked if they are still valid
 [0.3.0]: https://github.com/weiznich/diesel_async/compare/v0.2.0...v0.3.0
 [0.3.1]: https://github.com/weiznich/diesel_async/compare/v0.3.0...v0.3.1
 [0.3.2]: https://github.com/weiznich/diesel_async/compare/v0.3.1...v0.3.2
+[0.4.0]: https://github.com/weiznich/diesel_async/compare/v0.3.2...v0.4.0
+[0.4.1]: https://github.com/weiznich/diesel_async/compare/v0.4.0...v0.4.1
+[0.5.0]: https://github.com/weiznich/diesel_async/compare/v0.4.0...v0.5.0
+[Unreleased]: https://github.com/weiznich/diesel_async/compare/v0.5.0...main

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "diesel-async"
-version = "0.4.0"
+version = "0.5.0"
 authors = ["Georg Semmler <github@weiznich.de>"]
 edition = "2021"
 autotests = false
@@ -10,51 +10,86 @@ repository = "https://github.com/weiznich/diesel_async"
 keywords = ["orm", "database", "sql", "async"]
 categories = ["database"]
 description = "An async extension for Diesel the safe, extensible ORM and Query Builder"
-rust-version = "1.65.0"
+rust-version = "1.78.0"
 
 [dependencies]
-diesel = { version = "~2.1.1", default-features = false, features = ["i-implement-a-third-party-backend-and-opt-into-breaking-changes"]}
+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"
-futures-channel = { version = "0.3.17", default-features = false, features = ["std", "sink"], optional = true }
-futures-util = { version = "0.3.17", default-features = false, features = ["std", "sink"] }
-tokio-postgres = { version = "0.7.10", optional = true}
-tokio = { version = "1.26", optional = true}
-mysql_async = { version = ">=0.30.0,<0.33", optional = true}
-mysql_common = {version = ">=0.29.0,<0.31.0", optional = true}
+futures-channel = { version = "0.3.17", default-features = false, features = [
+        "std",
+        "sink",
+], optional = true }
+futures-util = { version = "0.3.17", default-features = false, features = [
+        "std",
+        "sink",
+] }
+tokio-postgres = { version = "0.7.10", optional = true }
+tokio = { version = "1.26", optional = true }
+mysql_async = { version = "0.34", optional = true, default-features = false, features = [
+        "minimal-rust",
+] }
+mysql_common = { version = "0.32", optional = true, default-features = false }
 
-bb8 = {version = "0.8", optional = true}
-deadpool = {version = "0.9", optional = true}
-mobc = {version = ">=0.7,<0.9", optional = true}
-scoped-futures = {version = "0.1", features = ["std"]}
+bb8 = { version = "0.8", optional = true }
+deadpool = { version = "0.12", optional = true, default-features = false, features = [
+        "managed",
+] }
+mobc = { version = ">=0.7,<0.10", optional = true }
+scoped-futures = { version = "0.1", features = ["std"] }
 
 [dev-dependencies]
-tokio = {version = "1.12.0", features = ["rt", "macros", "rt-multi-thread"]}
+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"
+assert_matches = "1.0.1"
 
 [features]
 default = []
-mysql = ["diesel/mysql_backend", "mysql_async", "mysql_common", "futures-channel", "tokio"]
+mysql = [
+        "diesel/mysql_backend",
+        "mysql_async",
+        "mysql_common",
+        "futures-channel",
+        "tokio",
+]
 postgres = ["diesel/postgres_backend", "tokio-postgres", "tokio", "tokio/rt"]
-async-connection-wrapper = []
+sqlite = ["diesel/sqlite", "sync-connection-wrapper"]
+sync-connection-wrapper = ["tokio/rt"]
+async-connection-wrapper = ["tokio/net"]
 r2d2 = ["diesel/r2d2"]
+bb8 = ["dep:bb8"]
+mobc = ["dep:mobc"]
+deadpool = ["dep:deadpool"]
 
 [[test]]
 name = "integration_tests"
 path = "tests/lib.rs"
 harness = true
 
 [package.metadata.docs.rs]
-features = ["postgres", "mysql", "deadpool", "bb8", "mobc"]
+features = [
+        "postgres",
+        "mysql",
+        "sqlite",
+        "deadpool",
+        "bb8",
+        "mobc",
+        "async-connection-wrapper",
+        "sync-connection-wrapper",
+        "r2d2",
+]
 no-default-features = true
-rustc-args = ["--cfg", "doc_cfg"]
-rustdoc-args = ["--cfg", "doc_cfg"]
+rustc-args = ["--cfg", "docsrs"]
+rustdoc-args = ["--cfg", "docsrs"]
 
 [workspace]
 members = [
         ".",
-        "examples/postgres/pooled-with-rustls"
+        "examples/postgres/pooled-with-rustls",
+        "examples/postgres/run-pending-migrations-with-rustls",
+        "examples/sync-wrapper",
 ]
-