Bump sea-orm & sea-query

tyt2y3 · tyt2y3 · commit c2cc527da81f · 2025-08-27T09:41:51.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ members = [".", "cli", "generator", "macros"]
 
 [package]
 name = "seaography"
-version = "1.1.4"
+version = "2.0.0-rc.1"
 edition = "2021"
 rust-version = "1.70"
 authors = ["Panagiotis Karatakis <panagiotiskaratakis@gmail.com>"]
@@ -17,7 +17,7 @@ categories = ["database"]
 
 [dependencies]
 async-graphql = { version = "7.0", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
-sea-orm = { version = "~1.1.5", default-features = false, features = ["seaography", "with-json"] }
+sea-orm = { version = "~2.0.0-rc", default-features = false, features = ["seaography", "with-json"] }
 seaography-macros = { version = "0.1.0", path = "macros", optional = true }
 itertools = { version = "0.12.0" }
 heck = { version = "0.4.1" }
@@ -43,6 +43,5 @@ field-snake-case = []
 field-camel-case = []
 field-pluralize = ["pluralizer"]
 
-# [patch.crates-io]
-# sea-orm = { git = "https://github.com/SeaQL/sea-orm" }
-# sea-orm-migration = { git = "https://github.com/SeaQL/sea-orm" }
+[patch.crates-io]
+sea-orm = { git = "https://github.com/SeaQL/sea-orm", branch = "master" }
diff --git a/README.md b/README.md
@@ -37,6 +37,7 @@
 
 |                        Seaography                        |                         SeaORM                        |
 |----------------------------------------------------------|-------------------------------------------------------|
+| [2.0](https://crates.io/crates/seaography/2.0.0-rc)      | [2.0](https://crates.io/crates/sea-orm/2.0.0-rc)      |
 | [1.1](https://crates.io/crates/seaography/1.1.4)         | [1.1](https://crates.io/crates/sea-orm/1.1.13)        |
 
 ## Quick start - ready to serve in 3 minutes!
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "seaography-cli"
-version = "1.1.4"
+version = "2.0.0-rc.1"
 edition = "2021"
 rust-version = "1.70"
 authors = ["Panagiotis Karatakis <panagiotiskaratakis@gmail.com>"]
@@ -15,5 +15,5 @@ categories = ["database"]
 [dependencies]
 async-std = { version = "1.12.0", features = [ "attributes", "tokio1" ] }
 clap = { version = "4.3.19", features = ["derive"] }
-seaography-generator = { version = "~1.1.4", path = "../generator" }
+seaography-generator = { version = "~2.0.0-rc.1", path = "../generator" }
 url = "2.4.0"
diff --git a/examples/mysql/Cargo.toml b/examples/mysql/Cargo.toml
@@ -1,20 +1,20 @@
 [package]
 edition = "2021"
 name = "seaography-mysql-example"
-version = "1.1.4"
+version = "2.0.0-rc.1"
 
 [dependencies]
 axum = { version = "0.7" }
 async-graphql-axum = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.5", features = ["sqlx-mysql", "runtime-async-std-native-tls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["sqlx-mysql", "runtime-async-std-native-tls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }
 
 [dependencies.seaography]
 path = "../../"
-version = "~1.1.4" # seaography version
+version = "~2.0.0-rc.1" # seaography version
 features = ["with-decimal", "with-chrono"]
 
 [dev-dependencies]
diff --git a/examples/postgres/Cargo.toml b/examples/postgres/Cargo.toml
@@ -1,24 +1,24 @@
 [package]
 edition = "2021"
 name = "seaography-postgres-example"
-version = "1.1.4"
+version = "2.0.0-rc.1"
 
 [dependencies]
 poem = { version = "3.0" }
 async-graphql-poem = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.14", features = ["sqlx-postgres", "runtime-async-std-native-tls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["sqlx-postgres", "runtime-async-std-native-tls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }
 
 [dependencies.seaography]
 path = "../../"
-version = "~1.1.4" # seaography version
+version = "~2.0.0-rc.1" # seaography version
 features = ["with-decimal", "with-chrono", "with-postgres-array"]
 
 [dev-dependencies]
 serde_json = { version = "1.0.103" }
 
 [workspace]
-members = []
+members = []
diff --git a/examples/sqlite/Cargo.toml b/examples/sqlite/Cargo.toml
@@ -1,20 +1,20 @@
 [package]
 edition = "2021"
 name = "seaography-sqlite-example"
-version = "1.1.4"
+version = "2.0.0-rc.1"
 
 [dependencies]
 actix-web = { version = "4.5", default-features = false, features = ["macros"] }
 async-graphql-actix-web = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.14", features = ["sqlx-sqlite", "runtime-async-std-rustls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["sqlx-sqlite", "runtime-async-std-rustls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }
 
 [dependencies.seaography]
 path = "../../"
-version = "~1.1.4" # seaography version
+version = "~2.0.0-rc.1" # seaography version
 features = ["macros", "with-decimal", "with-chrono"]
 
 [dev-dependencies]
diff --git a/generator/Cargo.toml b/generator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "seaography-generator"
-version = "1.1.4"
+version = "2.0.0-rc.1"
 edition = "2021"
 rust-version = "1.70"
 authors = ["Panagiotis Karatakis <panagiotiskaratakis@gmail.com>"]
@@ -18,5 +18,4 @@ proc-macro2 = "1.0.66"
 syn = { version = "2.0.27", features = ["full"] }
 heck = "0.4.1"
 itertools = "0.11.0"
-sea-query = { version = "~0.32.0", default-features = false }
 thiserror = "1.0.44"
diff --git a/generator/src/templates/actix_cargo.toml b/generator/src/templates/actix_cargo.toml
@@ -7,7 +7,7 @@ version = "0.1.0"
 actix-web = { version = "4.5", default-features = false, features = ["macros"] }
 async-graphql-actix-web = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.5", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }
diff --git a/generator/src/templates/axum_cargo.toml b/generator/src/templates/axum_cargo.toml
@@ -7,7 +7,7 @@ version = "0.1.0"
 axum = { version = "0.7" }
 async-graphql-axum = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.5", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }
diff --git a/generator/src/templates/poem_cargo.toml b/generator/src/templates/poem_cargo.toml
@@ -7,7 +7,7 @@ version = "0.1.0"
 poem = { version = "3.0" }
 async-graphql-poem = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.5", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }
diff --git a/src/builder.rs b/src/builder.rs
@@ -5,7 +5,7 @@ use async_graphql::{
         SubscriptionField, TypeRef,
     },
 };
-use sea_orm::{ActiveEnum, ActiveModelTrait, ConnectionTrait, EntityTrait, IntoActiveModel};
+use sea_orm::{ActiveEnum, ActiveModelTrait, EntityTrait, IntoActiveModel};
 
 use crate::{
     ActiveEnumBuilder, ActiveEnumFilterInputBuilder, BuilderContext, ConnectionObjectBuilder,
diff --git a/src/builder_context/filter_types_map.rs b/src/builder_context/filter_types_map.rs
@@ -1,7 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 
 use async_graphql::dynamic::{InputObject, InputValue, ObjectAccessor, TypeRef};
-use sea_orm::{ColumnTrait, ColumnType, Condition, EntityTrait};
+use sea_orm::{ColumnTrait, ColumnType, Condition, EntityTrait, ExprTrait};
 
 use crate::{
     prepare_enumeration_condition, ActiveEnumFilterInputBuilder, BuilderContext,
diff --git a/src/builder_context/types_map.rs b/src/builder_context/types_map.rs
@@ -549,7 +549,7 @@ pub fn converted_value_to_sea_orm_value(
         }
         ConvertedType::String | ConvertedType::Enum(_) | ConvertedType::Custom(_) => {
             let value = value.string()?;
-            sea_orm::Value::String(Some(Box::new(value.to_string())))
+            sea_orm::Value::String(Some(value.to_string()))
         }
         ConvertedType::Char => {
             let value = value.string()?;
@@ -561,7 +561,7 @@ pub fn converted_value_to_sea_orm_value(
         }
         ConvertedType::Bytes => {
             let value = decode_hex(value.string()?)?;
-            sea_orm::Value::Bytes(Some(Box::new(value)))
+            sea_orm::Value::Bytes(Some(value))
         }
         #[cfg(feature = "with-json")]
         ConvertedType::Json => {
@@ -575,7 +575,7 @@ pub fn converted_value_to_sea_orm_value(
                 })?,
                 Err(_) => value.deserialize()?,
             };
-            sea_orm::Value::Json(Some(Box::new(value)))
+            sea_orm::Value::Json(Some(value))
         }
         #[cfg(feature = "with-chrono")]
         ConvertedType::ChronoDate => {
@@ -588,7 +588,7 @@ pub fn converted_value_to_sea_orm_value(
                     )
                 })?;
 
-            sea_orm::Value::ChronoDate(Some(Box::new(value)))
+            sea_orm::Value::ChronoDate(Some(value))
         }
         #[cfg(feature = "with-chrono")]
         ConvertedType::ChronoTime => {
@@ -601,7 +601,7 @@ pub fn converted_value_to_sea_orm_value(
                     )
                 })?;
 
-            sea_orm::Value::ChronoTime(Some(Box::new(value)))
+            sea_orm::Value::ChronoTime(Some(value))
         }
         #[cfg(feature = "with-chrono")]
         ConvertedType::ChronoDateTime => {
@@ -616,7 +616,7 @@ pub fn converted_value_to_sea_orm_value(
                 )
             })?;
 
-            sea_orm::Value::ChronoDateTime(Some(Box::new(value)))
+            sea_orm::Value::ChronoDateTime(Some(value))
         }
         #[cfg(feature = "with-chrono")]
         ConvertedType::ChronoDateTimeUtc => {
@@ -630,7 +630,7 @@ pub fn converted_value_to_sea_orm_value(
                     )
                 })?;
 
