Update examples

SeaQL · Sep 11, 2022 · 1d001ab · 1d001ab
1 parent 5af8d94
commit 1d001ab
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 42 deletions.
diff --git a/examples/mysql/Cargo.toml b/examples/mysql/Cargo.toml
@@ -7,15 +7,15 @@ version = '0.1.0'
 async-graphql = { version = "4.0.10", features = ["decimal", "chrono", "dataloader"] }
 async-graphql-poem = { version = "4.0.10" }
 async-trait = { version = "0.1.53" }
+dotenv = "0.15.0"
 heck = { version = "0.4.0" }
 itertools = { version = "0.10.3" }
 poem = { version = "1.3.29" }
-sea-orm = { version = "0.7.0", features = ["sqlx-mysql", "runtime-async-std-native-tls"] }
-seaography = { path = "../../", features = [ "with-decimal", "with-chrono" ] } # TODO before production place version here
+sea-orm = { version = "^0.9", features = ["sqlx-mysql", "runtime-async-std-native-tls"] }
+seaography = { version = "^0.1", path = "../../", features = [ "with-decimal", "with-chrono" ] } # TODO before production place version here
 tokio = { version = "1.17.0", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.34" }
 tracing-subscriber = { version = "0.3.11" }
-dotenv = "0.15.0"
 
 [dev-dependencies]
 serde_json = { version = '1.0.82' }

diff --git a/examples/mysql/README.md b/examples/mysql/README.md
@@ -6,10 +6,3 @@
 2. `mysql -uroot -h 127.0.0.1 sakila < sakila-schema.sql`
 3. `mysql -uroot -h 127.0.0.1 sakila < sakila-data.sql`
 4. `cargo run`
-
-
-
-### Troubleshooting
-
-#### Different database username and password
-Replace `root:root` with `username:password` in src/main.rs
diff --git a/examples/mysql/src/entities/customer.rs b/examples/mysql/src/entities/customer.rs
@@ -42,10 +42,10 @@ pub enum Relation {
         on_delete = "Restrict"
     )]
     Store,
-    #[sea_orm(has_many = "super::rental::Entity")]
-    Rental,
     #[sea_orm(has_many = "super::payment::Entity")]
     Payment,
+    #[sea_orm(has_many = "super::rental::Entity")]
+    Rental,
 }
 
 impl Related<super::address::Entity> for Entity {
@@ -60,15 +60,15 @@ impl Related<super::store::Entity> for Entity {
     }
 }
 
-impl Related<super::rental::Entity> for Entity {
+impl Related<super::payment::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::Rental.def()
+        Relation::Payment.def()
     }
 }
 
-impl Related<super::payment::Entity> for Entity {
+impl Related<super::rental::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::Payment.def()
+        Relation::Rental.def()
     }
 }
 

diff --git a/examples/mysql/src/entities/film.rs b/examples/mysql/src/entities/film.rs
@@ -18,7 +18,6 @@ pub struct Model {
     pub title: String,
     #[sea_orm(column_type = "Text", nullable)]
     pub description: Option<String>,
-    #[sea_orm(column_type = "Custom(\"YEAR\".to_owned())", nullable)]
     pub release_year: Option<String>,
     pub language_id: u8,
     pub original_language_id: Option<u8>,

diff --git a/examples/mysql/src/entities/staff.rs b/examples/mysql/src/entities/staff.rs
@@ -44,10 +44,10 @@ pub enum Relation {
         on_delete = "Restrict"
     )]
     Store,
-    #[sea_orm(has_many = "super::rental::Entity")]
-    Rental,
     #[sea_orm(has_many = "super::payment::Entity")]
     Payment,
+    #[sea_orm(has_many = "super::rental::Entity")]
+    Rental,
 }
 
 impl Related<super::address::Entity> for Entity {
@@ -62,15 +62,15 @@ impl Related<super::store::Entity> for Entity {
     }
 }
 
-impl Related<super::rental::Entity> for Entity {
+impl Related<super::payment::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::Rental.def()
+        Relation::Payment.def()
     }
 }
 
-impl Related<super::payment::Entity> for Entity {
+impl Related<super::rental::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::Payment.def()
+        Relation::Rental.def()
     }
 }
 

