Update to sqlx 0.4

Author: caelunshun

Cargo.toml

@@ -14,16 +14,17 @@ categories = ["web-programming::http-server", "web-programming", "database"]
 [package.metadata.docs.rs]
 features = ["pg", "sqlite"]
 
-[features]
-default = []
+[features] 
+default = ["native-tls"]
 sqlite = ["sqlx/sqlite"]
 pg = ["sqlx/postgres", "sqlx/json"]
+native-tls = ["sqlx/runtime-async-std-native-tls"]
+rustls = ["sqlx/runtime-async-std-rustls"]
 
 [dependencies]
 async-session = "2.0.1"
-sqlx = { version = "0.3.5", features = ["chrono"] }
-async-std = "1.7.0"
-
+sqlx = { version = "0.4.1", features = ["chrono"] }
+async-std = "1.8.0"
 
 [dev-dependencies]
-async-std = { version = "1.7.0", features = ["attributes"] }
+async-std = { version = "1.8.0", features = ["attributes"] }

src/pg.rs

@@ -1,6 +1,6 @@
 use async_session::{async_trait, chrono::Utc, log, serde_json, Result, Session, SessionStore};
 use async_std::task;
-use sqlx::{pool::PoolConnection, prelude::PgQueryAs, Executor, PgConnection, PgPool};
+use sqlx::{pool::PoolConnection, Executor, Postgres, PgPool};
 use std::time::Duration;
 
 /// sqlx postgres session store for async-sessions
@@ -69,7 +69,7 @@ impl PostgresSessionStore {
     /// # Ok(()) }) }
     /// ```
     pub async fn new(database_url: &str) -> sqlx::Result<Self> {
-        let pool = PgPool::new(database_url).await?;
+        let pool = PgPool::connect(database_url).await?;
         Ok(Self::from_client(pool))
     }
 
@@ -169,7 +169,7 @@ impl PostgresSessionStore {
     }
 
     /// retrieve a connection from the pool
-    async fn connection(&self) -> sqlx::Result<PoolConnection<PgConnection>> {
+    async fn connection(&self) -> sqlx::Result<PoolConnection<Postgres>> {
         self.client.acquire().await
     }
 

src/sqlite.rs

@@ -1,6 +1,6 @@
 use async_session::{async_trait, chrono::Utc, log, serde_json, Result, Session, SessionStore};
 use async_std::task;
-use sqlx::{pool::PoolConnection, prelude::SqliteQueryAs, sqlite::SqlitePool, SqliteConnection};
+use sqlx::{pool::PoolConnection, sqlite::SqlitePool, Sqlite};
 use std::time::Duration;
 
 /// sqlx sqlite session store for async-sessions
@@ -71,7 +71,7 @@ impl SqliteSessionStore {
     /// # Ok(()) }) }
     /// ```
     pub async fn new(database_url: &str) -> sqlx::Result<Self> {
-        Ok(Self::from_client(SqlitePool::new(database_url).await?))
+        Ok(Self::from_client(SqlitePool::connect(database_url).await?))
     }
 
     /// constructs a new SqliteSessionStore from a sqlite: database url. the
@@ -172,7 +172,7 @@ impl SqliteSessionStore {
     }
 
     /// retrieve a connection from the pool
-    async fn connection(&self) -> sqlx::Result<PoolConnection<SqliteConnection>> {
+    async fn connection(&self) -> sqlx::Result<PoolConnection<Sqlite>> {
         self.client.acquire().await
     }