Merge pull request #12 from weiznich/fix_ci

Update some database installations on ci

Author: weiznich

.github/workflows/ci.yml

@@ -77,20 +77,19 @@ jobs:
         if: runner.os == 'macOS' && matrix.backend == 'mysql'
         run: |
           brew update
-          brew install mariadb@10.5
-          /usr/local/opt/mariadb@10.5/bin/mysql_install_db
-          /usr/local/opt/mariadb@10.5/bin/mysql.server start
+          brew install mariadb@10.8
+          /usr/local/opt/mariadb@10.8/bin/mysql_install_db
+          /usr/local/opt/mariadb@10.8/bin/mysql.server start
           sleep 3
-          /usr/local/opt/[email protected]/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@localhost/diesel_test" >> $GITHUB_ENV
+          /usr/local/opt/[email protected]/bin/mysql -e "ALTER USER 'runner'@'localhost' IDENTIFIED BY 'diesel';" -urunner
+          /usr/local/opt/[email protected]/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner -pdiesel
+          echo "DATABASE_URL=mysql://runner:diesel@localhost/diesel_test" >> $GITHUB_ENV
 
       - name: Install postgres (Windows)
         if: runner.os == 'Windows' && matrix.backend == 'postgres'
         shell: bash
         run: |
-          choco install postgresql12 --force --params '/Password:root'
-          echo "C:\Program Files\PostgreSQL\12\bin" >> $GITHUB_PATH
-          echo "C:\Program Files\PostgreSQL\12\lib" >> $GITHUB_PATH
+          choco install postgresql14 --force --params '/Password:root'
           echo "DATABASE_URL=postgres://postgres:root@localhost/" >> $GITHUB_ENV
 
       - name: Install mysql (Windows)
@@ -130,7 +129,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.54.0
+          toolchain: stable
           profile: minimal
           components: clippy, rustfmt
           override: true

src/lib.rs

@@ -72,11 +72,11 @@ use futures::{Future, Stream};
 mod mysql;
 #[cfg(feature = "postgres")]
 mod pg;
+#[cfg(any(feature = "deadpool", feature = "bb8", feature = "mobc"))]
+pub mod pooled_connection;
 mod run_query_dsl;
 mod stmt_cache;
 mod transaction_manager;
-#[cfg(any(feature = "deadpool", feature = "bb8", feature = "mobc"))]
-pub mod pooled_connection;
 
 #[cfg(feature = "mysql")]
 pub use self::mysql::AsyncMysqlConnection;

src/pooled_connection/mod.rs

@@ -6,8 +6,8 @@
 //! * [bb8](self::bb8)
 //! * [mobc](self::mobc)
 
-use crate::{AsyncConnection, AsyncConnectionGatWorkaround, SimpleAsyncConnection};
 use crate::TransactionManager;
+use crate::{AsyncConnection, AsyncConnectionGatWorkaround, SimpleAsyncConnection};
 use std::fmt;
 use std::marker::PhantomData;
 use std::ops::DerefMut;
@@ -60,7 +60,7 @@ impl<C> AsyncDieselConnectionManager<C> {
     pub fn new(connection_url: impl Into<String>) -> Self {
         Self {
             p: PhantomData,
-            connection_url: connection_url.into()
+            connection_url: connection_url.into(),
         }
     }
 }
@@ -98,12 +98,13 @@ where
 {
     type Backend = <C::Target as AsyncConnection>::Backend;
 
-    type TransactionManager = PoolTransactionManager<<C::Target as AsyncConnection>::TransactionManager>;
+    type TransactionManager =
+        PoolTransactionManager<<C::Target as AsyncConnection>::TransactionManager>;
 
     async fn establish(_database_url: &str) -> diesel::ConnectionResult<Self> {
-        Err(diesel::result::ConnectionError::BadConnection(String::from(
-            "Cannot directly establish a pooled connection",
-        )))
+        Err(diesel::result::ConnectionError::BadConnection(
+            String::from("Cannot directly establish a pooled connection"),
+        ))
     }
 
     fn load<'conn, 'query, T>(