Fix sea-orm-sync

Author: tyt2y3

sea-orm-sync/Cargo.toml

@@ -50,7 +50,7 @@ rust_decimal = { version = "1", default-features = false, features = [
 sea-orm-macros = { version = "~2.0.0-rc.20", path = "../sea-orm-macros", default-features = false, features = [
     "strum",
 ] }
-sea-query = { version = "=1.0.0-rc.23", default-features = false, features = [
+sea-query = { version = "=1.0.0-rc.26", default-features = false, features = [
     "thread-safe",
     "hashable-value",
     "backend-mysql",

sea-orm-sync/src/entity/column.rs

@@ -1,6 +1,8 @@
 use crate::{
     ColumnDef, ColumnType, DbBackend, EntityName, Iden, IdenStatic, IntoSimpleExpr, Iterable,
 };
+#[cfg(feature = "postgres-array")]
+use sea_query::ArrayElement;
 use sea_query::{
     BinOper, DynIden, Expr, ExprTrait, IntoIden, IntoLikeExpr, SeaRc, SelectStatement, Value,
 };
@@ -392,13 +394,13 @@ pub trait ColumnTrait: IdenStatic + Iterable + FromStr {
     /// );
     /// ```
     #[cfg(feature = "postgres-array")]
-    fn eq_any<A>(&self, arr: A) -> Expr
+    fn eq_any<T>(&self, arr: impl IntoIterator<Item = T>) -> Expr
     where
-        A: Into<sea_query::value::Array>,
+        T: ArrayElement,
     {
         use sea_query::extension::postgres::PgFunc;
 
-        let value = Value::Array(arr.into());
+        let value = Value::Array(arr.into_iter().collect());
         Expr::col(self.as_column_ref()).eq(PgFunc::any(Expr::val(value)))
     }
 

sea-orm-sync/src/entity/column/types.rs

@@ -255,11 +255,9 @@ macro_rules! impl_numeric_column {
         #[cfg(feature = "postgres-array")]
         pub fn eq_any<V>(&self, v: impl IntoIterator<Item = V>) -> Expr
         where
-            V: $trait + sea_query::ValueType + sea_query::with_array::NotU8,
-            Vec<V>: Into<sea_query::value::Array>,
+            V: $trait + sea_query::ArrayElement,
         {
-            let vec: Vec<V> = v.into_iter().collect();
-            self.0.eq_any(vec)
+            self.0.eq_any(v)
         }
 
         bind_subquery_func!(pub in_subquery);
@@ -305,11 +303,9 @@ macro_rules! impl_string_column {
         #[cfg(feature = "postgres-array")]
         pub fn eq_any<V>(&self, v: impl IntoIterator<Item = V>) -> Expr
         where
-            V: Into<String> + sea_query::ValueType + sea_query::with_array::NotU8,
-            Vec<V>: Into<sea_query::value::Array>,
+            V: Into<String> + sea_query::ArrayElement
         {
-            let vec: Vec<V> = v.into_iter().collect();
-            self.0.eq_any(vec)
+            self.0.eq_any(v)
         }
 
         bind_subquery_func!(pub in_subquery);

sea-orm-sync/src/entity/column/types/with_datetime.rs

@@ -1,4 +1,6 @@
 use super::*;
+#[cfg(feature = "postgres-array")]
+use sea_query::ArrayElement;
 use sea_query::{DateLikeValue, DateTimeLikeValue, TimeLikeValue};
 
 impl<E: EntityTrait> DateLikeColumn<E> {
@@ -28,14 +30,11 @@ impl<E: EntityTrait> DateLikeColumn<E> {
 
     /// `= ANY(..)` operator. Postgres only.
     #[cfg(feature = "postgres-array")]
-    pub fn eq_any<V>(&self, v: impl IntoIterator<Item = V>) -> Expr
+    pub fn eq_any<T>(&self, v: impl IntoIterator<Item = T>) -> Expr
     where
-        V: DateLikeValue + sea_query::ValueType + sea_query::with_array::NotU8,
-        Vec<V>: Into<sea_query::value::Array>,
+        T: DateLikeValue + ArrayElement,
     {
-        use itertools::Itertools;
-
-        self.0.eq_any(v.into_iter().collect_vec())
+        self.0.eq_any(v)
     }
 
     bind_subquery_func!(pub in_subquery);
@@ -69,13 +68,11 @@ impl<E: EntityTrait> TimeLikeColumn<E> {
 
     /// `= ANY(..)` operator. Postgres only.
     #[cfg(feature = "postgres-array")]
-    pub fn eq_any<V>(&self, v: impl IntoIterator<Item = V>) -> Expr
+    pub fn eq_any<T>(&self, v: impl IntoIterator<Item = T>) -> Expr
     where
-        V: TimeLikeValue + sea_query::ValueType + sea_query::with_array::NotU8,
-        Vec<V>: Into<sea_query::value::Array>,
+        T: TimeLikeValue + ArrayElement,
     {
-        let vec: Vec<V> = v.into_iter().collect();
-        self.0.eq_any(vec)
+        self.0.eq_any(v)
     }
 
     bind_subquery_func!(pub in_subquery);
@@ -111,11 +108,9 @@ impl<E: EntityTrait> DateTimeLikeColumn<E> {
     #[cfg(feature = "postgres-array")]
     pub fn eq_any<V>(&self, v: impl IntoIterator<Item = V>) -> Expr
     where
-        V: DateTimeLikeValue + sea_query::ValueType + sea_query::with_array::NotU8,
-        Vec<V>: Into<sea_query::value::Array>,
+        V: DateTimeLikeValue + sea_query::ArrayElement,
     {
-        let vec: Vec<V> = v.into_iter().collect();
-        self.0.eq_any(vec)
+        self.0.eq_any(v)
     }
 
     bind_subquery_func!(pub in_subquery);

sea-orm-sync/src/value/json.rs

@@ -1,5 +1,8 @@
 use crate::sea_query::{ArrayType, ColumnType, Nullable, ValueType, ValueTypeErr};
-use crate::{ColIdx, QueryResult, TryGetError, TryGetable, Value, error::json_err};
+use crate::{
+    ActiveValue, ColIdx, IntoActiveValue, QueryResult, TryGetError, TryGetable, Value,
+    error::json_err,
+};
 
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
@@ -83,6 +86,15 @@ impl<T> Nullable for JsonField<T> {
     }
 }
 
+impl<T> IntoActiveValue<JsonField<T>> for JsonField<T>
+where
+    T: Serialize,
+{
+    fn into_active_value(self) -> ActiveValue<JsonField<T>> {
+        ActiveValue::Set(self)
+    }
+}
+
 impl<T> TryGetable for JsonField<T>
 where
     for<'de> T: Deserialize<'de>,

sea-orm-sync/src/value/timestamp.rs

@@ -51,6 +51,12 @@ macro_rules! impl_timestamp {
             }
         }
 
+        impl sea_orm::IntoActiveValue<$ty> for $ty {
+            fn into_active_value(self) -> sea_orm::ActiveValue<$ty> {
+                sea_orm::ActiveValue::Set(self)
+            }
+        }
+
         impl Deref for $ty {
             type Target = $inner;
 

sea-orm-sync/tests/string_primary_key_tests.rs

@@ -4,7 +4,7 @@ pub mod common;
 
 pub use common::{TestContext, features::*, setup::*};
 use pretty_assertions::assert_eq;
-use sea_orm::{DatabaseConnection, entity::prelude::*, entity::*};
+use sea_orm::{DatabaseConnection, TryInsertResult, entity::prelude::*, entity::*};
 use serde_json::json;
 
 #[sea_orm_macros::test]
@@ -43,7 +43,7 @@ pub fn insert_and_delete_repository(db: &DatabaseConnection) -> Result<(), DbErr
     {
         use sea_orm::sea_query::OnConflict;
 
-        let err = Repository::insert(repository)
+        let err = Repository::insert(repository.clone())
             // MySQL does not support DO NOTHING, we might workaround that later
             .on_conflict(OnConflict::new().do_nothing().to_owned())
             .exec(db);
@@ -99,6 +99,36 @@ pub fn insert_and_delete_repository(db: &DatabaseConnection) -> Result<(), DbErr
         ]
     );
 
+    #[cfg(any(feature = "sqlx-sqlite", feature = "sqlx-postgres"))]
+    {
+        let result = Repository::insert_many([
+            repository::Model {
+                id: "unique-id-002".to_owned(), // conflict
+                owner: "GC".to_owned(),
+                name: "G.C.".to_owned(),
+                description: None,
+            }
+            .into_active_model(),
+            repository::Model {
+                id: "unique-id-003".to_owned(), // insert succeed
+                owner: "GC".to_owned(),
+                name: "G.C.".to_owned(),
+                description: None,
+            }
+            .into_active_model(),
+        ])
+        .on_conflict_do_nothing()
+        .exec_with_returning_many(db)?;
+
+        match result {
+            TryInsertResult::Inserted(inserted) => {
+                assert_eq!(inserted.len(), 1);
+                assert_eq!(inserted[0].id, "unique-id-003");
+            }
+            _ => panic!("{result:?}"),
+        }
+    }
+
     Ok(())
 }