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.13
       - 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,9 +80,11 @@ 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 = "..\/..\/"'
@@ -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:sea@127.0.0.1/sakila
-            seaography-mysql-example -f axum
+            --package seaography-cli --
+            -o ./examples/mysql
+            -e ./examples/mysql/src/entities
+            -u mysql://sea:sea@127.0.0.1/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'
       - 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:sea@127.0.0.1/sakila?currentSchema=public
-            seaography-postgres-example -f poem
+            --package seaography-cli --
+            -o ./examples/postgres
+            -e ./examples/postgres/src/entities
+            -u postgres://sea:sea@127.0.0.1/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 <panagiotiskaratakis@gmail.com>",
     "Chris Tsang <chris.2y3@outlook.com>",
 ]
-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 }
+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"]
@@ -49,5 +56,4 @@ 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" }

README.md

@@ -2,9 +2,8 @@
 
   <img src="https://raw.githubusercontent.com/SeaQL/seaography/main/docs/Seaography.png" width="280" alt="Seaography logo"/>
 
-  <p>
-    <strong>🧭 A dynamic GraphQL framework for SeaORM</strong>
-  </p>
+  <p><strong>🧭 A GraphQL framework for Rust</strong></p>
+  <p>Quick to start, type‑safe, powerful and extensible</p>
 
   [![crate](https://img.shields.io/crates/v/seaography.svg)](https://crates.io/crates/seaography)
   [![docs](https://docs.rs/seaography/badge.svg)](https://docs.rs/seaography)
@@ -14,16 +13,19 @@
 
 # Seaography
 
-Seaography is a GraphQL framework that bridges async-graphql and SeaORM, instantly turning your database into a fully functional GraphQL API in Rust.
-It leverages async‑graphql's dynamic schema capabilities, resulting in minimal generated code and faster compile times compared to static schemas.
-With extensive configuration options, you can easily tailor the generated GraphQL schema to your application's needs.
+## Introduction
 
-Seaography enables you to focus on your application logic instead of boilerplate.
-With Seaography, you can:
+Seaography is a **GraphQL framework for Rust** that bridges [SeaORM](https://www.sea-ql.org/SeaORM/) and [async-graphql](https://github.com/async-graphql/async-graphql),
+turning your database schema into a fully-typed GraphQL API with minimal effort.
+By leveraging async-graphql's dynamic schema engine, Seaography avoids the heavy code generation of static approaches, resulting in faster compile times.
+The generated schema stays in sync with your SeaORM entities, while still giving you full control to extend and customize it.
 
-+ Turn a set of SeaORM entities into a complete GraphQL schema
-+ Use derive macros to craft custom input / output objects, queries and mutations, mix-and-match them with SeaORM models
-+ Generate web servers with the included CLI - ready to compile and run
+With Seaography you can focus on application logic instead of boilerplate. It enables you to:
+
++ Expose a complete GraphQL schema directly from your SeaORM entities, including filters, pagination, and nested relations
++ Use derive macros to define custom input/output objects, queries, and mutations, and seamlessly mix them with SeaORM models
++ Generate ready-to-run GraphQL servers via the included CLI, supporting different web frameworks out of the box
++ Use RBAC, guards, and lifecycle hooks to implement authorization and custom business logic
 
 ## Supported technologies
 
@@ -36,35 +38,45 @@ Seaography is built on top of SeaORM, so it supports:
 
 ### Web framework
 
-It's easy to integrate Seaography with any web framework, but we ship with the following examples out-of-the-box:
+It's easy to integrate Seaography with any web framework, and we ship with the following examples out-of-the-box:
+
++ [Actix](https://github.com/SeaQL/seaography/tree/1.1.x/examples/mysql), [Axum](https://github.com/SeaQL/seaography/tree/1.1.x/examples/postgres), [Poem](https://github.com/SeaQL/seaography/tree/1.1.x/examples/sqlite)
++ [Loco (SeaORM)](https://github.com/SeaQL/sea-orm/tree/master/examples/loco_seaography), [Loco (SeaORM Pro)](https://github.com/SeaQL/sea-orm-pro)
+
+### SeaORM Version Compatibility
 
-+ [Actix](https://github.com/SeaQL/seaography/tree/1.1.x/examples/sqlite), [Axum](https://github.com/SeaQL/seaography/tree/1.1.x/examples/mysql), [Poem](https://github.com/SeaQL/seaography/tree/1.1.x/examples/postgres)
-+ [Loco (SeaORM Pro)](https://github.com/SeaQL/sea-orm-pro)
+|                        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)        |
 
 ## Features
 
 * Rich types support (e.g. DateTime, Decimal)
 * Relational query (1-to-1, 1-to-N, M-to-N)
-* Pagination for queries and relations
+* Offset-based and cursor-based pagination
 * Filtering with operators (e.g. gt, lt, eq)
+* Filter by related entities
 * Order by any column
 * Mutations (create, update, delete)
-* Field guards on entity / column to restrict access
-* Choose between camel or snake case, and singular or plural field names
+* Guards and Filters on entity to restrict access
+* Choose between camel or snake case field names
 
-## SeaORM Version Compatibility
+### Extensible
 
-|                        Seaography                        |                         SeaORM                        |
-|----------------------------------------------------------|-------------------------------------------------------|
-| [1.1](https://crates.io/crates/seaography/1.1.4)         | [1.1](https://crates.io/crates/sea-orm/1.1.13)        |
+Seaography is also completely extensible. It offers:
+
+* Extensive configuration options in schema builder
+* Lifecycle hooks for custom resolver logic
+* Add custom queries & mutations with derive macros
 
 ## Quick start - ready to serve in 3 minutes!
 
 ### Install
 
 ```sh
-cargo install sea-orm-cli@^1.1 # used to generate entities
-cargo install seaography-cli@^1.1
+cargo install sea-orm-cli@^2.0.0-rc # used to generate entities
+cargo install seaography-cli@^2.0.0-rc
 ```
 
 ### MySQL
@@ -75,7 +87,7 @@ Then regenerate example project like below, or simply do `cargo run`.
 ```sh
 cd examples/mysql
 sea-orm-cli generate entity -o src/entities -u mysql://user:pw@127.0.0.1/sakila --seaography
-seaography-cli ./ src/entities mysql://user:pw@127.0.0.1/sakila seaography-mysql-example
+seaography-cli -o ./ -e src/entities -u mysql://user:pw@127.0.0.1/sakila seaography-mysql-example
 cargo run
 ```
 
@@ -87,7 +99,7 @@ Then regenerate example project like below, or simply do `cargo run`.
 ```sh
 cd examples/postgres
 sea-orm-cli generate entity -o src/entities -u postgres://user:pw@localhost/sakila --seaography
-seaography-cli ./ src/entities postgres://user:pw@localhost/sakila seaography-postgres-example
+seaography-cli -o ./ -e src/entities -u postgres://user:pw@localhost/sakila seaography-postgres-example
 cargo run
 ```
 
@@ -98,7 +110,7 @@ cargo run
 ```sh
 cd examples/sqlite
 sea-orm-cli generate entity -o src/entities -u sqlite://sakila.db --seaography
-seaography-cli ./ src/entities sqlite://sakila.db seaography-sqlite-example
+seaography-cli -o ./ -e src/entities -u sqlite://sakila.db seaography-sqlite-example
 cargo run
 ```
 
@@ -234,7 +246,7 @@ Find all inactive customers, include their address, and their payments with amou
 }
 ```
 
-### Filter using enumeration
+### Filter using MySQL / Postgres enum
 ```graphql
 {
   film(
@@ -243,6 +255,7 @@ Find all inactive customers, include their address, and their payments with amou
   ) {
     nodes {
       filmId
+      title
       rating
     }
   }