Add related queries optimizations (#146)

* Add related queries optimizations - [x] one to one relation - [x] one to many relation - [x] one to one via relation - [x] one to one via relation with intermediate - [x] one to many via relation * misc input objects apply Hash, Eq, etc. * order_input parsing support * update pagination parsing * memory pagination for related queries
SeaQL · Oct 10, 2023 · 9c43f72 · 9c43f72
1 parent 4203b82
commit 9c43f72
Show file tree

Hide file tree

Showing 34 changed files with 1,165 additions and 653 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,9 +1,5 @@
 [workspace]
-members = [
-    ".",
-    "cli",
-    "generator",
-]
+members = [".", "cli", "generator"]
 
 [package]
 name = "seaography"
@@ -24,7 +20,9 @@ async-graphql = { version = "6.0.7", features = ["decimal", "chrono", "dataloade
 sea-orm = { version = "0.12.0", default-features = false, features = ["seaography"] }
 itertools = { version = "0.11.0" }
 heck = { version = "0.4.1" }
-thiserror = "1.0.44"
+thiserror = { version = "1.0.44" }
+async-trait = { version = "0.1" }
+fnv = { version = "1.0.7" }
 
 [features]
 default = []
@@ -36,4 +34,4 @@ with-decimal = ["sea-orm/with-rust_decimal", "async-graphql/decimal"]
 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"]
+# with-mac_address = ["sea-orm/with-mac_address"]
diff --git a/examples/mysql/src/lib.rs b/examples/mysql/src/lib.rs
@@ -1,8 +1,2 @@
-use sea_orm::prelude::*;
-
 pub mod entities;
 pub mod query_root;
-
-pub struct OrmDataloader {
-    pub db: DatabaseConnection,
-}
diff --git a/examples/mysql/src/main.rs b/examples/mysql/src/main.rs
@@ -1,13 +1,9 @@
-use async_graphql::{
-    dataloader::DataLoader,
-    http::{playground_source, GraphQLPlaygroundConfig},
-};
+use async_graphql::http::{playground_source, GraphQLPlaygroundConfig};
 use async_graphql_poem::GraphQL;
 use dotenv::dotenv;
 use lazy_static::lazy_static;
 use poem::{get, handler, listener::TcpListener, web::Html, IntoResponse, Route, Server};
 use sea_orm::Database;
-use seaography_mysql_example::*;
 use std::env;
 
 lazy_static! {
@@ -39,15 +35,8 @@ async fn main() {
     let database = Database::connect(&*DATABASE_URL)
         .await
         .expect("Fail to initialize database connection");
-    let orm_dataloader: DataLoader<OrmDataloader> = DataLoader::new(
-        OrmDataloader {
-            db: database.clone(),
-        },
-        tokio::spawn,
-    );
     let schema = seaography_mysql_example::query_root::schema(
         database,
-        orm_dataloader,
         *DEPTH_LIMIT,
         *COMPLEXITY_LIMIT,
     )

diff --git a/examples/mysql/src/query_root.rs b/examples/mysql/src/query_root.rs
@@ -1,13 +1,12 @@
-use crate::{entities::*, OrmDataloader};
-use async_graphql::{dataloader::DataLoader, dynamic::*};
+use crate::entities::*;
+use async_graphql::dynamic::*;
 use sea_orm::DatabaseConnection;
 use seaography::{Builder, BuilderContext};
 
 lazy_static::lazy_static! { static ref CONTEXT : BuilderContext = BuilderContext :: default () ; }
 
 pub fn schema(
     database: DatabaseConnection,
-    orm_dataloader: DataLoader<OrmDataloader>,
     depth: Option<usize>,
     complexity: Option<usize>,
 ) -> Result<Schema, SchemaError> {
@@ -45,5 +44,5 @@ pub fn schema(
     } else {
         schema
     };
-    schema.data(database).data(orm_dataloader).finish()
+    schema.data(database).finish()
 }
diff --git a/examples/mysql/tests/mutation_tests.rs b/examples/mysql/tests/mutation_tests.rs
@@ -1,19 +1,13 @@
-use async_graphql::{dataloader::DataLoader, dynamic::*, Response};
+use async_graphql::{dynamic::*, Response};
 use sea_orm::Database;
-use seaography_mysql_example::OrmDataloader;
 
 pub async fn get_schema() -> Schema {
     let database = Database::connect("mysql://sea:[email protected]/sakila")
         .await
         .unwrap();
-    let orm_dataloader: DataLoader<OrmDataloader> = DataLoader::new(
-        OrmDataloader {
-            db: database.clone(),
-        },
-        tokio::spawn,
-    );
     let schema =
-        seaography_mysql_example::query_root::schema(database, orm_dataloader, None, None).unwrap();
+        seaography_mysql_example::query_root::schema(database, None, None)
+            .unwrap();
 
     schema
 }

diff --git a/examples/mysql/tests/query_tests.rs b/examples/mysql/tests/query_tests.rs
@@ -1,19 +1,12 @@
-use async_graphql::{dataloader::DataLoader, dynamic::*, Response};
+use async_graphql::{dynamic::*, Response};
 use sea_orm::Database;
-use seaography_mysql_example::OrmDataloader;
 
 pub async fn get_schema() -> Schema {
     let database = Database::connect("mysql://sea:[email protected]/sakila")
         .await
         .unwrap();
-    let orm_dataloader: DataLoader<OrmDataloader> = DataLoader::new(
-        OrmDataloader {
-            db: database.clone(),
-        },
-        tokio::spawn,
-    );
     let schema =
-        seaography_mysql_example::query_root::schema(database, orm_dataloader, None, None).unwrap();
+        seaography_mysql_example::query_root::schema(database, None, None).unwrap();
 
     schema
 }

diff --git a/examples/postgres/src/lib.rs b/examples/postgres/src/lib.rs
@@ -1,8 +1,3 @@
-use sea_orm::prelude::*;
-
 pub mod entities;
 pub mod query_root;
 
-pub struct OrmDataloader {
-    pub db: DatabaseConnection,
-}
diff --git a/examples/postgres/src/main.rs b/examples/postgres/src/main.rs
@@ -1,13 +1,9 @@
-use async_graphql::{
-    dataloader::DataLoader,
-    http::{playground_source, GraphQLPlaygroundConfig},
-};
+use async_graphql::http::{playground_source, GraphQLPlaygroundConfig};
 use async_graphql_poem::GraphQL;
 use dotenv::dotenv;
 use lazy_static::lazy_static;
 use poem::{get, handler, listener::TcpListener, web::Html, IntoResponse, Route, Server};
 use sea_orm::Database;
-use seaography_postgres_example::*;
 use std::env;
 
 lazy_static! {
@@ -39,15 +35,8 @@ async fn main() {
     let database = Database::connect(&*DATABASE_URL)
         .await
         .expect("Fail to initialize database connection");
-    let orm_dataloader: DataLoader<OrmDataloader> = DataLoader::new(
-        OrmDataloader {
-            db: database.clone(),
-        },
-        tokio::spawn,
-    );
     let schema = seaography_postgres_example::query_root::schema(
         database,
-        orm_dataloader,
         *DEPTH_LIMIT,
         *COMPLEXITY_LIMIT,
     )

diff --git a/examples/postgres/src/query_root.rs b/examples/postgres/src/query_root.rs
@@ -1,17 +1,16 @@
-use crate::{entities::*, OrmDataloader};
-use async_graphql::{dataloader::DataLoader, dynamic::*};
+use crate::entities::*;
+use async_graphql::dynamic::*;
 use sea_orm::DatabaseConnection;
 use seaography::{Builder, BuilderContext};
 
 lazy_static::lazy_static! { static ref CONTEXT : BuilderContext = BuilderContext :: default () ; }
 
 pub fn schema(
     database: DatabaseConnection,
-    orm_dataloader: DataLoader<OrmDataloader>,
     depth: Option<usize>,
     complexity: Option<usize>,
 ) -> Result<Schema, SchemaError> {
-    let mut builder = Builder::new(&CONTEXT);
+    let mut builder = Builder::new(&CONTEXT, database.clone());
     seaography::register_entities!(
         builder,
         [
@@ -44,5 +43,5 @@ pub fn schema(
     } else {
         schema
     };
-    schema.data(database).data(orm_dataloader).finish()
+    schema.data(database).finish()
 }
diff --git a/examples/postgres/tests/mutation_tests.rs b/examples/postgres/tests/mutation_tests.rs
@@ -1,19 +1,12 @@
-use async_graphql::{dataloader::DataLoader, dynamic::*, Response};
+use async_graphql::{dynamic::*, Response};
 use sea_orm::Database;
-use seaography_postgres_example::OrmDataloader;
 
 pub async fn get_schema() -> Schema {
     let database = Database::connect("postgres://sea:[email protected]/sakila")
         .await
         .unwrap();
-    let orm_dataloader: DataLoader<OrmDataloader> = DataLoader::new(
-        OrmDataloader {
-            db: database.clone(),
-        },
-        tokio::spawn,
-    );
     let schema =
-        seaography_postgres_example::query_root::schema(database, orm_dataloader, None, None)
+        seaography_postgres_example::query_root::schema(database, None, None)
             .unwrap();
 
     schema