Bump sea-orm & sea-query

Author: billy1624

Cargo.toml

@@ -63,7 +63,7 @@ backtrace_printer = { version = "1.3.0" }
 # cli
 clap = { version = "4.4.7", features = ["derive"], optional = true }
 colored = { workspace = true }
-sea-orm = { version = "1.1.0", features = [
+sea-orm = { git = "https://github.com/SeaQL/sea-orm", branch = "master", version = "2.0.0-rc", features = [
     "sqlx-postgres",        # `DATABASE_DRIVER` feature
     "sqlx-sqlite",
     "runtime-tokio-rustls",
@@ -145,7 +145,7 @@ english-to-cron = { version = "0.1.2" }
 
 # bg_sqlt: sqlite workers
 # bg_pg: postgres workers
-sqlx = { version = "0.8.2", default-features = false, features = [
+sqlx = { version = "0.8.4", default-features = false, features = [
     "json",
     "postgres",
     "chrono",
@@ -187,7 +187,9 @@ duct = { version = "1.0.0" }
 
 [dependencies.sea-orm-migration]
 optional = true
-version = "1.0.0"
+git = "https://github.com/SeaQL/sea-orm"
+branch = "master"
+version = "2.0.0-rc"
 features = [
     # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
     # View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.
@@ -207,7 +209,7 @@ insta = { version = "1.34.0", features = ["redactions", "yaml", "filters"] }
 tree-fs = { version = "0.3" }
 reqwest = { version = "0.12.7", features = ["json"] }
 tower = { workspace = true, features = ["util"] }
-sqlx = { version = "0.8.2", default-features = false, features = [
+sqlx = { version = "0.8.4", default-features = false, features = [
     "macros",
     "json",
     "postgres",

src/db.rs

@@ -14,7 +14,8 @@ use chrono::{DateTime, Utc};
 use regex::Regex;
 use sea_orm::{
     ActiveModelTrait, ConnectOptions, ConnectionTrait, Database, DatabaseBackend,
-    DatabaseConnection, DbBackend, DbConn, DbErr, EntityTrait, IntoActiveModel, Statement,
+    DatabaseConnection, DbBackend, DbConn, DbErr, EntityTrait, ExprTrait, IntoActiveModel,
+    Statement,
 };
 use sea_orm_migration::MigratorTrait;
 use std::fmt::Write as FmtWrites;
@@ -184,6 +185,13 @@ pub async fn connect(config: &config::Database) -> Result<DbConn, sea_orm::DbErr
                 .await?;
             }
         }
+        bk => {
+            return Err(DbErr::BackendNotSupported {
+                db: bk.as_str(),
+                ctx: "connect",
+            }
+            .into())
+        }
     }
 
     Ok(db)
@@ -209,9 +217,11 @@ pub fn extract_db_name(conn_str: &str) -> AppResult<&str> {
 /// Returns a [`sea_orm::DbErr`] if an error occurs during run migration up.
 pub async fn create(db_uri: &str) -> AppResult<()> {
     if !db_uri.starts_with("postgres://") {
-        return Err(Error::string(
-            "Only Postgres databases are supported for table creation",
-        ));
+        return Err(DbErr::BackendNotSupported {
+            db: "Unknown",
+            ctx: "Only Postgres databases are supported for table creation",
+        }
+        .into());
     }
     let db_name = extract_db_name(db_uri).map_err(|_| {
         Error::string("The specified table name was not found in the given Postgres database URI")
@@ -279,8 +289,10 @@ use serde_json::{json, Value};
 pub async fn seed<A>(db: &DatabaseConnection, path: &str) -> crate::Result<()>
 where
     <<A as ActiveModelTrait>::Entity as EntityTrait>::Model: IntoActiveModel<A>,
-    for<'de> <<A as ActiveModelTrait>::Entity as EntityTrait>::Model: serde::de::Deserialize<'de>,
+    for<'de> <<A as ActiveModelTrait>::Entity as EntityTrait>::Model:
+        serde::de::Deserialize<'de> + serde::Serialize,
     A: ActiveModelTrait + Send + Sync,
+    A: sea_orm::TryIntoModel<<<A as ActiveModelTrait>::Entity as EntityTrait>::Model>,
     sea_orm::Insert<A>: Send + Sync,
     <A as ActiveModelTrait>::Entity: EntityName,
 {
@@ -353,10 +365,12 @@ async fn has_id_column(
                 .await?;
             result.is_some_and(|row| row.try_get::<i32>("", "count").unwrap_or(0) > 0)
         }
-        DatabaseBackend::MySql => {
-            return Err(Error::Message(
-                "Unsupported database backend: MySQL".to_string(),
-            ))
+        bk => {
+            return Err(DbErr::BackendNotSupported {
+                db: bk.as_str(),
+                ctx: "has_id_column",
+            }
+            .into());
         }
     };
 
@@ -395,10 +409,12 @@ async fn is_auto_increment(
                     .is_ok_and(|sql| sql.to_lowercase().contains("autoincrement"))
             })
         }
-        DatabaseBackend::MySql => {
-            return Err(Error::Message(
-                "Unsupported database backend: MySQL".to_string(),
-            ))
+        bk => {
+            return Err(DbErr::BackendNotSupported {
+                db: bk.as_str(),
+                ctx: "is_auto_increment",
+            }
+            .into());
         }
     };
     Ok(result)
@@ -448,10 +464,12 @@ pub async fn reset_autoincrement(
             ))
             .await?;
         }
-        DatabaseBackend::MySql => {
-            return Err(Error::Message(
-                "Unsupported database backend: MySQL".to_string(),
-            ))
+        bk => {
+            return Err(DbErr::BackendNotSupported {
+                db: bk.as_str(),
+                ctx: "reset_autoincrement",
+            }
+            .into());
         }
     }
     Ok(())
@@ -742,17 +760,19 @@ async fn create_postgres_database(
 /// unsupported database backend or a query execution issue.
 pub async fn get_tables(db: &DatabaseConnection) -> AppResult<Vec<String>> {
     let query = match db.get_database_backend() {
-        DatabaseBackend::MySql => {
-            return Err(Error::Message(
-                "Unsupported database backend: MySQL".to_string(),
-            ))
-        }
         DatabaseBackend::Postgres => {
             "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'"
         }
         DatabaseBackend::Sqlite => {
             "SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'"
         }
+        bk => {
+            return Err(DbErr::BackendNotSupported {
+                db: bk.as_str(),
+                ctx: "get_tables",
+            }
+            .into())
+        }
     };
 
     let result = db
@@ -766,10 +786,9 @@ pub async fn get_tables(db: &DatabaseConnection) -> AppResult<Vec<String>> {
         .into_iter()
         .filter_map(|row| {
             let col = match db.get_database_backend() {
-                sea_orm::DatabaseBackend::MySql | sea_orm::DatabaseBackend::Postgres => {
-                    "table_name"
-                }
+                sea_orm::DatabaseBackend::Postgres => "table_name",
                 sea_orm::DatabaseBackend::Sqlite => "name",
+                _ => unreachable!(),
             };
 
             if let Ok(table_name) = row.try_get::<String>("", col) {
@@ -969,6 +988,13 @@ pub async fn dump_schema(ctx: &AppContext, fname: &str) -> crate::Result<()> {
                 })
                 .collect::<Result<Vec<serde_json::Value>, DbErr>>()? // Specify error type explicitly
         }
+        db => {
+            return Err(DbErr::BackendNotSupported {
+                db: db.as_str(),
+                ctx: "dump_schema",
+            }
+            .into())
+        }
     };
     // Serialize schema info to JSON format
     let schema_json = serde_json::to_string_pretty(&schema_info)?;

src/schema.rs

@@ -754,6 +754,13 @@ pub async fn add_reference(
                 .await?;
             */
         }
+        bk => {
+            return Err(DbErr::BackendNotSupported {
+                db: bk.as_str(),
+                ctx: "add_reference",
+            }
+            .into())
+        }
     }
     Ok(())
 }
@@ -801,6 +808,13 @@ pub async fn remove_reference(
             // sqlite will not allow it.
             // more: https://www.bigbinary.com/blog/rails-6-adds-add_foreign_key-and-remove_foreign_key-for-sqlite3
         }
+        bk => {
+            return Err(DbErr::BackendNotSupported {
+                db: bk.as_str(),
+                ctx: "remove_reference",
+            }
+            .into())
+        }
     }
     Ok(())
 }

src/tests_cfg/db.rs

@@ -74,28 +74,13 @@ pub mod test_db {
         pub updated_at: DateTime,
     }
 
-    #[derive(Debug)]
+    #[derive(Debug, DeriveIden)]
     pub enum Loco {
         Table,
         Id,
         Name,
     }
 
-    impl Iden for Loco {
-        fn unquoted(&self, s: &mut dyn fmt::Write) {
-            write!(
-                s,
-                "{}",
-                match self {
-                    Self::Table => "loco",
-                    Self::Id => "id",
-                    Self::Name => "name",
-                }
-            )
-            .unwrap();
-        }
-    }
-
     #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
     pub enum Relation {}