Update async-graphql

SeaQL · Oct 9, 2023 · e8703af · e8703af
1 parent bdb03cd
commit e8703af
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 17 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -105,7 +105,7 @@ jobs:
         working-directory: ./examples/sqlite
         run: cargo test
   integration-sqlite-actix:
-    name: SQLite integration tests
+    name: SQLite integration tests actix
     runs-on: ubuntu-latest
     needs:
       - check

diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ keywords = ["async", "graphql", "mysql", "postgres", "sqlite"]
 categories = ["database"]
 
 [dependencies]
-async-graphql = { version = "5.0.10", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
+async-graphql = { version = "6.0.7", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
 sea-orm = { version = "0.12.0", default-features = false, features = ["seaography"] }
 itertools = { version = "0.11.0" }
 heck = { version = "0.4.1" }

diff --git a/examples/mysql/Cargo.toml b/examples/mysql/Cargo.toml
@@ -5,8 +5,8 @@ version = "0.3.0"
 
 [dependencies]
 poem = { version = "1.3.56" }
-async-graphql-poem = { version = "5.0.10" }
-async-graphql = { version = "5.0.10", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
+async-graphql-poem = { version = "6.0.7" }
+async-graphql = { version = "6.0.7", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
 async-trait = { version = "0.1.72" }
 dotenv = "0.15.0"
 sea-orm = { version = "0.12.0", features = ["sqlx-mysql", "runtime-async-std-native-tls", "seaography"] }

diff --git a/examples/postgres/Cargo.toml b/examples/postgres/Cargo.toml
@@ -5,8 +5,8 @@ version = "0.3.0"
 
 [dependencies]
 poem = { version = "1.3.56" }
-async-graphql-poem = { version = "5.0.10" }
-async-graphql = { version = "5.0.10", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
+async-graphql-poem = { version = "6.0.7" }
+async-graphql = { version = "6.0.7", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
 async-trait = { version = "0.1.72" }
 dotenv = "0.15.0"
 sea-orm = { version = "0.12.0", features = ["sqlx-postgres", "runtime-async-std-native-tls", "seaography"] }

diff --git a/examples/sqlite/Cargo.toml b/examples/sqlite/Cargo.toml
@@ -4,9 +4,9 @@ name = "seaography-sqlite-example"
 version = "0.3.0"
 
 [dependencies]
-poem = { version = "1.3.56" }
-async-graphql-poem = { version = "5.0.10" }
-async-graphql = { version = "5.0.10", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
+actix-web = { version = "4.3.1", default-features = false, features = ["macros"] }
+async-graphql-actix-web = { version = "6.0.7" }
+async-graphql = { version = "6.0.7", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
 async-trait = { version = "0.1.72" }
 dotenv = "0.15.0"
 sea-orm = { version = "0.12.0", features = ["sqlx-sqlite", "runtime-async-std-native-tls", "seaography"] }
@@ -17,7 +17,7 @@ lazy_static = { version = "1.4.0" }
 
 [dependencies.seaography]
 path = "../../"
-version = "^1.0.0-rc.2" # seaography version
+version = "1.0.0-rc.2" # seaography version
 features = ["with-decimal", "with-chrono"]
 
 [dev-dependencies]

diff --git a/generator/src/lib.rs b/generator/src/lib.rs
@@ -12,7 +12,8 @@ pub enum WebFrameworkEnum {
     Poem,
 }
 
-#[allow(clippy::too_many_arguments)] pub async fn write_project<P: AsRef<std::path::Path>, T: AsRef<std::path::Path>>(
+#[allow(clippy::too_many_arguments)]
+pub async fn write_project<P: AsRef<std::path::Path>, T: AsRef<std::path::Path>>(
     root_path: &P,
     entities_path: &T,
     db_url: &str,

diff --git a/generator/src/templates/actix_cargo.toml b/generator/src/templates/actix_cargo.toml
@@ -5,8 +5,8 @@ version = "0.3.0"
 
 [dependencies]
 actix-web = { version = "4.3.1", default-features = false, features = ["macros"] }
-async-graphql-actix-web = { version = "5.0.10" }
-async-graphql = { version = "5.0.10", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
+async-graphql-actix-web = { version = "6.0.7" }
+async-graphql = { version = "6.0.7", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
 async-trait = { version = "0.1.72" }
 dotenv = "0.15.0"
 sea-orm = { version = "0.12.0", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }

diff --git a/generator/src/templates/poem_cargo.toml b/generator/src/templates/poem_cargo.toml
@@ -5,8 +5,8 @@ version = "0.3.0"
 
 [dependencies]
 poem = { version = "1.3.56" }
-async-graphql-poem = { version = "5.0.10" }
-async-graphql = { version = "5.0.10", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
+async-graphql-poem = { version = "6.0.7" }
+async-graphql = { version = "6.0.7", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
 async-trait = { version = "0.1.72" }
 dotenv = "0.15.0"
 sea-orm = { version = "0.12.0", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }

diff --git a/src/query/pagination.rs b/src/query/pagination.rs
@@ -1,8 +1,9 @@
 use async_graphql::dynamic::ValueAccessor;
 use itertools::Itertools;
+use sea_orm::CursorTrait;
 use sea_orm::{
-    ConnectionTrait, CursorTrait, DatabaseConnection, DbErr, EntityTrait, Iterable, ModelTrait,
-    PaginatorTrait, PrimaryKeyToColumn, QuerySelect, QueryTrait, Select,
+    ConnectionTrait, DatabaseConnection, DbErr, EntityTrait, Iterable, ModelTrait, PaginatorTrait,
+    PrimaryKeyToColumn, QuerySelect, QueryTrait, Select,
 };
 
 use crate::{