Update to Rust Edition 2024

.github/workflows/tests.yaml

@@ -10,12 +10,17 @@ name: tests
       - .github/ISSUE_TEMPLATE/**
     branches:
       - main
+      - 1.*.x
+      - 0.*.x
       - pr/**/ci
+      - ci-*
+
 concurrency:
   group: '${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}'
   cancel-in-progress: true
 env:
   CARGO_TERM_COLOR: always
+
 jobs:
   check:
     name: Check

Cargo.toml

@@ -3,9 +3,9 @@ members = [".", "cli", "generator"]
 
 [package]
 name = "seaography"
-version = "1.1.4"
-edition = "2021"
-rust-version = "1.70"
+version = "2.0.0-rc.1"
+edition = "2024"
+rust-version = "1.85.0"
 authors = ["Panagiotis Karatakis <[email protected]>"]
 description = "🧭 A GraphQL framework and code generator for SeaORM"
 license = "MIT OR Apache-2.0"
@@ -17,7 +17,7 @@ categories = ["database"]
 
 [dependencies]
 async-graphql = { version = "7.0", features = ["decimal", "chrono", "dataloader", "dynamic-schema"] }
-sea-orm = { version = "~1.1.5", default-features = false, features = ["seaography", "with-json"] }
+sea-orm = { version = "~2.0.0-rc", default-features = false, features = ["seaography", "with-json"] }
 itertools = { version = "0.12.0" }
 heck = { version = "0.4.1" }
 thiserror = { version = "1.0.44" }
@@ -39,6 +39,6 @@ with-postgres-array = ["sea-orm/postgres-array"]
 field-snake-case = []
 field-camel-case = []
 
-# [patch.crates-io]
-# sea-orm = { git = "https://github.com/SeaQL/sea-orm" }
-# sea-orm-migration = { git = "https://github.com/SeaQL/sea-orm" }
+[patch.crates-io]
+sea-orm = { git = "https://github.com/SeaQL/sea-orm", branch = "master" }
+sea-orm-migration = { git = "https://github.com/SeaQL/sea-orm", branch = "master" }

README.md

@@ -37,6 +37,7 @@
 
 |                        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)        |
 
 ## Quick start - ready to serve in 3 minutes!

cli/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "seaography-cli"
-version = "1.1.4"
-edition = "2021"
-rust-version = "1.70"
+version = "2.0.0-rc.1"
+edition = "2024"
+rust-version = "1.85.0"
 authors = ["Panagiotis Karatakis <[email protected]>"]
 description = "🧭 A GraphQL framework and code generator for SeaORM"
 license = "MIT OR Apache-2.0"
@@ -15,5 +15,5 @@ categories = ["database"]
 [dependencies]
 async-std = { version = "1.12.0", features = [ "attributes", "tokio1" ] }
 clap = { version = "4.3.19", features = ["derive"] }
-seaography-generator = { version = "~1.1.4", path = "../generator" }
+seaography-generator = { version = "~2.0.0-rc.1", path = "../generator" }
 url = "2.4.0"

examples/mysql/Cargo.toml

@@ -1,20 +1,21 @@
 [package]
-edition = "2021"
+edition = "2024"
+rust-version = "1.85.0"
 name = "seaography-mysql-example"