-            sea_orm::Value::ChronoDateTimeUtc(Some(Box::new(value)))
+            sea_orm::Value::ChronoDateTimeUtc(Some(value))
         }
         #[cfg(feature = "with-chrono")]
         ConvertedType::ChronoDateTimeLocal => {
@@ -644,7 +644,7 @@ pub fn converted_value_to_sea_orm_value(
                     )
                 })?;
 
-            sea_orm::Value::ChronoDateTimeLocal(Some(Box::new(value)))
+            sea_orm::Value::ChronoDateTimeLocal(Some(value))
         }
         #[cfg(feature = "with-chrono")]
         ConvertedType::ChronoDateTimeWithTimeZone => {
@@ -662,7 +662,7 @@ pub fn converted_value_to_sea_orm_value(
                 )
             })?;
 
-            sea_orm::Value::ChronoDateTimeWithTimeZone(Some(Box::new(value)))
+            sea_orm::Value::ChronoDateTimeWithTimeZone(Some(value))
         }
         #[cfg(feature = "with-time")]
         ConvertedType::TimeDate => {
@@ -677,7 +677,7 @@ pub fn converted_value_to_sea_orm_value(
                 )
             })?;
 
-            sea_orm::Value::TimeDate(Some(Box::new(value)))
+            sea_orm::Value::TimeDate(Some(value))
         }
         #[cfg(feature = "with-time")]
         ConvertedType::TimeTime => {
@@ -692,7 +692,7 @@ pub fn converted_value_to_sea_orm_value(
                 )
             })?;
 
