SeaQL · tyt2y3 · Jul 21, 2023 · Jul 12, 2023 · Jul 12, 2023 · Jul 20, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.13.0 - Pending
+
+### Features and upgrades
+
+* Upgrade `sea-query` to `0.30` https://github.com/SeaQL/sea-schema/pull/114
+* Upgrade `sea-query-binder` to `0.5` https://github.com/SeaQL/sea-schema/pull/114
+* Upgrade `sqlx` to `0.7` https://github.com/SeaQL/sea-schema/pull/114
+
 ## 0.12.0 - 2023-07-20
 
 + 2023-03-22: `0.12.0-rc.1`

diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ members = [
 
 [package]
 name = "sea-schema"
-version = "0.12.0"
+version = "0.13.0"
 authors = [ "Chris Tsang <tyt2y7@gmail.com>" ]
 edition = "2021"
 description = "🌿 SQL schema definition and discovery"
@@ -36,10 +36,10 @@ path = "src/lib.rs"
 [dependencies]
 futures = { version = "0.3", default-features = false, optional = true, features = ["alloc"] }
 sea-schema-derive = { version = "0.2.0", path = "sea-schema-derive", default-features = false }
-sea-query = { version = "0.29.0", default-features = false, features = ["derive"] }
-sea-query-binder = { version = "0.4.0", default-features = false, optional = true }
+sea-query = { version = "0.30.0", default-features = false, features = ["derive"] }
+sea-query-binder = { version = "0.5.0", default-features = false, optional = true }
 serde = { version = "1", default-features = false, optional = true, features = ["derive"] }
-sqlx = { version = "0.6", default-features = false, optional = true }
+sqlx = { version = "0.7", default-features = false, optional = true }
 log = { version = "0.4", default-features = false, optional = true }
 
 [features]
@@ -78,7 +78,7 @@ sqlx-sqlite = [
     "sqlx/sqlite",
 ]
 runtime-actix-native-tls = [
-    "sqlx/runtime-actix-native-tls",
+    "sqlx/runtime-tokio-native-tls",
     "sea-query-binder/runtime-actix-native-tls",
 ]
 runtime-async-std-native-tls = [
@@ -90,7 +90,7 @@ runtime-tokio-native-tls = [
     "sea-query-binder/runtime-tokio-native-tls",
 ]
 runtime-actix-rustls = [
-    "sqlx/runtime-actix-rustls",
+    "sqlx/runtime-tokio-rustls",
     "sea-query-binder/runtime-actix-rustls",
 ]
 runtime-async-std-rustls = [

diff --git a/src/mysql/discovery/executor/real.rs b/src/mysql/discovery/executor/real.rs
@@ -24,7 +24,7 @@ impl Executor {
         debug_print!("{}, {:?}", sql, values);
 
         sqlx::query_with(&sql, values)
-            .fetch_all(&mut self.pool.acquire().await?)
+            .fetch_all(&mut *self.pool.acquire().await?)
             .await
     }
 }
diff --git a/src/postgres/discovery/executor/real.rs b/src/postgres/discovery/executor/real.rs
@@ -24,7 +24,7 @@ impl Executor {
         debug_print!("{}, {:?}", sql, values);
 
         sqlx::query_with(&sql, values)
-            .fetch_all(&mut self.pool.acquire().await?)
+            .fetch_all(&mut *self.pool.acquire().await?)
             .await
     }
 }
diff --git a/src/sqlite/executor/real.rs b/src/sqlite/executor/real.rs
@@ -24,7 +24,7 @@ impl Executor {
         debug_print!("{}, {:?}", sql, values);
 
         sqlx::query_with(&sql, values)
-            .fetch_all(&mut self.pool.acquire().await?)
+            .fetch_all(&mut *self.pool.acquire().await?)
             .await
     }
 
@@ -33,15 +33,15 @@ impl Executor {
         debug_print!("{}, {:?}", sql, values);
 
         sqlx::query_with(&sql, values)
-            .fetch_one(&mut self.pool.acquire().await?)
+            .fetch_one(&mut *self.pool.acquire().await?)
             .await
     }
 
     pub async fn fetch_all_raw(&self, sql: String) -> Result<Vec<SqliteRow>, SqlxError> {
         debug_print!("{}", sql);
 
         sqlx::query(&sql)
-            .fetch_all(&mut self.pool.acquire().await?)
+            .fetch_all(&mut *self.pool.acquire().await?)
             .await
     }
 }
diff --git a/tests/discovery/mysql/Cargo.toml b/tests/discovery/mysql/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 async-std = { version = "1.8", features = [ "attributes", "tokio1" ] }
 sea-schema = { path = "../../../", default-features = false, features = [ "with-serde", "sqlx-mysql", "runtime-async-std-native-tls", "discovery", "debug-print" ] }
 serde_json = { version = "1" }
