Just a diff not intend to be merged

.github/workflows/tests.yaml

@@ -38,9 +38,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@master
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
           components: rustfmt, clippy
       - run: cargo fmt --all -- --check
       - working-directory: ./examples/sea-draw
@@ -52,16 +51,19 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
       - name: Install sea-orm-cli
         uses: baptiste0928/cargo-install@v3
         with:
           crate: sea-orm-cli
-          version: 1.0.0
+          version: 2.0.0-rc.18
       - name: Additional Integration tests
         working-directory: ./examples/sqlite
         run: |
           cargo test --test custom_query_tests
           cargo test --test custom_mutation_tests
+          cargo test --test query_tests --features=rbac
           cargo test --test plural_query_tests --features=field-pluralize
           cargo test --test entity_filter_tests --features=field-pluralize
           rm tests/custom_mutation_tests.rs tests/custom_query_tests.rs tests/plural_query_tests.rs
@@ -78,13 +80,15 @@ jobs:
         with:
           command: run
           args: >
-            --package seaography-cli -- ./examples/sqlite
-            ./examples/sqlite/src/entities sqlite://sakila.db
-            seaography-sqlite-example -f actix
+            --package seaography-cli --
+            -o ./examples/sqlite
+            -e ./examples/sqlite/src/entities
+            -u sqlite://sakila.db
+            seaography-sqlite-example -f poem
       - name: Depends on local seaography
-        run: >-
-          sed -i '/^\[dependencies.seaography\]$/a \path = "..\/..\/"'
-          ./examples/sqlite/Cargo.toml
+        run: |
+          sed -i '/^\[dependencies.seaography\]$/a \path = "..\/..\/"' ./examples/sqlite/Cargo.toml
+          sed -i '/^\[dev.dependencies\]$/a \serde = { version = "1", features = ["derive"] }' ./examples/sqlite/Cargo.toml
       - name: Build example
         working-directory: ./examples/sqlite
         run: cargo build
@@ -112,11 +116,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
       - name: Install sea-orm-cli
         uses: baptiste0928/cargo-install@v3
         with:
           crate: sea-orm-cli
-          version: 1.0.0
+          version: 2.0.0-rc.13
       - name: Remove generated folder
         run: rm -rf ./examples/mysql/src
       - name: Create DB
@@ -140,15 +146,15 @@ jobs:
         with:
           command: run
           args: >
-            --package seaography-cli -- ./examples/mysql
-            ./examples/mysql/src/entities mysql://sea:[email protected]/sakila
-            seaography-mysql-example -f axum
+            --package seaography-cli --
+            -o ./examples/mysql
+            -e ./examples/mysql/src/entities
+            -u mysql://sea:[email protected]/sakila
+            seaography-mysql-example -f actix
       - name: Depends on local seaography
-        run: >-
-          sed -i '/^\[dependencies.seaography\]$/a \path = "..\/..\/"'
-          ./examples/mysql/Cargo.toml
-      - name: Fix Nullable not implemented for Vec<String> and tsvector
-        run: 'sed -i "24,28d" ./examples/mysql/src/entities/film.rs'
+        run: |
+          sed -i '/^\[dependencies.seaography\]$/a \path = "..\/..\/"' ./examples/mysql/Cargo.toml
+          sed -i '/^\[dev.dependencies\]$/a \serde = { version = "1", features = ["derive"] }' ./examples/mysql/Cargo.toml
       - name: Build example
         working-directory: ./examples/mysql
         run: cargo build
@@ -173,11 +179,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
       - name: Install sea-orm-cli
         uses: baptiste0928/cargo-install@v3
         with:
           crate: sea-orm-cli
-          version: 1.0.0
+          version: 2.0.0-rc.13
       - name: Create DB
         run: >-
           psql -q postgres://sea:sea@localhost/postgres -c 'CREATE DATABASE
@@ -195,7 +203,8 @@ jobs:
         working-directory: ./examples/postgres
         run: |
           cargo test --test pg_query_tests
-          rm tests/pg_query_tests.rs
+          cargo test --test entity_metadata_tests
+          rm tests/pg_query_tests.rs tests/entity_metadata_tests.rs
       - name: Remove generated folder
         run: rm -rf ./examples/postgres/src
       - name: Generate entities
@@ -207,36 +216,23 @@ jobs:
         with:
           command: run
           args: >
-            --package seaography-cli -- ./examples/postgres
-            ./examples/postgres/src/entities
-            postgres://sea:[email protected]/sakila?currentSchema=public
-            seaography-postgres-example -f poem
+            --package seaography-cli --
+            -o ./examples/postgres
+            -e ./examples/postgres/src/entities
+            -u postgres://sea:[email protected]/sakila?currentSchema=public
+            seaography-postgres-example -f axum
       - name: Depends on local seaography
