Merge branch 'SeaQL:master' into cli-config

Author: aadi58002

examples/salvo_example/api/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 salvo-example-service = { path = "../service" }
 tokio = { version = "1.29.0", features = ["macros", "rt-multi-thread"] }
-salvo = { version = "0.49", features = ["affix", "serve-static"] }
+salvo = { version = "0.50", features = ["affix", "serve-static"] }
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 serde = { version = "1", features = ["derive"] }
 tera = "1.19.0"

examples/salvo_example/entity/Cargo.toml

@@ -10,7 +10,7 @@ path = "src/lib.rs"
 
 [dependencies]
 serde = { version = "1", features = ["derive"] }
-salvo = { version = "0.49" }
+salvo = { version = "0.50" }
 
 [dependencies.sea-orm]
 path = "../../../" # remove this line in your own project

issues/1790/Cargo.toml

@@ -0,0 +1,18 @@
+[workspace]
+# A separate workspace
+
+[package]
+name = "sea-orm-issues-1790"
+version = "0.1.0"
+edition = "2023"
+publish = false
+
+[dependencies]
+anyhow = "1"
+serde = "1"
+tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] }
+
+[dependencies.sea-orm]
+path = "../../"
+default-features = false
+features = ["macros", "runtime-tokio-native-tls", "sqlx-sqlite"]

issues/1790/insert_test.rs

@@ -0,0 +1,58 @@
+mod tests {
+    // currently ok
+    #[test]
+    fn insert_do_nothing_postgres() {
+        assert_eq!(
+            Insert::<cake::ActiveModel>::new()
+                .add(cake::Model {
+                    id: 1,
+                    name: "Apple Pie".to_owned(),
+                })
+                .on_conflict(OnConflict::new()
+                    .do_nothing()
+                    .to_owned()
+                )
+                .build(DbBackend::Postgres)
+                .to_string(),
+            r#"INSERT INTO "cake" ("id", "name") VALUES (1, 'Apple Pie') ON CONFLICT DO NOTHING"#,
+        );
+    }
+
+    //failed to run
+    #[test]
+    fn insert_do_nothing_mysql() {
+        assert_eq!(
+            Insert::<cake::ActiveModel>::new()
+                .add(cake::Model {
+                    id: 1,
+                    name: "Apple Pie".to_owned(),
+                })
+                .on_conflict(OnConflict::new()
+                    .do_nothing()
+                    .to_owned()
+                )
+                .build(DbBackend::Mysql)
+                .to_string(),
+            r#"INSERT IGNORE INTO "cake" ("id", "name") VALUES (1, 'Apple Pie')"#,
+        );
+    }
+
+    // currently ok
+    #[test]
+    fn insert_do_nothing() {
+        assert_eq!(
+            Insert::<cake::ActiveModel>::new()
+                .add(cake::Model {
+                    id: 1,
+                    name: "Apple Pie".to_owned(),
+                })
+                .on_conflict(OnConflict::new()
+                    .do_nothing()
+                    .to_owned()
+                )
+                .build(DbBackend::Sqlite)
+                .to_string(),
+            r#"INSERT IGNORE INTO "cake" ("id", "name") VALUES (1, 'Apple Pie')"#,
+        );
+    }
+}

src/database/mock.rs

@@ -285,6 +285,33 @@ where
     }
 }
 
+impl<M, N> IntoMockRow for (M, Option<N>)
+where
+    M: ModelTrait,
+    N: ModelTrait,
+{
+    fn into_mock_row(self) -> MockRow {
+        let mut mapped_join = BTreeMap::new();
+
+        for column in <<M as ModelTrait>::Entity as EntityTrait>::Column::iter() {
+            mapped_join.insert(
+                format!("{}{}", SelectA.as_str(), column.as_str()),
+                self.0.get(column),
+            );
+        }
+        if let Some(b_entity) = self.1 {
+            for column in <<N as ModelTrait>::Entity as EntityTrait>::Column::iter() {
+                mapped_join.insert(
+                    format!("{}{}", SelectB.as_str(), column.as_str()),
+                    b_entity.get(column),
+                );
+            }
+        }
+
+        mapped_join.into_mock_row()
+    }
+}
+
 impl<T> IntoMockRow for BTreeMap<T, Value>
 where
     T: Into<String>,

src/entity/base_entity.rs

@@ -960,7 +960,6 @@ mod tests {
             );
         }
 
-        delete_by_id("UUID".to_string());
         delete_by_id("UUID".to_string());
         delete_by_id("UUID");
         delete_by_id(Cow::from("UUID"));