-sqlx = { version = "0.6" }
+sqlx = { version = "0.7" }
 env_logger = { version = "0" }
 log = { version = "0" }
diff --git a/tests/discovery/postgres/Cargo.toml b/tests/discovery/postgres/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 async-std = { version = "1.8", features = [ "attributes", "tokio1" ] }
 sea-schema = { path = "../../../", default-features = false, features = [ "with-serde", "sqlx-postgres", "runtime-async-std-native-tls", "discovery", "debug-print" ] }
 serde_json = { version = "1" }
-sqlx = { version = "0.6" }
+sqlx = { version = "0.7" }
 env_logger = { version = "0" }
 log = { version = "0" }
diff --git a/tests/discovery/sqlite/Cargo.toml b/tests/discovery/sqlite/Cargo.toml
@@ -8,4 +8,4 @@ publish = false
 async-std = { version = "1.8", features = [ "attributes", "tokio1" ] }
 sea-schema = { path = "../../../", default-features = false, features = [ "with-serde", "sqlx-sqlite", "runtime-async-std-native-tls", "discovery", "debug-print" ] }
 serde_json = { version = "1" }
-sqlx = { version = "0.6" }
+sqlx = { version = "0.7" }
diff --git a/tests/live/mysql/Cargo.toml b/tests/live/mysql/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 async-std = { version = "1.8", features = [ "attributes", "tokio1" ] }
 sea-schema = { path = "../../../", default-features = false, features = [ "sqlx-mysql", "runtime-async-std-native-tls", "discovery", "writer", "debug-print" ] }
 serde_json = { version = "1" }
-sqlx = { version = "0.6" }
+sqlx = { version = "0.7" }
 pretty_assertions = { version = "0.7" }
 regex = { version = "1" }
 env_logger = { version = "0" }

diff --git a/tests/live/mysql/src/main.rs b/tests/live/mysql/src/main.rs
@@ -36,7 +36,7 @@ async fn main() {
         let sql = tbl_create_stmt.to_string(MysqlQueryBuilder);
         println!("{};", sql);
         println!();
-        sqlx::query(&sql).execute(&mut executor).await.unwrap();
+        sqlx::query(&sql).execute(&mut *executor).await.unwrap();
     }
 
     let schema_discovery = SchemaDiscovery::new(connection, "sea-schema");
