Rebase on 1.1.x

Author: tyt2y3

Cargo.toml

@@ -35,7 +35,7 @@ time = { version = "0.3", features = ["formatting"], optional = true }
 [features]
 default = ["field-camel-case", "schema-meta"]
 macros = ["seaography-macros"]
-schema-meta = ["macros", "serde/derive", "with-postgres-array"]
+schema-meta = ["macros", "serde/derive"]
 rbac = ["sea-orm/rbac"]
 with-json = ["sea-orm/with-json"]
 with-chrono = ["sea-orm/with-chrono", "async-graphql/chrono"]

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

src/builder.rs

@@ -385,7 +385,7 @@ impl Builder {
         self.register_custom_output::<schema::Array>();
         self.register_custom_output::<schema::Enumeration>();
 
-        use crate::GqlOutputModelType;
+        use crate::CustomOutputType;
         use async_graphql::dynamic::FieldValue;
 
         const TABLE_NAME: &str = "table_name";

src/schema.rs

@@ -1,15 +1,15 @@
 use crate as seaography;
-use crate::macros::CustomOutput;
+use crate::CustomOutputType;
 use serde::Deserialize;
 
-#[derive(Debug, Clone, PartialEq, Deserialize, CustomOutput)]
+#[derive(Debug, Clone, PartialEq, Deserialize, CustomOutputType)]
 pub struct Table {
     pub columns: Vec<Column>,
     pub primary_key: Vec<String>,
     pub comment: Option<String>,
 }
 
-#[derive(Debug, Clone, PartialEq, Deserialize, CustomOutput)]
+#[derive(Debug, Clone, PartialEq, Deserialize, CustomOutputType)]
 pub struct Column {
     pub name: String,
     #[serde(rename = "type")]
@@ -19,19 +19,19 @@ pub struct Column {
     pub comment: Option<String>,
 }
 
-#[derive(Debug, Clone, PartialEq, CustomOutput)]
+#[derive(Debug, Clone, PartialEq, CustomOutputType)]
 pub struct ColumnType {
     pub primitive: Option<String>,
     pub array: Option<Array>,
     pub enumeration: Option<Enumeration>,
 }
 
-#[derive(Debug, Clone, PartialEq, Deserialize, CustomOutput)]
+#[derive(Debug, Clone, PartialEq, Deserialize, CustomOutputType)]
 pub struct Array {
     pub array: Box<ColumnType>,
 }
 
-#[derive(Debug, Clone, PartialEq, Deserialize, CustomOutput)]
+#[derive(Debug, Clone, PartialEq, Deserialize, CustomOutputType)]
 pub struct Enumeration {
     pub name: String,
     pub variants: Vec<String>, // this requires `postgres-array`