-            sea_orm::Value::TimeTime(Some(Box::new(value)))
+            sea_orm::Value::TimeTime(Some(value))
         }
         #[cfg(feature = "with-time")]
         ConvertedType::TimeDateTime => {
@@ -707,7 +707,7 @@ pub fn converted_value_to_sea_orm_value(
                 )
             })?;
 
-            sea_orm::Value::TimeDateTime(Some(Box::new(value)))
+            sea_orm::Value::TimeDateTime(Some(value))
         }
         #[cfg(feature = "with-time")]
         ConvertedType::TimeDateTimeWithTimeZone => {
@@ -722,7 +722,7 @@ pub fn converted_value_to_sea_orm_value(
                 )
             })?;
 
-            sea_orm::Value::TimeDateTimeWithTimeZone(Some(Box::new(value)))
+            sea_orm::Value::TimeDateTimeWithTimeZone(Some(value))
         }
         #[cfg(feature = "with-uuid")]
         ConvertedType::Uuid => {
@@ -735,7 +735,7 @@ pub fn converted_value_to_sea_orm_value(
                 )
             })?;
 
-            sea_orm::Value::Uuid(Some(Box::new(value)))
+            sea_orm::Value::Uuid(Some(value))
         }
         #[cfg(feature = "with-decimal")]
         ConvertedType::Decimal => {
@@ -749,7 +749,7 @@ pub fn converted_value_to_sea_orm_value(
                     )
                 })?;
 
-            sea_orm::Value::Decimal(Some(Box::new(value)))
+            sea_orm::Value::Decimal(Some(value))
         }
         #[cfg(feature = "with-bigdecimal")]
         ConvertedType::BigDecimal => {
@@ -781,13 +781,13 @@ pub fn converted_value_to_sea_orm_value(
           // #[cfg(feature = "with-ipnetwork")]
           // ConvertedType::IpNetwork => {
           //     let value = value.string()?;
-          //     sea_orm::Value::String(Some(Box::new(value.to_string())))
+          //     sea_orm::Value::String(Some(value.to_string()))
           // }
           // FIXME: support mac type
           // #[cfg(feature = "with-mac_address")]
           // ConvertedType::MacAddress => {
           //     let value = value.string()?;
-          //     sea_orm::Value::String(Some(Box::new(value.to_string())))
+          //     sea_orm::Value::String(Some(value.to_string()))
           // }
     })
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -37,6 +37,7 @@
 //!
 //! |                        Seaography                        |                         SeaORM                        |
 //! |----------------------------------------------------------|-------------------------------------------------------|
+//! | [2.0](https://crates.io/crates/seaography/2.0.0-rc)      | [2.0](https://crates.io/crates/sea-orm/2.0.0-rc)      |
 //! | [1.1](https://crates.io/crates/seaography/1.1.4)         | [1.1](https://crates.io/crates/sea-orm/1.1.13)        |
 //!
 //! ## Quick start - ready to serve in 3 minutes!
diff --git a/src/query/loader.rs b/src/query/loader.rs
diff --git a/src/query/pagination.rs b/src/query/pagination.rs
diff --git a/src/utilities.rs b/src/utilities.rs