-        run: >-
-          sed -i '/^\[dependencies.seaography\]$/a \path = "..\/..\/"'
-          ./examples/postgres/Cargo.toml
-      - name: Fix Nullable not implemented for Vec<String> and tsvector
-        run: 'sed -i "26,27d" ./examples/postgres/src/entities/film.rs'
+        run: |
+          sed -i '/^\[dependencies.seaography\]$/a \path = "..\/..\/"' ./examples/postgres/Cargo.toml
+          sed -i '/^\[dev.dependencies\]$/a \serde = { version = "1", features = ["derive"] }' ./examples/postgres/Cargo.toml
       - name: Build example
         working-directory: ./examples/postgres
         run: cargo build
       - name: Integration tests
         working-directory: ./examples/postgres
         run: cargo test
-  integration-sqlite-sea-draw:
-    name: SQLite integration tests (sea-draw)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@stable
-      - name: Build sea-draw
-        working-directory: ./examples/sea-draw
-        run: cargo build
-      - name: Run sea-draw integration tests
-        working-directory: ./examples/sea-draw
-        run: ./integration_test_sqlite.sh
-  integration-postgres-sea-draw:
-    name: Postgres integration tests (sea-draw)
+  integration-sea-draw:
+    name: sea-draw Integration tests
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -256,6 +252,9 @@ jobs:
       - name: Build sea-draw
         working-directory: ./examples/sea-draw
         run: cargo build
-      - name: Run sea-draw integration tests
+      - name: Run SQLite integration tests
+        working-directory: ./examples/sea-draw
+        run: ./integration_test_sqlite.sh
+      - name: Run Postgres integration tests
         working-directory: ./examples/sea-draw
         run: ./integration_test_postgres.sh

CHANGELOG.md

@@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.0.0 - pending
+
+### New Features
+
+* Filter by related entity
+```graphql
+{
+  country(having: { city: { city: { eq: "London" } } }) {
+    nodes {
+      country
+      city {
+        nodes {
+          city
+        }
+      }
+    }
+  }
+}
+```
+
 ## 1.1.5 - pending
 
 ### New Features

Cargo.toml

@@ -3,37 +3,44 @@ members = [".", "cli", "generator", "macros"]
 
 [package]
 name = "seaography"
-version = "1.1.4"
+version = "2.0.0-rc.4"
 edition = "2021"
 rust-version = "1.70"
 authors = [
     "Panagiotis Karatakis <[email protected]>",
     "Chris Tsang <[email protected]>",
 ]
-description = "🧭 A dynamic GraphQL framework for SeaORM"
+description = "🧭 A GraphQL framework for SeaORM"
 license = "MIT OR Apache-2.0"
 homepage = "https://www.sea-ql.org/Seaography"
 documentation = "https://docs.rs/seaography"
 repository = "https://github.com/SeaQL/seaography"
 keywords = ["async", "graphql", "mysql", "postgres", "sqlite"]
 categories = ["database"]
 
+[package.metadata.docs.rs]
+features = ["default"]
+rustdoc-args = ["--cfg", "docsrs"]
+
 [dependencies]
-async-graphql = { version = "7.0", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
-sea-orm = { version = "1.1.15", default-features = false, features = ["seaography", "with-json"] }
-seaography-macros = { version = "0.1.0", path = "macros", optional = true }
+async-graphql = { version = "7.0", default-features = false, features = ["dataloader", "dynamic-schema"] }
+sea-orm = { version = "~2.0.0-rc", default-features = false, features = ["seaography", "with-json"] }
+seaography-macros = { version = "~2.0.0-rc.4", path = "macros", optional = true }
 itertools = { version = "0.12.0" }
 heck = { version = "0.4.1" }
 thiserror = { version = "1.0.44" }
 fnv = { version = "1.0.7" }
 lazy_static = { version = "1.5" }
+serde = { version = "1.0", optional = true }
 serde_json = { version = "1.0" }
 pluralizer = { version = "0.5", optional = true }
 time = { version = "0.3", features = ["formatting"], optional = true }
 
 [features]
-default = ["field-camel-case"]
+default = ["field-camel-case", "schema-meta"]
 macros = ["seaography-macros"]
+schema-meta = ["macros", "serde/derive", "with-postgres-array"]
+rbac = ["sea-orm/rbac"]
 with-json = ["sea-orm/with-json"]
 with-chrono = ["sea-orm/with-chrono", "async-graphql/chrono"]
 with-time = ["sea-orm/with-time", "async-graphql/time", "time"]
@@ -43,11 +50,11 @@ with-bigdecimal = ["sea-orm/with-bigdecimal", "async-graphql/bigdecimal"]
 with-postgres-array = ["sea-orm/postgres-array"]
 # with-ipnetwork = ["sea-orm/with-ipnetwork"]
 # with-mac_address = ["sea-orm/with-mac_address"]
+graphql-playground = ["async-graphql/playground"]
 field-snake-case = []
 field-camel-case = []
 field-pluralize = ["pluralizer"]
 strict-custom-types = ["seaography-macros/strict-custom-types"]
 
 # [patch.crates-io]
-# sea-orm = { git = "https://github.com/SeaQL/sea-orm" }
-# sea-orm-migration = { git = "https://github.com/SeaQL/sea-orm" }
+# sea-orm = { git = "https://github.com/SeaQL/sea-orm", branch = "master" }