Rebase on 1.1.x

Author: tyt2y3

cli/Cargo.toml

@@ -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 = "~2.0.0-rc.1", path = "../generator" }
+seaography-generator = { version = "~2.0.0-rc", path = "../generator" }
 url = "2.4.0"

examples/mysql/Cargo.toml

@@ -14,7 +14,7 @@ tracing-subscriber = { version = "0.3.17" }
 
 [dependencies.seaography]
 path = "../../"
-version = "~2.0.0-rc.1" # seaography version
+version = "~2.0.0-rc" # seaography version
 features = ["with-decimal", "with-chrono"]
 
 [dev-dependencies]

examples/postgres/Cargo.toml

@@ -14,7 +14,7 @@ tracing-subscriber = { version = "0.3.17" }
 
 [dependencies.seaography]
 path = "../../"
-version = "~2.0.0-rc.1" # seaography version
+version = "~2.0.0-rc" # seaography version
 features = ["with-decimal", "with-chrono", "with-json", "with-postgres-array", "schema-meta"]
 
 [dev-dependencies]

examples/postgres/tests/entity_metadata_tests.rs

@@ -2,7 +2,7 @@ use async_graphql::{dynamic::*, Response};
 use sea_orm::Database;
 use seaography::async_graphql;
 
-pub async fn get_schema() -> Schema {
+pub async fn schema() -> Schema {
     let database = Database::connect("postgres://sea:[email protected]/sakila")
         .await
         .unwrap();
@@ -20,7 +20,7 @@ pub fn assert_eq(a: Response, b: &str) {
 
 #[tokio::test]
 async fn test_entity_metadata() {
-    let schema = get_schema().await;
+    let schema = schema().await;
 
     assert_eq(
         schema
@@ -244,6 +244,15 @@ async fn test_entity_metadata() {
                   },
                   "enumeration": null
                 }
+              },
+              {
+                "name": "metadata",
+                "nullable": true,
+                "type_": {
+                  "primitive": "json",
+                  "array": null,
+                  "enumeration": null
+                }
               }
             ],
             "primary_key": [

examples/postgres/tests/guard_tests.rs

@@ -280,7 +280,7 @@ async fn entity_guard() {
             .execute(
                 r#"
                 {
-                    language(orderBy: { languageId: ASC }) {
+                    language(filters: { languageId: { lte: 6 } }, orderBy: { languageId: ASC }) {
                       nodes {
                         languageId
                         name

examples/sea-draw/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2024"
 async-graphql = { version = "7.0", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
 async-graphql-axum = { version = "7" }
 axum = { version = "0.8.*", features = ["ws"] }
-chrono = { version = "0.4.30", default-features = false }
 clap = { version = "4.5", features = ["derive", "env"] }
 dotenv = "0.15.0"
 reqwest = { version = "0.12", features = [
@@ -16,7 +15,7 @@ reqwest = { version = "0.12", features = [
     "rustls-tls",
     "multipart",
 ], default-features = false }
-sea-orm = { version = "~1.1.14", features = [
+sea-orm = { version = "~2.0.0-rc", features = [
     "sqlx-sqlite",
     "sqlx-postgres",
     "runtime-tokio-native-tls",
@@ -31,7 +30,7 @@ tracing-subscriber = { version = "0.3.17", features = ["env-filter", "fmt"] }
 
 [dependencies.seaography]
 path = "../../"
-version = "~1.1.4" # seaography version
+version = "~2.0.0-rc" # seaography version
 features = [
     "macros",
     "field-pluralize",

examples/sea-draw/src/lib.rs

@@ -14,9 +14,7 @@ pub mod subscriptions;
 pub mod types;
 
 pub fn never_condition() -> sea_orm::Condition {
-    sea_orm::query::Condition::any().add(sea_orm::sea_query::ConditionExpression::SimpleExpr(
-        sea_orm::sea_query::SimpleExpr::Constant(sea_orm::sea_query::Value::Bool(Some(false))),
-    ))
+    sea_orm::query::Condition::any().add(sea_orm::sea_query::Expr::val(false))
 }
 
 pub fn permission_for_operation_type(op: seaography::OperationType) -> entities::Permission {

examples/sea-draw/src/mutations.rs

@@ -4,10 +4,10 @@ use crate::{
     types::{Fill, Shape, Stroke},
 };
 use async_graphql::Context;
-use chrono::Utc;
 use sea_orm::{
     ActiveModelTrait, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter,
-    entity::prelude::Uuid, sea_query::query::OnConflict,
+    entity::prelude::{ChronoUtc as Utc, Uuid},
+    sea_query::query::OnConflict,
 };
 use seaography::CustomFields;
 use tracing::instrument;

examples/sqlite/Cargo.toml

@@ -17,7 +17,7 @@ serde_json = { version = "1.0.103" }
 
 [dependencies.seaography]
 path = "../../"
-version = "~2.0.0-rc.1" # seaography version
+version = "~2.0.0-rc" # seaography version
 features = ["macros", "with-decimal", "with-chrono"]
 
 [workspace]

macros/src/convert_output.rs

@@ -77,7 +77,7 @@ fn derive_convert_output_enum_containers(
             ) -> async_graphql::Result<Option<async_graphql::dynamic::FieldValue<'static>>> {
                 if let sea_orm::sea_query::value::Value::Json(opt_json) = value {
                     if let Some(json) = opt_json {
-                        match serde_json::from_value::<#orig_ident>(*json.clone()) {
+                        match serde_json::from_value::<#orig_ident>(json.clone()) {
                             Ok(obj) => match obj {
                                 #(#variant_matches)*
                             },