@@ -98,12 +98,12 @@ async fn setup(base_url: &str, db_name: &str) -> Pool<MySql> {
 
     let _drop_db_result = sqlx::query(&format!("DROP DATABASE IF EXISTS `{}`;", db_name))
         .bind(db_name)
-        .execute(&mut connection)
+        .execute(&mut *connection)
         .await
         .unwrap();
 
     let _create_db_result = sqlx::query(&format!("CREATE DATABASE `{}`;", db_name))
-        .execute(&mut connection)
+        .execute(&mut *connection)
         .await
         .unwrap();
 

diff --git a/tests/live/postgres/Cargo.toml b/tests/live/postgres/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 async-std = { version = "1.8", features = [ "attributes", "tokio1" ] }
 sea-schema = { path = "../../../", default-features = false, features = [ "sqlx-postgres", "runtime-async-std-native-tls", "discovery", "writer", "debug-print" ] }
 serde_json = { version = "1" }
-sqlx = { version = "0.6" }
+sqlx = { version = "0.7" }
 env_logger = { version = "0" }
 log = { version = "0" }
 pretty_assertions = { version = "0.7" }
diff --git a/tests/live/postgres/src/main.rs b/tests/live/postgres/src/main.rs
@@ -23,7 +23,7 @@ async fn main() {
     let mut executor = connection.acquire().await.unwrap();
 
     sqlx::query("CREATE EXTENSION IF NOT EXISTS citext")
-        .execute(&mut executor)
+        .execute(&mut *executor)
         .await
         .unwrap();
 
@@ -39,7 +39,7 @@ async fn main() {
         .to_string(PostgresQueryBuilder);
 
     sqlx::query(&create_enum_stmt)
-        .execute(&mut executor)
+        .execute(&mut *executor)
         .await
         .unwrap();
 
@@ -58,7 +58,7 @@ async fn main() {
         let sql = tbl_create_stmt.to_string(PostgresQueryBuilder);
         println!("{};", sql);
         println!();
-        sqlx::query(&sql).execute(&mut executor).await.unwrap();
+        sqlx::query(&sql).execute(&mut *executor).await.unwrap();
     }
 
     let schema_discovery = SchemaDiscovery::new(connection, "public");
@@ -121,12 +121,12 @@ async fn setup(base_url: &str, db_name: &str) -> Pool<Postgres> {
 
     let _drop_db_result = sqlx::query(&format!("DROP DATABASE IF EXISTS \"{}\";", db_name))
         .bind(db_name)
-        .execute(&mut connection)
+        .execute(&mut *connection)
         .await
         .unwrap();
 
     let _create_db_result = sqlx::query(&format!("CREATE DATABASE \"{}\";", db_name))
-        .execute(&mut connection)
+        .execute(&mut *connection)
         .await
         .unwrap();
 

diff --git a/tests/live/sqlite/Cargo.toml b/tests/live/sqlite/Cargo.toml
@@ -17,7 +17,7 @@ sea-schema = { path = "../../../", default-features = false, features = [
     "sqlite",
 ] }
 serde_json = { version = "1" }
-sqlx = { version = "0.6", features = [
+sqlx = { version = "0.7", features = [
     "sqlite",
     "runtime-async-std-native-tls",
 ] }

diff --git a/tests/live/sqlite/src/main.rs b/tests/live/sqlite/src/main.rs
@@ -33,17 +33,17 @@ async fn test_001() -> DiscoveryResult<()> {
 
     //DROP TABLES to ensure all tests pass
     sqlx::query("DROP TABLE IF EXISTS Programming_Langs")
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
     sqlx::query("DROP TABLE IF EXISTS suppliers")
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
     sqlx::query("DROP TABLE IF EXISTS supplier_groups")
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
@@ -94,17 +94,17 @@ async fn test_001() -> DiscoveryResult<()> {
 
     //DROP TABLES to ensure all tests pass
     sqlx::query("DROP TABLE IF EXISTS Programming_Langs")
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
     sqlx::query("DROP TABLE IF EXISTS suppliers")
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
     sqlx::query("DROP TABLE IF EXISTS supplier_groups")
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
@@ -164,37 +164,37 @@ async fn test_001() -> DiscoveryResult<()> {
         .to_owned();
 
     sqlx::query(&create_table.to_string(SqliteQueryBuilder))
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
     sqlx::query(&insert_into_table.to_string(SqliteQueryBuilder))
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
     sqlx::query(&table_create_supplier_groups.to_string(SqliteQueryBuilder))
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
     sqlx::query(&table_create_suppliers.to_string(SqliteQueryBuilder))
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
     sqlx::query(&insert_into_supplier_groups.to_string(SqliteQueryBuilder))
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
     sqlx::query(&insert_into_suppliers.to_string(SqliteQueryBuilder))
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
     sqlx::query(&create_index.to_string(SqliteQueryBuilder))
-        .fetch_all(&mut sqlite_pool.acquire().await.unwrap())
+        .fetch_all(&mut *sqlite_pool.acquire().await.unwrap())
         .await
         .unwrap();
 
@@ -259,7 +259,7 @@ async fn test_002() -> DiscoveryResult<()> {
         let sql = tbl_create_stmt.to_string(SqliteQueryBuilder);
         println!("{};", sql);
         println!();
-        sqlx::query(&sql).execute(&mut executor).await.unwrap();
+        sqlx::query(&sql).execute(&mut *executor).await.unwrap();
     }
 
     let schema_discovery = SchemaDiscovery::new(connection);

diff --git a/tests/writer/mysql/Cargo.toml b/tests/writer/mysql/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 async-std = { version = "1.8", features = [ "attributes", "tokio1" ] }
 sea-schema = { path = "../../../", default-features = false, features = [ "sqlx-mysql", "runtime-async-std-native-tls", "discovery", "writer", "debug-print" ] }
 serde_json = { version = "1" }
-sqlx = { version = "0.6" }
+sqlx = { version = "0.7" }
 env_logger = { version = "0" }
 log = { version = "0" }
diff --git a/tests/writer/postgres/Cargo.toml b/tests/writer/postgres/Cargo.toml
@@ -9,6 +9,6 @@ pretty_assertions = { version = "0.7" }
 async-std = { version = "1.8", features = [ "attributes", "tokio1" ] }
 sea-schema = { path = "../../../", default-features = false, features = [ "sqlx-postgres", "runtime-async-std-native-tls", "discovery", "writer", "debug-print" ] }
 serde_json = { version = "1" }
-sqlx = { version = "0.6" }
+sqlx = { version = "0.7" }
 env_logger = { version = "0" }
 log = { version = "0" }
diff --git a/tests/writer/sqlite/Cargo.toml b/tests/writer/sqlite/Cargo.toml
@@ -8,4 +8,4 @@ publish = false
 async-std = { version = "1.8", features = [ "attributes", "tokio1" ] }
 sea-schema = { path = "../../../", default-features = false, features = [ "sqlx-sqlite", "runtime-async-std-native-tls", "discovery", "writer", "debug-print" ] }
 serde_json = { version = "1" }
-sqlx = { version = "0.6" }
+sqlx = { version = "0.7" }