sea-orm update for ci

salvo-rs · Sep 20, 2022 · 9524d95 · 9524d95
1 parent 5f1eeb8
commit 9524d95
Show file tree

Hide file tree

Showing 23 changed files with 11 additions and 47 deletions.
diff --git a/examples/seaorm/Cargo.toml → examples/db-sea-orm/Cargo.toml b/examples/seaorm/Cargo.toml → examples/db-sea-orm/Cargo.toml
@@ -1,11 +1,8 @@
 [package]
-name = "sea-orm-salvo-example"
+name = "example-db-sea-orm"
 version = "0.1.0"
 edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-[workspace]
-members = [".", "entity", "migration"]
+publish = false
 
 [dependencies]
 tokio = { version = "1.21.1", features = ["macros", "rt-multi-thread"] }
@@ -15,12 +12,12 @@ tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 serde = { version = "1.0.144", features = ["derive"] }
 tera = "1.17.1"
 dotenv = "0.15"
-entity = { path = "entity" }
-migration = { path = "migration" }
 sea-orm = { version = "0.9.2", features = [
   "debug-print",
   "runtime-tokio-native-tls",
   "sqlx-sqlite",
   # "sqlx-postgres",
   # "sqlx-mysql",
 ] }
+async-std = { version = "^1", features = ["attributes", "tokio1"] }
+sea-orm-migration = "0.9.2"
diff --git a/examples/seaorm/README.md → examples/db-sea-orm/README.md b/examples/seaorm/README.md → examples/db-sea-orm/README.md
@@ -10,4 +10,4 @@
 
 3. Execute `cargo run` to start the server
 
-4. Visit [localhost:8000](http://localhost:8000) in browser after seeing the `server started` line
+4. Visit [localhost:7878](http://localhost:7878) in browser after seeing the `server started` line
diff --git a/examples/seaorm/Screenshot.png → examples/db-sea-orm/Screenshot.png b/examples/seaorm/Screenshot.png → examples/db-sea-orm/Screenshot.png
diff --git a/examples/seaorm/entity/src/lib.rs → examples/db-sea-orm/src/entity/mod.rs b/examples/seaorm/entity/src/lib.rs → examples/db-sea-orm/src/entity/mod.rs
diff --git a/examples/seaorm/entity/src/post.rs → examples/db-sea-orm/src/entity/post.rs b/examples/seaorm/entity/src/post.rs → examples/db-sea-orm/src/entity/post.rs
diff --git a/examples/seaorm/src/main.rs → examples/db-sea-orm/src/main.rs b/examples/seaorm/src/main.rs → examples/db-sea-orm/src/main.rs
@@ -9,6 +9,9 @@ use salvo::writer::Text;
 use sea_orm::{entity::*, query::*, DatabaseConnection};
 use tera::Tera;
 
+mod entity;
+mod migration;
+
 const DEFAULT_POSTS_PER_PAGE: u64 = 5;
 type Result<T> = std::result::Result<T, StatusError>;
 
@@ -156,15 +159,13 @@ async fn main() {
     std::env::set_var("RUST_LOG", "debug");
     tracing_subscriber::fmt::init();
 
-    // get env vars
-    dotenv::dotenv().ok();
-    let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file");
+    let db_url = "sqlite::memory:";
     let host = env::var("HOST").unwrap_or("0.0.0.0".to_owned());
-    let port = env::var("PORT").unwrap_or("8080".to_owned());
+    let port = env::var("PORT").unwrap_or("7878".to_owned());
     let server_url = format!("{}:{}", host, port);
 
     // create post table if not exists
-    let conn = sea_orm::Database::connect(&db_url).await.unwrap();
+    let conn = sea_orm::Database::connect(db_url).await.unwrap();
     Migrator::up(&conn, None).await.unwrap();
     let templates = Tera::new(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*")).unwrap();
     let state = AppState { templates, conn };

diff --git a/examples/seaorm/migration/README.md → examples/db-sea-orm/src/migration/README.md b/examples/seaorm/migration/README.md → examples/db-sea-orm/src/migration/README.md
diff --git a/...src/m20220120_000001_create_post_table.rs → ...ion/m20220120_000001_create_post_table.rs b/...src/m20220120_000001_create_post_table.rs → ...ion/m20220120_000001_create_post_table.rs
diff --git a/examples/seaorm/migration/src/main.rs → examples/db-sea-orm/src/migration/main.rs b/examples/seaorm/migration/src/main.rs → examples/db-sea-orm/src/migration/main.rs
diff --git a/examples/seaorm/migration/src/lib.rs → examples/db-sea-orm/src/migration/mod.rs b/examples/seaorm/migration/src/lib.rs → examples/db-sea-orm/src/migration/mod.rs
diff --git a/examples/seaorm/static/css/normalize.css → examples/db-sea-orm/static/css/normalize.css b/examples/seaorm/static/css/normalize.css → examples/db-sea-orm/static/css/normalize.css
diff --git a/examples/seaorm/static/css/skeleton.css → examples/db-sea-orm/static/css/skeleton.css b/examples/seaorm/static/css/skeleton.css → examples/db-sea-orm/static/css/skeleton.css
diff --git a/examples/seaorm/static/css/style.css → examples/db-sea-orm/static/css/style.css b/examples/seaorm/static/css/style.css → examples/db-sea-orm/static/css/style.css
diff --git a/examples/seaorm/static/images/favicon.png → ...ples/db-sea-orm/static/images/favicon.png b/examples/seaorm/static/images/favicon.png → ...ples/db-sea-orm/static/images/favicon.png
diff --git a/examples/seaorm/templates/edit.html.tera → examples/db-sea-orm/templates/edit.html.tera b/examples/seaorm/templates/edit.html.tera → examples/db-sea-orm/templates/edit.html.tera
diff --git a/...ples/seaorm/templates/error/404.html.tera → .../db-sea-orm/templates/error/404.html.tera b/...ples/seaorm/templates/error/404.html.tera → .../db-sea-orm/templates/error/404.html.tera
diff --git a/examples/seaorm/templates/index.html.tera → ...ples/db-sea-orm/templates/index.html.tera b/examples/seaorm/templates/index.html.tera → ...ples/db-sea-orm/templates/index.html.tera
diff --git a/examples/seaorm/templates/layout.html.tera → ...les/db-sea-orm/templates/layout.html.tera b/examples/seaorm/templates/layout.html.tera → ...les/db-sea-orm/templates/layout.html.tera
diff --git a/examples/seaorm/templates/new.html.tera → examples/db-sea-orm/templates/new.html.tera b/examples/seaorm/templates/new.html.tera → examples/db-sea-orm/templates/new.html.tera
diff --git a/examples/seaorm/.env b/examples/seaorm/.env
diff --git a/examples/seaorm/.gitignore b/examples/seaorm/.gitignore
diff --git a/examples/seaorm/entity/Cargo.toml b/examples/seaorm/entity/Cargo.toml
diff --git a/examples/seaorm/migration/Cargo.toml b/examples/seaorm/migration/Cargo.toml