-version = "1.1.4"
+version = "2.0.0-rc.1"
 
 [dependencies]
 axum = { version = "0.7" }
 async-graphql-axum = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.5", features = ["sqlx-mysql", "runtime-async-std-native-tls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["sqlx-mysql", "runtime-async-std-native-tls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }
 
 [dependencies.seaography]
 path = "../../"
-version = "~1.1.4" # seaography version
+version = "~2.0.0-rc.1" # seaography version
 features = ["with-decimal", "with-chrono"]
 
 [dev-dependencies]

examples/mysql/src/main.rs

@@ -1,9 +1,9 @@
-use async_graphql::http::{playground_source, GraphQLPlaygroundConfig};
+use async_graphql::http::{GraphQLPlaygroundConfig, playground_source};
 use async_graphql_axum::GraphQL;
 use axum::{
+    Router,
     response::{self, IntoResponse},
     routing::get,
-    Router,
 };
 use dotenv::dotenv;
 use sea_orm::Database;

examples/mysql/src/query_root.rs

@@ -1,7 +1,7 @@
 use crate::entities::*;
 use async_graphql::dynamic::*;
 use sea_orm::DatabaseConnection;
-use seaography::{async_graphql, lazy_static, Builder, BuilderContext};
+use seaography::{Builder, BuilderContext, async_graphql, lazy_static};
 
 lazy_static::lazy_static! { static ref CONTEXT : BuilderContext = BuilderContext :: default () ; }
 

examples/mysql/tests/guard_mutation_tests.rs

@@ -1,8 +1,8 @@
 use std::collections::BTreeMap;
 
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::{Database, DatabaseConnection};
-use seaography::{async_graphql, lazy_static, Builder, BuilderContext, FnGuard, GuardsConfig};
+use seaography::{Builder, BuilderContext, FnGuard, GuardsConfig, async_graphql, lazy_static};
 use seaography_mysql_example::entities::*;
 
 lazy_static::lazy_static! {

examples/mysql/tests/guard_tests.rs

@@ -1,10 +1,10 @@
 use std::collections::BTreeMap;
 
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::{Database, DatabaseConnection, RelationTrait};
 use seaography::{
-    async_graphql, lazy_static, Builder, BuilderContext, EntityObjectRelationBuilder,
-    EntityObjectViaRelationBuilder, FnGuard, GuardsConfig,
+    Builder, BuilderContext, EntityObjectRelationBuilder, EntityObjectViaRelationBuilder, FnGuard,
+    GuardsConfig, async_graphql, lazy_static,
 };
 
 lazy_static::lazy_static! {

examples/mysql/tests/mutation_tests.rs

@@ -1,4 +1,4 @@
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::Database;
 use seaography::async_graphql;
 

examples/mysql/tests/query_tests.rs

@@ -1,4 +1,4 @@
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::Database;
 use seaography::async_graphql;
 

examples/postgres/Cargo.toml

@@ -1,20 +1,21 @@
 [package]
-edition = "2021"
+edition = "2024"
+rust-version = "1.85.0"
 name = "seaography-postgres-example"
-version = "1.1.4"
+version = "2.0.0-rc.1"
 
 [dependencies]
 poem = { version = "3.0" }
 async-graphql-poem = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.5", features = ["sqlx-postgres", "runtime-async-std-native-tls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["sqlx-postgres", "runtime-async-std-native-tls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }
 
 [dependencies.seaography]
 path = "../../"
-version = "~1.1.4" # seaography version
+version = "~2.0.0-rc.1" # seaography version
 features = ["with-decimal", "with-chrono", "with-postgres-array"]
 
 [dev-dependencies]

examples/postgres/src/main.rs

@@ -1,7 +1,7 @@
-use async_graphql::http::{playground_source, GraphQLPlaygroundConfig};
+use async_graphql::http::{GraphQLPlaygroundConfig, playground_source};
 use async_graphql_poem::GraphQL;
 use dotenv::dotenv;
-use poem::{get, handler, listener::TcpListener, web::Html, IntoResponse, Route, Server};
+use poem::{IntoResponse, Route, Server, get, handler, listener::TcpListener, web::Html};
 use sea_orm::Database;
 use seaography::{async_graphql, lazy_static};
 use std::env;

examples/postgres/src/query_root.rs

@@ -1,7 +1,7 @@
 use crate::entities::*;
 use async_graphql::dynamic::*;
 use sea_orm::DatabaseConnection;
-use seaography::{async_graphql, lazy_static, Builder, BuilderContext};
+use seaography::{Builder, BuilderContext, async_graphql, lazy_static};
 
 lazy_static::lazy_static! { static ref CONTEXT : BuilderContext = BuilderContext :: default () ; }
 

examples/postgres/tests/guard_mutation_tests.rs

@@ -1,8 +1,8 @@
 use std::collections::BTreeMap;
 
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::{Database, DatabaseConnection};
-use seaography::{async_graphql, lazy_static, Builder, BuilderContext, FnGuard, GuardsConfig};
+use seaography::{Builder, BuilderContext, FnGuard, GuardsConfig, async_graphql, lazy_static};
 use seaography_postgres_example::entities::*;
 
 lazy_static::lazy_static! {

examples/postgres/tests/guard_tests.rs

@@ -1,10 +1,10 @@
 use std::collections::BTreeMap;
 
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::{Database, DatabaseConnection, RelationTrait};
 use seaography::{
-    async_graphql, lazy_static, Builder, BuilderContext, EntityObjectRelationBuilder,
-    EntityObjectViaRelationBuilder, FnGuard, GuardsConfig,
+    Builder, BuilderContext, EntityObjectRelationBuilder, EntityObjectViaRelationBuilder, FnGuard,
+    GuardsConfig, async_graphql, lazy_static,
 };
 
 lazy_static::lazy_static! {

examples/postgres/tests/mutation_tests.rs

@@ -1,4 +1,4 @@
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::Database;
 use seaography::async_graphql;
 

examples/postgres/tests/query_tests.rs

@@ -1,4 +1,4 @@
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::Database;
 use seaography::async_graphql;
 

examples/sqlite/Cargo.toml

@@ -1,20 +1,21 @@
 [package]
-edition = "2021"
+edition = "2024"
+rust-version = "1.85.0"
 name = "seaography-sqlite-example"
-version = "1.1.4"
+version = "2.0.0-rc.1"
 
 [dependencies]
 actix-web = { version = "4.5", default-features = false, features = ["macros"] }
 async-graphql-actix-web = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.5", features = ["sqlx-sqlite", "runtime-async-std-rustls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["sqlx-sqlite", "runtime-async-std-rustls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }
 
 [dependencies.seaography]
 path = "../../"
-version = "~1.1.4" # seaography version
+version = "~2.0.0-rc.1" # seaography version
 features = ["with-decimal", "with-chrono"]
 
 [dev-dependencies]

examples/sqlite/src/main.rs

@@ -1,7 +1,7 @@
-use actix_web::{guard, web, web::Data, App, HttpResponse, HttpServer, Result};
+use actix_web::{App, HttpResponse, HttpServer, Result, guard, web, web::Data};
 use async_graphql::{
     dynamic::*,
-    http::{playground_source, GraphQLPlaygroundConfig},
+    http::{GraphQLPlaygroundConfig, playground_source},
 };
 use async_graphql_actix_web::{GraphQLRequest, GraphQLResponse};
 use dotenv::dotenv;

examples/sqlite/src/query_root.rs

@@ -1,7 +1,7 @@
 use crate::entities::*;
 use async_graphql::dynamic::*;
 use sea_orm::DatabaseConnection;
-use seaography::{async_graphql, lazy_static, Builder, BuilderContext};
+use seaography::{Builder, BuilderContext, async_graphql, lazy_static};
 
 lazy_static::lazy_static! { static ref CONTEXT : BuilderContext = BuilderContext :: default () ; }
 

examples/sqlite/tests/guard_mutation_tests.rs

@@ -1,8 +1,8 @@
 use std::collections::BTreeMap;
 
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::{Database, DatabaseConnection};
-use seaography::{async_graphql, lazy_static, Builder, BuilderContext, FnGuard, GuardsConfig};
+use seaography::{Builder, BuilderContext, FnGuard, GuardsConfig, async_graphql, lazy_static};
 use seaography_sqlite_example::entities::*;
 
 lazy_static::lazy_static! {

examples/sqlite/tests/guard_tests.rs

@@ -1,10 +1,10 @@
 use std::collections::BTreeMap;
 
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::{Database, DatabaseConnection, RelationTrait};
 use seaography::{
-    async_graphql, lazy_static, Builder, BuilderContext, EntityObjectRelationBuilder,
-    EntityObjectViaRelationBuilder, FnGuard, GuardsConfig,
+    Builder, BuilderContext, EntityObjectRelationBuilder, EntityObjectViaRelationBuilder, FnGuard,
+    GuardsConfig, async_graphql, lazy_static,
 };
 
 lazy_static::lazy_static! {

examples/sqlite/tests/mutation_tests.rs

@@ -1,4 +1,4 @@
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::Database;
 use seaography::async_graphql;
 

examples/sqlite/tests/query_tests.rs

@@ -1,4 +1,4 @@
-use async_graphql::{dynamic::*, Response};
+use async_graphql::{Response, dynamic::*};
 use sea_orm::Database;
 use seaography::async_graphql;
 

generator/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "seaography-generator"
-version = "1.1.4"
-edition = "2021"
-rust-version = "1.70"
+version = "2.0.0-rc.1"
+edition = "2024"
+rust-version = "1.85.0"
 authors = ["Panagiotis Karatakis <[email protected]>"]
 description = "🧭 A GraphQL framework and code generator for SeaORM"
 license = "MIT OR Apache-2.0"

generator/src/templates/actix_cargo.toml

@@ -1,13 +1,14 @@
 [package]
-edition = "2021"
+edition = "2024"
+rust-version = "1.85.0"
 name = "<seaography-package-name>"
 version = "0.1.0"
 
 [dependencies]
 actix-web = { version = "4.5", default-features = false, features = ["macros"] }
 async-graphql-actix-web = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.5", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }

generator/src/templates/axum_cargo.toml

@@ -1,13 +1,14 @@
 [package]
-edition = "2021"
+edition = "2024"
+rust-version = "1.85.0"
 name = "<seaography-package-name>"
 version = "0.1.0"
 
 [dependencies]
 axum = { version = "0.7" }
 async-graphql-axum = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.5", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }

generator/src/templates/poem_cargo.toml

@@ -1,13 +1,14 @@
 [package]
-edition = "2021"
+edition = "2024"
+rust-version = "1.85.0"
 name = "<seaography-package-name>"
 version = "0.1.0"
 
 [dependencies]
 poem = { version = "3.0" }
 async-graphql-poem = { version = "7.0" }
 dotenv = "0.15.0"
-sea-orm = { version = "~1.1.5", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
+sea-orm = { version = "~2.0.0-rc", features = ["<seaography-sql-library>", "runtime-async-std-native-tls", "seaography"] }
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.37" }
 tracing-subscriber = { version = "0.3.17" }