diff --git a/examples/mysql/src/query_root.rs b/examples/mysql/src/query_root.rs
@@ -1,18 +1,18 @@
 #[derive(Debug, seaography::macros::QueryRoot)]
-#[seaography(entity = "crate::entities::address")]
-#[seaography(entity = "crate::entities::film_actor")]
+#[seaography(entity = "crate::entities::staff")]
 #[seaography(entity = "crate::entities::film_category")]
-#[seaography(entity = "crate::entities::store")]
-#[seaography(entity = "crate::entities::category")]
+#[seaography(entity = "crate::entities::inventory")]
 #[seaography(entity = "crate::entities::customer")]
+#[seaography(entity = "crate::entities::city")]
+#[seaography(entity = "crate::entities::film_actor")]
+#[seaography(entity = "crate::entities::category")]
+#[seaography(entity = "crate::entities::address")]
+#[seaography(entity = "crate::entities::store")]
+#[seaography(entity = "crate::entities::film")]
 #[seaography(entity = "crate::entities::language")]
+#[seaography(entity = "crate::entities::actor")]
 #[seaography(entity = "crate::entities::payment")]
-#[seaography(entity = "crate::entities::staff")]
-#[seaography(entity = "crate::entities::film")]
 #[seaography(entity = "crate::entities::rental")]
-#[seaography(entity = "crate::entities::country")]
 #[seaography(entity = "crate::entities::film_text")]
-#[seaography(entity = "crate::entities::inventory")]
-#[seaography(entity = "crate::entities::actor")]
-#[seaography(entity = "crate::entities::city")]
+#[seaography(entity = "crate::entities::country")]
 pub struct QueryRoot;
diff --git a/examples/sqlite/Cargo.toml b/examples/sqlite/Cargo.toml
@@ -7,15 +7,15 @@ version = '0.1.0'
 async-graphql = { version = "4.0.10", features = ["decimal", "chrono", "dataloader"] }
 async-graphql-poem = { version = "4.0.10" }
 async-trait = { version = "0.1.53" }
+dotenv = "0.15.0"
 heck = { version = "0.4.0" }
 itertools = { version = "0.10.3" }
 poem = { version = "1.3.29" }
-sea-orm = { version = "0.7.0", features = ["sqlx-sqlite", "runtime-async-std-native-tls"] }
-seaography = { path = "../../", features = [ "with-decimal", "with-chrono" ] } # TODO before production place version here
+sea-orm = { version = "^0.9", features = ["sqlx-sqlite", "runtime-async-std-native-tls"] }
+seaography = { version = "^0.1", path = "../../", features = [ "with-decimal", "with-chrono" ] } # TODO before production place version here
 tokio = { version = "1.17.0", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.34" }
 tracing-subscriber = { version = "0.3.11" }
-dotenv = "0.15.0"
 
 [dev-dependencies]
 serde_json = { version = '1.0.82' }

diff --git a/examples/sqlite/src/query_root.rs b/examples/sqlite/src/query_root.rs
@@ -1,13 +1,13 @@
 #[derive(Debug, seaography::macros::QueryRoot)]
-#[seaography(entity = "crate::entities::customers")]
+#[seaography(entity = "crate::entities::invoices")]
+#[seaography(entity = "crate::entities::artists")]
 #[seaography(entity = "crate::entities::albums")]
+#[seaography(entity = "crate::entities::playlist_track")]
+#[seaography(entity = "crate::entities::customers")]
 #[seaography(entity = "crate::entities::invoice_items")]
-#[seaography(entity = "crate::entities::playlists")]
-#[seaography(entity = "crate::entities::genres")]
-#[seaography(entity = "crate::entities::artists")]
 #[seaography(entity = "crate::entities::media_types")]
-#[seaography(entity = "crate::entities::playlist_track")]
-#[seaography(entity = "crate::entities::invoices")]
 #[seaography(entity = "crate::entities::employees")]
 #[seaography(entity = "crate::entities::tracks")]
+#[seaography(entity = "crate::entities::genres")]
+#[seaography(entity = "crate::entities::playlists")]
 pub struct QueryRoot;