diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 193fb6c..714efe8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: matrix: rust: ["stable", "beta", "nightly"] backend: ["postgres", "mysql", "sqlite"] - os: [ubuntu-latest, macos-latest, macos-14, windows-2019] + os: [ubuntu-latest, macos-13, macos-14, windows-2019] runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -100,10 +100,10 @@ jobs: echo "DATABASE_URL=/tmp/test.db" >> $GITHUB_ENV - name: Install postgres (MacOS) - if: matrix.os == 'macos-latest' && 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 @@ -111,11 +111,12 @@ jobs: - name: Install postgres (MacOS M1) if: matrix.os == 'macos-14' && matrix.backend == 'postgres' run: | - brew install postgresql + 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: | @@ -123,7 +124,7 @@ jobs: echo "DATABASE_URL=/tmp/test.db" >> $GITHUB_ENV - name: Install mysql (MacOS) - if: matrix.os == 'macos-latest' && matrix.backend == 'mysql' + if: matrix.os == 'macos-13' && matrix.backend == 'mysql' run: | brew install mariadb@11.3 /usr/local/opt/mariadb@11.3/bin/mysql_install_db diff --git a/examples/sync-wrapper/src/main.rs b/examples/sync-wrapper/src/main.rs index dc83486..d7d119b 100644 --- a/examples/sync-wrapper/src/main.rs +++ b/examples/sync-wrapper/src/main.rs @@ -14,6 +14,7 @@ table! { } } +#[allow(dead_code)] #[derive(Debug, Queryable, Selectable)] #[diesel(table_name = users)] struct User { diff --git a/src/sync_connection_wrapper.rs b/src/sync_connection_wrapper.rs index ba40086..57f8e7d 100644 --- a/src/sync_connection_wrapper.rs +++ b/src/sync_connection_wrapper.rs @@ -134,10 +134,7 @@ where .boxed() } - fn execute_returning_count<'conn, 'query, T>( - &'conn mut self, - source: T, - ) -> Self::ExecuteFuture<'conn, 'query> + fn execute_returning_count<'query, T>(&mut self, source: T) -> Self::ExecuteFuture<'_, 'query> where T: QueryFragment + QueryId, {