Merge branch 'master' into pulls/471
This commit is contained in:
Billy Chan
commit
f3a7a1398a
14
.github/workflows/rust.yml
vendored
14
.github/workflows/rust.yml
vendored
@ -126,7 +126,7 @@ jobs:
|
||||
runs-on: ubuntu-20.04
|
||||
strategy:
|
||||
matrix:
|
||||
runtime: [async-std, actix, tokio]
|
||||
runtime: [async-std]
|
||||
tls: [native-tls, rustls]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
@ -165,7 +165,7 @@ jobs:
|
||||
runs-on: ubuntu-20.04
|
||||
strategy:
|
||||
matrix:
|
||||
runtime: [async-std, actix, tokio]
|
||||
runtime: [actix]
|
||||
tls: [native-tls, rustls]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
@ -204,7 +204,7 @@ jobs:
|
||||
runs-on: ubuntu-20.04
|
||||
strategy:
|
||||
matrix:
|
||||
runtime: [async-std, actix, tokio]
|
||||
runtime: [tokio]
|
||||
tls: [native-tls, rustls]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
@ -293,7 +293,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-latest]
|
||||
path: [basic, actix_example, actix4_example, axum_example, rocket_example]
|
||||
path: [basic, actix_example, actix4_example, axum_example, rocket_example, poem_example]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
@ -356,7 +356,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
runtime: [async-std, actix, tokio]
|
||||
runtime: [async-std]
|
||||
tls: [native-tls, rustls]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
@ -400,7 +400,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
version: [8.0, 5.7]
|
||||
runtime: [async-std, actix, tokio]
|
||||
runtime: [actix]
|
||||
tls: [native-tls]
|
||||
services:
|
||||
mysql:
|
||||
@ -461,7 +461,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
version: [10.6, 10.5, 10.4]
|
||||
runtime: [async-std, actix, tokio]
|
||||
runtime: [actix]
|
||||
tls: [native-tls]
|
||||
services:
|
||||
mysql:
|
||||
|
||||
34
CHANGELOG.md
34
CHANGELOG.md
@ -5,6 +5,40 @@ All notable changes to this project will be documented in this file.
|
||||
The format is based on [Keep a Changelog](http://keepachangelog.com/)
|
||||
and this project adheres to [Semantic Versioning](http://semver.org/).
|
||||
|
||||
## 0.6.0 - 2022-02-07
|
||||
|
||||
### New Features
|
||||
* Migration Support by @billy1624 in https://github.com/SeaQL/sea-orm/pull/335
|
||||
* Support `DateTime<Utc>` & `DateTime<Local>` by @billy1624 in https://github.com/SeaQL/sea-orm/pull/489
|
||||
* Add `max_lifetime` connection option by @billy1624 in https://github.com/SeaQL/sea-orm/pull/493
|
||||
|
||||
### Enhancements
|
||||
* Model with Generics by @billy1624 in https://github.com/SeaQL/sea-orm/pull/400
|
||||
* Add Poem example by @sunli829 in https://github.com/SeaQL/sea-orm/pull/446
|
||||
* Codegen `column_name` proc_macro attribute by @billy1624 in https://github.com/SeaQL/sea-orm/pull/433
|
||||
* Easy joins with MockDatabase #447 by @cemoktra in https://github.com/SeaQL/sea-orm/pull/455
|
||||
|
||||
### Bug Fixes
|
||||
* CLI allow generate entity with url without password by @billy1624 in https://github.com/SeaQL/sea-orm/pull/436
|
||||
* Support up to 6-ary composite primary key by @billy1624 in https://github.com/SeaQL/sea-orm/pull/423
|
||||
* Fix FromQueryResult when Result is redefined by @tasn in https://github.com/SeaQL/sea-orm/pull/495
|
||||
* Remove `r#` prefix when deriving `FromQueryResult` by @smrtrfszm in https://github.com/SeaQL/sea-orm/pull/494
|
||||
|
||||
### Breaking Changes
|
||||
* Name conflict of foreign key constraints when two entities have more than one foreign keys by @billy1624 in https://github.com/SeaQL/sea-orm/pull/417
|
||||
|
||||
### Fixed Issues
|
||||
* Is it possible to have 4 values Composite Key? https://github.com/SeaQL/sea-orm/issues/352
|
||||
* Support `DateTime<Utc>` & `DateTime<Local>` https://github.com/SeaQL/sea-orm/issues/381
|
||||
* Codegen `column_name` proc_macro attribute if column name isn't in snake case https://github.com/SeaQL/sea-orm/issues/395
|
||||
* Model with Generics https://github.com/SeaQL/sea-orm/issues/402
|
||||
* Foreign key constraint collision when multiple keys exist between the same two tables https://github.com/SeaQL/sea-orm/issues/405
|
||||
* sea-orm-cli passwordless database user causes "No password was found in the database url" error https://github.com/SeaQL/sea-orm/issues/435
|
||||
* Testing joins with MockDatabase https://github.com/SeaQL/sea-orm/issues/447
|
||||
* Surface max_lifetime connection option https://github.com/SeaQL/sea-orm/issues/475
|
||||
|
||||
**Full Changelog**: https://github.com/SeaQL/sea-orm/compare/0.5.0...0.6.0
|
||||
|
||||
## 0.5.0 - 2022-01-01
|
||||
|
||||
### Fixed Issues
|
||||
|
||||
22
COMMUNITY.md
22
COMMUNITY.md
@ -4,4 +4,24 @@
|
||||
|
||||
If you have built an app using SeaORM and want to showcase it, feel free to open a PR and add it to the list below!
|
||||
|
||||
[Caido](https://caido.io/) | A lightweight web security auditing toolkit
|
||||
### Startups
|
||||
|
||||
- [Caido](https://caido.io/) | A lightweight web security auditing toolkit
|
||||
- [Svix](https://www.svix.com/) ([repository](https://github.com/svix/svix-webhooks)) | The enterprise ready webhooks service
|
||||
|
||||
### Open Source Projects
|
||||
|
||||
- [Wikijump](https://github.com/scpwiki/wikijump) ([repository](https://github.com/scpwiki/wikijump/tree/develop/deepwell)) | API service for Wikijump, a fork of Wikidot
|
||||
- [aeroFans](https://github.com/naryand/aerofans) | Full stack forum-like social media platform in Rust and WebAssembly
|
||||
- [thrpg](https://github.com/thrpg/thrpg) | Touhou Project's secondary creative games
|
||||
- [Adta](https://github.com/aaronleopold/adta) | Adta is **A**nother **D**amn **T**odo **A**pp, fun little side project
|
||||
- [Axum-Book-Management](https://github.com/lz1998/axum-book-management) | CRUD system of book-management with ORM and JWT for educational purposes
|
||||
- [mediarepo](https://mediarepo.trivernis.dev) ([repository](https://github.com/Trivernis/mediarepo)) | A tag-based media management application
|
||||
- [THUBurrow](https://thuburrow.com) ([repository](https://github.com/BobAnkh/THUBurrow)) | A campus forum built by Next.js and Rocket
|
||||
- [Backpack](https://github.com/JSH32/Backpack) | Open source self hosted file sharing platform on crack
|
||||
- [Stump](https://github.com/aaronleopold/stump) | A free and open source comics server with OPDS support
|
||||
- [awto](https://github.com/awto-rs/awto) | Awtomate your 🦀 microservices with awto
|
||||
- [tardis](https://github.com/ideal-world/tardis) | Elegant, Clean Rust development framework🛸
|
||||
- [mugen](https://github.com/koopa1338/mugen-dms) | DMS written in 🦀
|
||||
- [JinShu](https://github.com/gengteng/jinshu) | A cross-platform **I**nstant **M**essaging system written in 🦀
|
||||
- [rust-juniper-playground](https://github.com/Yama-Tomo/rust-juniper-playground) | juniper with SeaORM example
|
||||
|
||||
13
Cargo.toml
13
Cargo.toml
@ -3,7 +3,7 @@ members = [".", "sea-orm-macros", "sea-orm-codegen"]
|
||||
|
||||
[package]
|
||||
name = "sea-orm"
|
||||
version = "0.5.0"
|
||||
version = "0.6.0"
|
||||
authors = ["Chris Tsang <tyt2y7@gmail.com>"]
|
||||
edition = "2021"
|
||||
description = "🐚 An async & dynamic ORM for Rust"
|
||||
@ -14,7 +14,7 @@ categories = ["database"]
|
||||
keywords = ["async", "orm", "mysql", "postgres", "sqlite"]
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
features = ["default", "sqlx-all", "runtime-async-std-native-tls"]
|
||||
features = ["default", "sqlx-all", "mock", "runtime-async-std-native-tls"]
|
||||
rustdoc-args = ["--cfg", "docsrs"]
|
||||
|
||||
[lib]
|
||||
@ -29,8 +29,8 @@ futures = { version = "^0.3" }
|
||||
futures-util = { version = "^0.3" }
|
||||
tracing = { version = "0.1", features = ["log"] }
|
||||
rust_decimal = { version = "^1", optional = true }
|
||||
sea-orm-macros = { version = "^0.5.0", path = "sea-orm-macros", optional = true }
|
||||
sea-query = { version = "^0.20.0", features = ["thread-safe"] }
|
||||
sea-orm-macros = { version = "^0.6.0", path = "sea-orm-macros", optional = true }
|
||||
sea-query = { version = "^0.21.0", features = ["thread-safe"] }
|
||||
sea-strum = { version = "^0.23", features = ["derive", "sea-orm"] }
|
||||
serde = { version = "^1.0", features = ["derive"] }
|
||||
serde_json = { version = "^1", optional = true }
|
||||
@ -43,20 +43,19 @@ once_cell = "1.8"
|
||||
[dev-dependencies]
|
||||
smol = { version = "^1.2" }
|
||||
smol-potat = { version = "^1.1" }
|
||||
async-std = { version = "^1.9", features = ["attributes"] }
|
||||
async-std = { version = "^1.9", features = ["attributes", "tokio1"] }
|
||||
tokio = { version = "^1.6", features = ["full"] }
|
||||
actix-rt = { version = "2.2.0" }
|
||||
maplit = { version = "^1" }
|
||||
rust_decimal_macros = { version = "^1" }
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
sea-orm = { path = ".", features = ["debug-print"] }
|
||||
sea-orm = { path = ".", features = ["mock", "debug-print"] }
|
||||
pretty_assertions = { version = "^0.7" }
|
||||
|
||||
[features]
|
||||
debug-print = []
|
||||
default = [
|
||||
"macros",
|
||||
"mock",
|
||||
"with-json",
|
||||
"with-chrono",
|
||||
"with-rust_decimal",
|
||||
|
||||
@ -18,6 +18,9 @@
|
||||
|
||||
## Getting Started
|
||||
|
||||
[](https://GitHub.com/SeaQL/sea-orm/stargazers/)
|
||||
If you like what we do, consider starring, commenting, sharing and contributing!
|
||||
|
||||
[](https://discord.com/invite/uCPdDXzbdv)
|
||||
Join our Discord server to chat with others in the SeaQL community!
|
||||
|
||||
@ -26,6 +29,7 @@ Join our Discord server to chat with others in the SeaQL community!
|
||||
+ [Rocket Example](https://github.com/SeaQL/sea-orm/tree/master/examples/rocket_example)
|
||||
+ [Actix Example](https://github.com/SeaQL/sea-orm/tree/master/examples/actix_example)
|
||||
+ [Axum Example](https://github.com/SeaQL/sea-orm/tree/master/examples/axum_example)
|
||||
+ [Poem Example](https://github.com/SeaQL/sea-orm/tree/master/examples/poem_example)
|
||||
|
||||
## Features
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ cd sea-orm-cli
|
||||
sed -i 's/^version.*$/'"version = \"$1\"/" Cargo.toml
|
||||
sed -i 's/^sea-orm-codegen [^,]*,/sea-orm-codegen = { version = "\^'$1'",/' Cargo.toml
|
||||
git commit -am "sea-orm-cli $1"
|
||||
cargo publish
|
||||
# cargo publish
|
||||
cd ..
|
||||
sleep 30
|
||||
cd sea-orm-macros
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
HOST=127.0.0.1
|
||||
PORT=8000
|
||||
DATABASE_URL="mysql://root:@localhost/actix_example"
|
||||
DATABASE_URL="mysql://root:root@localhost/actix_example"
|
||||
|
||||
@ -6,6 +6,7 @@ edition = "2021"
|
||||
publish = false
|
||||
|
||||
[workspace]
|
||||
members = [".", "entity", "migration"]
|
||||
|
||||
[dependencies]
|
||||
actix-files = "0.6.0-beta.4"
|
||||
@ -19,14 +20,5 @@ dotenv = "0.15"
|
||||
listenfd = "0.3.3"
|
||||
serde = "1"
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
|
||||
[dependencies.sea-orm]
|
||||
path = "../../" # remove this line in your own project
|
||||
version = "^0.5.0"
|
||||
features = ["macros", "runtime-actix-native-tls", "debug-print"]
|
||||
default-features = false
|
||||
|
||||
[features]
|
||||
default = ["sqlx-mysql"]
|
||||
sqlx-mysql = ["sea-orm/sqlx-mysql"]
|
||||
sqlx-postgres = ["sea-orm/sqlx-postgres"]
|
||||
entity = { path = "entity" }
|
||||
migration = { path = "migration" }
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
|
||||
|
||||
# Actix 4 Beta with SeaORM example app
|
||||
|
||||
Edit `Cargo.toml` to use `sqlx-mysql` or `sqlx-postgres`.
|
||||
1. Modify the `DATABASE_URL` var in `.env` to point to your chosen database
|
||||
|
||||
```toml
|
||||
[features]
|
||||
default = ["sqlx-$DATABASE"]
|
||||
```
|
||||
1. Turn on the appropriate database feature for your chosen db in `entity/Cargo.toml` (the `"sqlx-mysql",` line)
|
||||
|
||||
Edit `.env` to point to your database.
|
||||
1. Execute `cargo run` to start the server
|
||||
|
||||
1. Visit [localhost:8000](http://localhost:8000) in browser
|
||||
|
||||
Run server with auto-reloading:
|
||||
|
||||
|
||||
BIN
examples/actix4_example/Screenshot.png
Normal file
BIN
examples/actix4_example/Screenshot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 604 KiB |
25
examples/actix4_example/entity/Cargo.toml
Normal file
25
examples/actix4_example/entity/Cargo.toml
Normal file
@ -0,0 +1,25 @@
|
||||
[package]
|
||||
name = "entity"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
[lib]
|
||||
name = "entity"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
|
||||
[dependencies.sea-orm]
|
||||
# path = "../../../" # remove this line in your own project
|
||||
version = "^0.6.0"
|
||||
features = [
|
||||
"macros",
|
||||
"debug-print",
|
||||
"runtime-actix-native-tls",
|
||||
"sqlx-mysql",
|
||||
# "sqlx-postgres",
|
||||
# "sqlx-sqlite",
|
||||
]
|
||||
default-features = false
|
||||
3
examples/actix4_example/entity/src/lib.rs
Normal file
3
examples/actix4_example/entity/src/lib.rs
Normal file
@ -0,0 +1,3 @@
|
||||
pub mod post;
|
||||
|
||||
pub use sea_orm;
|
||||
13
examples/actix4_example/migration/Cargo.toml
Normal file
13
examples/actix4_example/migration/Cargo.toml
Normal file
@ -0,0 +1,13 @@
|
||||
[package]
|
||||
name = "migration"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
[lib]
|
||||
name = "migration"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
sea-schema = { version = "^0.5.0", default-features = false, features = [ "migration", "debug-print" ] }
|
||||
entity = { path = "../entity" }
|
||||
37
examples/actix4_example/migration/README.md
Normal file
37
examples/actix4_example/migration/README.md
Normal file
@ -0,0 +1,37 @@
|
||||
# Running Migrator CLI
|
||||
|
||||
- Apply all pending migrations
|
||||
```sh
|
||||
cargo run
|
||||
```
|
||||
```sh
|
||||
cargo run -- up
|
||||
```
|
||||
- Apply first 10 pending migrations
|
||||
```sh
|
||||
cargo run -- up -n 10
|
||||
```
|
||||
- Rollback last applied migrations
|
||||
```sh
|
||||
cargo run -- down
|
||||
```
|
||||
- Rollback last 10 applied migrations
|
||||
```sh
|
||||
cargo run -- down -n 10
|
||||
```
|
||||
- Drop all tables from the database, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- fresh
|
||||
```
|
||||
- Rollback all applied migrations, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- refresh
|
||||
```
|
||||
- Rollback all applied migrations
|
||||
```sh
|
||||
cargo run -- reset
|
||||
```
|
||||
- Check the status of all migrations
|
||||
```sh
|
||||
cargo run -- status
|
||||
```
|
||||
12
examples/actix4_example/migration/src/lib.rs
Normal file
12
examples/actix4_example/migration/src/lib.rs
Normal file
@ -0,0 +1,12 @@
|
||||
pub use sea_schema::migration::prelude::*;
|
||||
|
||||
mod m20220120_000001_create_post_table;
|
||||
|
||||
pub struct Migrator;
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigratorTrait for Migrator {
|
||||
fn migrations() -> Vec<Box<dyn MigrationTrait>> {
|
||||
vec![Box::new(m20220120_000001_create_post_table::Migration)]
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
use entity::post::*;
|
||||
use sea_schema::migration::prelude::*;
|
||||
|
||||
pub struct Migration;
|
||||
|
||||
impl MigrationName for Migration {
|
||||
fn name(&self) -> &str {
|
||||
"m20220120_000001_create_post_table"
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigrationTrait for Migration {
|
||||
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
manager
|
||||
.create_table(
|
||||
Table::create()
|
||||
.table(Entity)
|
||||
.if_not_exists()
|
||||
.col(
|
||||
ColumnDef::new(Column::Id)
|
||||
.integer()
|
||||
.not_null()
|
||||
.auto_increment()
|
||||
.primary_key(),
|
||||
)
|
||||
.col(ColumnDef::new(Column::Title).string().not_null())
|
||||
.col(ColumnDef::new(Column::Text).string().not_null())
|
||||
.to_owned(),
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
manager
|
||||
.drop_table(Table::drop().table(Entity).to_owned())
|
||||
.await
|
||||
}
|
||||
}
|
||||
7
examples/actix4_example/migration/src/main.rs
Normal file
7
examples/actix4_example/migration/src/main.rs
Normal file
@ -0,0 +1,7 @@
|
||||
use migration::Migrator;
|
||||
use sea_schema::migration::*;
|
||||
|
||||
#[async_std::main]
|
||||
async fn main() {
|
||||
cli::run_cli(Migrator).await;
|
||||
}
|
||||
@ -3,17 +3,17 @@ use actix_web::{
|
||||
error, get, middleware, post, web, App, Error, HttpRequest, HttpResponse, HttpServer, Result,
|
||||
};
|
||||
|
||||
use entity::post;
|
||||
use entity::post::Entity as Post;
|
||||
use entity::sea_orm;
|
||||
use listenfd::ListenFd;
|
||||
use migration::{Migrator, MigratorTrait};
|
||||
use sea_orm::DatabaseConnection;
|
||||
use sea_orm::{entity::*, query::*};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::env;
|
||||
use tera::Tera;
|
||||
|
||||
mod post;
|
||||
pub use post::Entity as Post;
|
||||
mod setup;
|
||||
|
||||
const DEFAULT_POSTS_PER_PAGE: usize = 5;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
@ -92,7 +92,9 @@ async fn create(
|
||||
.await
|
||||
.expect("could not insert post");
|
||||
|
||||
Ok(HttpResponse::Found().append_header(("location", "/")).finish())
|
||||
Ok(HttpResponse::Found()
|
||||
.append_header(("location", "/"))
|
||||
.finish())
|
||||
}
|
||||
|
||||
#[get("/{id}")]
|
||||
@ -133,7 +135,9 @@ async fn update(
|
||||
.await
|
||||
.expect("could not edit post");
|
||||
|
||||
Ok(HttpResponse::Found().append_header(("location", "/")).finish())
|
||||
Ok(HttpResponse::Found()
|
||||
.append_header(("location", "/"))
|
||||
.finish())
|
||||
}
|
||||
|
||||
#[post("/delete/{id}")]
|
||||
@ -149,7 +153,9 @@ async fn delete(data: web::Data<AppState>, id: web::Path<i32>) -> Result<HttpRes
|
||||
|
||||
post.delete(conn).await.unwrap();
|
||||
|
||||
Ok(HttpResponse::Found().append_header(("location", "/")).finish())
|
||||
Ok(HttpResponse::Found()
|
||||
.append_header(("location", "/"))
|
||||
.finish())
|
||||
}
|
||||
|
||||
#[actix_web::main]
|
||||
@ -166,7 +172,7 @@ async fn main() -> std::io::Result<()> {
|
||||
|
||||
// create post table if not exists
|
||||
let conn = sea_orm::Database::connect(&db_url).await.unwrap();
|
||||
let _ = setup::create_post_table(&conn).await;
|
||||
Migrator::up(&conn, None).await.unwrap();
|
||||
let templates = Tera::new(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*")).unwrap();
|
||||
let state = AppState { templates, conn };
|
||||
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
use sea_orm::sea_query::{ColumnDef, TableCreateStatement};
|
||||
use sea_orm::{error::*, sea_query, ConnectionTrait, DbConn, ExecResult};
|
||||
|
||||
async fn create_table(db: &DbConn, stmt: &TableCreateStatement) -> Result<ExecResult, DbErr> {
|
||||
let builder = db.get_database_backend();
|
||||
db.execute(builder.build(stmt)).await
|
||||
}
|
||||
|
||||
pub async fn create_post_table(db: &DbConn) -> Result<ExecResult, DbErr> {
|
||||
let stmt = sea_query::Table::create()
|
||||
.table(super::post::Entity)
|
||||
.if_not_exists()
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Id)
|
||||
.integer()
|
||||
.not_null()
|
||||
.auto_increment()
|
||||
.primary_key(),
|
||||
)
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Title)
|
||||
.string()
|
||||
.not_null(),
|
||||
)
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Text)
|
||||
.string()
|
||||
.not_null(),
|
||||
)
|
||||
.to_owned();
|
||||
|
||||
create_table(db, &stmt).await
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
HOST=127.0.0.1
|
||||
PORT=8000
|
||||
DATABASE_URL="sql://root:@localhost/actix_example"
|
||||
DATABASE_URL="mysql://root:root@localhost/actix_example"
|
||||
@ -6,6 +6,7 @@ edition = "2021"
|
||||
publish = false
|
||||
|
||||
[workspace]
|
||||
members = [".", "entity", "migration"]
|
||||
|
||||
[dependencies]
|
||||
actix-http = "2"
|
||||
@ -19,14 +20,5 @@ dotenv = "0.15"
|
||||
listenfd = "0.3.3"
|
||||
serde = "1"
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
|
||||
[dependencies.sea-orm]
|
||||
path = "../../" # remove this line in your own project
|
||||
version = "^0.5.0"
|
||||
features = ["macros", "runtime-async-std-native-tls", "debug-print"]
|
||||
default-features = false
|
||||
|
||||
[features]
|
||||
default = ["sqlx-mysql"]
|
||||
sqlx-mysql = ["sea-orm/sqlx-mysql"]
|
||||
sqlx-postgres = ["sea-orm/sqlx-postgres"]
|
||||
entity = { path = "entity" }
|
||||
migration = { path = "migration" }
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
|
||||
|
||||
# Actix with SeaORM example app
|
||||
|
||||
Edit `Cargo.toml` to use `sqlx-mysql` or `sqlx-postgres`.
|
||||
1. Modify the `DATABASE_URL` var in `.env` to point to your chosen database
|
||||
|
||||
```toml
|
||||
[features]
|
||||
default = ["sqlx-$DATABASE"]
|
||||
```
|
||||
1. Turn on the appropriate database feature for your chosen db in `entity/Cargo.toml` (the `"sqlx-mysql",` line)
|
||||
|
||||
Edit `.env` to point to your database.
|
||||
1. Execute `cargo run` to start the server
|
||||
|
||||
1. Visit [localhost:8000](http://localhost:8000) in browser
|
||||
|
||||
Run server with auto-reloading:
|
||||
|
||||
|
||||
BIN
examples/actix_example/Screenshot.png
Normal file
BIN
examples/actix_example/Screenshot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 604 KiB |
25
examples/actix_example/entity/Cargo.toml
Normal file
25
examples/actix_example/entity/Cargo.toml
Normal file
@ -0,0 +1,25 @@
|
||||
[package]
|
||||
name = "entity"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
[lib]
|
||||
name = "entity"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
|
||||
[dependencies.sea-orm]
|
||||
# path = "../../../" # remove this line in your own project
|
||||
version = "^0.6.0"
|
||||
features = [
|
||||
"macros",
|
||||
"debug-print",
|
||||
"runtime-async-std-native-tls",
|
||||
"sqlx-mysql",
|
||||
# "sqlx-postgres",
|
||||
# "sqlx-sqlite",
|
||||
]
|
||||
default-features = false
|
||||
3
examples/actix_example/entity/src/lib.rs
Normal file
3
examples/actix_example/entity/src/lib.rs
Normal file
@ -0,0 +1,3 @@
|
||||
pub mod post;
|
||||
|
||||
pub use sea_orm;
|
||||
13
examples/actix_example/migration/Cargo.toml
Normal file
13
examples/actix_example/migration/Cargo.toml
Normal file
@ -0,0 +1,13 @@
|
||||
[package]
|
||||
name = "migration"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
[lib]
|
||||
name = "migration"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
sea-schema = { version = "^0.5.0", default-features = false, features = [ "migration", "debug-print" ] }
|
||||
entity = { path = "../entity" }
|
||||
37
examples/actix_example/migration/README.md
Normal file
37
examples/actix_example/migration/README.md
Normal file
@ -0,0 +1,37 @@
|
||||
# Running Migrator CLI
|
||||
|
||||
- Apply all pending migrations
|
||||
```sh
|
||||
cargo run
|
||||
```
|
||||
```sh
|
||||
cargo run -- up
|
||||
```
|
||||
- Apply first 10 pending migrations
|
||||
```sh
|
||||
cargo run -- up -n 10
|
||||
```
|
||||
- Rollback last applied migrations
|
||||
```sh
|
||||
cargo run -- down
|
||||
```
|
||||
- Rollback last 10 applied migrations
|
||||
```sh
|
||||
cargo run -- down -n 10
|
||||
```
|
||||
- Drop all tables from the database, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- fresh
|
||||
```
|
||||
- Rollback all applied migrations, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- refresh
|
||||
```
|
||||
- Rollback all applied migrations
|
||||
```sh
|
||||
cargo run -- reset
|
||||
```
|
||||
- Check the status of all migrations
|
||||
```sh
|
||||
cargo run -- status
|
||||
```
|
||||
12
examples/actix_example/migration/src/lib.rs
Normal file
12
examples/actix_example/migration/src/lib.rs
Normal file
@ -0,0 +1,12 @@
|
||||
pub use sea_schema::migration::prelude::*;
|
||||
|
||||
mod m20220120_000001_create_post_table;
|
||||
|
||||
pub struct Migrator;
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigratorTrait for Migrator {
|
||||
fn migrations() -> Vec<Box<dyn MigrationTrait>> {
|
||||
vec![Box::new(m20220120_000001_create_post_table::Migration)]
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
use entity::post::*;
|
||||
use sea_schema::migration::prelude::*;
|
||||
|
||||
pub struct Migration;
|
||||
|
||||
impl MigrationName for Migration {
|
||||
fn name(&self) -> &str {
|
||||
"m20220120_000001_create_post_table"
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigrationTrait for Migration {
|
||||
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
manager
|
||||
.create_table(
|
||||
Table::create()
|
||||
.table(Entity)
|
||||
.if_not_exists()
|
||||
.col(
|
||||
ColumnDef::new(Column::Id)
|
||||
.integer()
|
||||
.not_null()
|
||||
.auto_increment()
|
||||
.primary_key(),
|
||||
)
|
||||
.col(ColumnDef::new(Column::Title).string().not_null())
|
||||
.col(ColumnDef::new(Column::Text).string().not_null())
|
||||
.to_owned(),
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
manager
|
||||
.drop_table(Table::drop().table(Entity).to_owned())
|
||||
.await
|
||||
}
|
||||
}
|
||||
7
examples/actix_example/migration/src/main.rs
Normal file
7
examples/actix_example/migration/src/main.rs
Normal file
@ -0,0 +1,7 @@
|
||||
use migration::Migrator;
|
||||
use sea_schema::migration::*;
|
||||
|
||||
#[async_std::main]
|
||||
async fn main() {
|
||||
cli::run_cli(Migrator).await;
|
||||
}
|
||||
@ -2,17 +2,18 @@ use actix_files as fs;
|
||||
use actix_web::{
|
||||
error, get, middleware, post, web, App, Error, HttpRequest, HttpResponse, HttpServer, Result,
|
||||
};
|
||||
|
||||
use entity::post;
|
||||
use entity::post::Entity as Post;
|
||||
use entity::sea_orm;
|
||||
use listenfd::ListenFd;
|
||||
use migration::{Migrator, MigratorTrait};
|
||||
use sea_orm::DatabaseConnection;
|
||||
use sea_orm::{entity::*, query::*};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::env;
|
||||
use tera::Tera;
|
||||
|
||||
mod post;
|
||||
pub use post::Entity as Post;
|
||||
mod setup;
|
||||
|
||||
const DEFAULT_POSTS_PER_PAGE: usize = 5;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
@ -192,7 +193,7 @@ async fn main() -> std::io::Result<()> {
|
||||
|
||||
// create post table if not exists
|
||||
let conn = sea_orm::Database::connect(&db_url).await.unwrap();
|
||||
let _ = setup::create_post_table(&conn).await;
|
||||
Migrator::up(&conn, None).await.unwrap();
|
||||
let templates = Tera::new(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*")).unwrap();
|
||||
let state = AppState { templates, conn };
|
||||
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
use sea_orm::sea_query::{ColumnDef, TableCreateStatement};
|
||||
use sea_orm::{error::*, sea_query, ConnectionTrait, DbConn, ExecResult};
|
||||
|
||||
async fn create_table(db: &DbConn, stmt: &TableCreateStatement) -> Result<ExecResult, DbErr> {
|
||||
let builder = db.get_database_backend();
|
||||
db.execute(builder.build(stmt)).await
|
||||
}
|
||||
|
||||
pub async fn create_post_table(db: &DbConn) -> Result<ExecResult, DbErr> {
|
||||
let stmt = sea_query::Table::create()
|
||||
.table(super::post::Entity)
|
||||
.if_not_exists()
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Id)
|
||||
.integer()
|
||||
.not_null()
|
||||
.auto_increment()
|
||||
.primary_key(),
|
||||
)
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Title)
|
||||
.string()
|
||||
.not_null(),
|
||||
)
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Text)
|
||||
.string()
|
||||
.not_null(),
|
||||
)
|
||||
.to_owned();
|
||||
|
||||
create_table(db, &stmt).await
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
HOST=127.0.0.1
|
||||
PORT=8000
|
||||
DATABASE_URL="postgres://postgres:password@localhost/axum_exmaple"
|
||||
DATABASE_URL="postgres://root:root@localhost/axum_exmaple"
|
||||
@ -7,6 +7,7 @@ publish = false
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
[workspace]
|
||||
members = [".", "entity", "migration"]
|
||||
|
||||
[dependencies]
|
||||
tokio = { version = "1.14", features = ["full"] }
|
||||
@ -20,14 +21,5 @@ serde = "1"
|
||||
serde_json = "1"
|
||||
tera = "1"
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
|
||||
[dependencies.sea-orm]
|
||||
path = "../../" # remove this line in your own project
|
||||
version = "^0.5.0"
|
||||
features = ["macros", "runtime-tokio-native-tls", "debug-print"]
|
||||
default-features = false
|
||||
|
||||
[features]
|
||||
default = ["sqlx-postgres"]
|
||||
sqlx-mysql = ["sea-orm/sqlx-mysql"]
|
||||
sqlx-postgres = ["sea-orm/sqlx-postgres"]
|
||||
entity = { path = "entity" }
|
||||
migration = { path = "migration" }
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
|
||||
|
||||
# Axum with SeaORM example app
|
||||
|
||||
Edit `Cargo.toml` to use `sqlx-mysql` or `sqlx-postgres`.
|
||||
1. Modify the `DATABASE_URL` var in `.env` to point to your chosen database
|
||||
|
||||
```toml
|
||||
[features]
|
||||
default = ["sqlx-$DATABASE"]
|
||||
```
|
||||
1. Turn on the appropriate database feature for your chosen db in `entity/Cargo.toml` (the `"sqlx-postgres",` line)
|
||||
|
||||
Edit `.env` to point to your database.
|
||||
1. Execute `cargo run` to start the server
|
||||
|
||||
1. Visit [localhost:8000](http://localhost:8000) in browser
|
||||
|
||||
BIN
examples/axum_example/Screenshot.png
Normal file
BIN
examples/axum_example/Screenshot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 610 KiB |
25
examples/axum_example/entity/Cargo.toml
Normal file
25
examples/axum_example/entity/Cargo.toml
Normal file
@ -0,0 +1,25 @@
|
||||
[package]
|
||||
name = "entity"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
[lib]
|
||||
name = "entity"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
|
||||
[dependencies.sea-orm]
|
||||
# path = "../../../" # remove this line in your own project
|
||||
version = "^0.6.0"
|
||||
features = [
|
||||
"macros",
|
||||
"debug-print",
|
||||
"runtime-tokio-native-tls",
|
||||
"sqlx-postgres",
|
||||
# "sqlx-mysql",
|
||||
# "sqlx-sqlite",
|
||||
]
|
||||
default-features = false
|
||||
3
examples/axum_example/entity/src/lib.rs
Normal file
3
examples/axum_example/entity/src/lib.rs
Normal file
@ -0,0 +1,3 @@
|
||||
pub mod post;
|
||||
|
||||
pub use sea_orm;
|
||||
13
examples/axum_example/migration/Cargo.toml
Normal file
13
examples/axum_example/migration/Cargo.toml
Normal file
@ -0,0 +1,13 @@
|
||||
[package]
|
||||
name = "migration"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
[lib]
|
||||
name = "migration"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
sea-schema = { version = "^0.5.0", default-features = false, features = [ "migration", "debug-print" ] }
|
||||
entity = { path = "../entity" }
|
||||
37
examples/axum_example/migration/README.md
Normal file
37
examples/axum_example/migration/README.md
Normal file
@ -0,0 +1,37 @@
|
||||
# Running Migrator CLI
|
||||
|
||||
- Apply all pending migrations
|
||||
```sh
|
||||
cargo run
|
||||
```
|
||||
```sh
|
||||
cargo run -- up
|
||||
```
|
||||
- Apply first 10 pending migrations
|
||||
```sh
|
||||
cargo run -- up -n 10
|
||||
```
|
||||
- Rollback last applied migrations
|
||||
```sh
|
||||
cargo run -- down
|
||||
```
|
||||
- Rollback last 10 applied migrations
|
||||
```sh
|
||||
cargo run -- down -n 10
|
||||
```
|
||||
- Drop all tables from the database, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- fresh
|
||||
```
|
||||
- Rollback all applied migrations, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- refresh
|
||||
```
|
||||
- Rollback all applied migrations
|
||||
```sh
|
||||
cargo run -- reset
|
||||
```
|
||||
- Check the status of all migrations
|
||||
```sh
|
||||
cargo run -- status
|
||||
```
|
||||
12
examples/axum_example/migration/src/lib.rs
Normal file
12
examples/axum_example/migration/src/lib.rs
Normal file
@ -0,0 +1,12 @@
|
||||
pub use sea_schema::migration::prelude::*;
|
||||
|
||||
mod m20220120_000001_create_post_table;
|
||||
|
||||
pub struct Migrator;
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigratorTrait for Migrator {
|
||||
fn migrations() -> Vec<Box<dyn MigrationTrait>> {
|
||||
vec![Box::new(m20220120_000001_create_post_table::Migration)]
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
use entity::post::*;
|
||||
use sea_schema::migration::prelude::*;
|
||||
|
||||
pub struct Migration;
|
||||
|
||||
impl MigrationName for Migration {
|
||||
fn name(&self) -> &str {
|
||||
"m20220120_000001_create_post_table"
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigrationTrait for Migration {
|
||||
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
manager
|
||||
.create_table(
|
||||
Table::create()
|
||||
.table(Entity)
|
||||
.if_not_exists()
|
||||
.col(
|
||||
ColumnDef::new(Column::Id)
|
||||
.integer()
|
||||
.not_null()
|
||||
.auto_increment()
|
||||
.primary_key(),
|
||||
)
|
||||
.col(ColumnDef::new(Column::Title).string().not_null())
|
||||
.col(ColumnDef::new(Column::Text).string().not_null())
|
||||
.to_owned(),
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
manager
|
||||
.drop_table(Table::drop().table(Entity).to_owned())
|
||||
.await
|
||||
}
|
||||
}
|
||||
7
examples/axum_example/migration/src/main.rs
Normal file
7
examples/axum_example/migration/src/main.rs
Normal file
@ -0,0 +1,7 @@
|
||||
use migration::Migrator;
|
||||
use sea_schema::migration::*;
|
||||
|
||||
#[async_std::main]
|
||||
async fn main() {
|
||||
cli::run_cli(Migrator).await;
|
||||
}
|
||||
@ -1,15 +1,16 @@
|
||||
mod flash;
|
||||
mod post;
|
||||
mod setup;
|
||||
|
||||
use axum::{
|
||||
extract::{Extension, Form, Path, Query},
|
||||
http::StatusCode,
|
||||
response::Html,
|
||||
routing::{get, post, get_service},
|
||||
routing::{get, get_service, post},
|
||||
AddExtensionLayer, Router, Server,
|
||||
};
|
||||
use entity::post;
|
||||
use entity::sea_orm;
|
||||
use flash::{get_flash_cookie, post_response, PostResponse};
|
||||
use migration::{Migrator, MigratorTrait};
|
||||
use post::Entity as Post;
|
||||
use sea_orm::{prelude::*, Database, QueryOrder, Set};
|
||||
use serde::{Deserialize, Serialize};
|
||||
@ -34,7 +35,7 @@ async fn main() -> anyhow::Result<()> {
|
||||
let conn = Database::connect(db_url)
|
||||
.await
|
||||
.expect("Database connection failed");
|
||||
let _ = setup::create_post_table(&conn).await;
|
||||
Migrator::up(&conn, None).await.unwrap();
|
||||
let templates = Tera::new(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*"))
|
||||
.expect("Tera initialization failed");
|
||||
// let state = AppState { templates, conn };
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
use sea_orm::sea_query::{ColumnDef, TableCreateStatement};
|
||||
use sea_orm::{error::*, sea_query, ConnectionTrait, DbConn, ExecResult};
|
||||
|
||||
async fn create_table(db: &DbConn, stmt: &TableCreateStatement) -> Result<ExecResult, DbErr> {
|
||||
let builder = db.get_database_backend();
|
||||
db.execute(builder.build(stmt)).await
|
||||
}
|
||||
|
||||
pub async fn create_post_table(db: &DbConn) -> Result<ExecResult, DbErr> {
|
||||
let stmt = sea_query::Table::create()
|
||||
.table(super::post::Entity)
|
||||
.if_not_exists()
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Id)
|
||||
.integer()
|
||||
.not_null()
|
||||
.auto_increment()
|
||||
.primary_key(),
|
||||
)
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Title)
|
||||
.string()
|
||||
.not_null(),
|
||||
)
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Text)
|
||||
.string()
|
||||
.not_null(),
|
||||
)
|
||||
.to_owned();
|
||||
|
||||
create_table(db, &stmt).await
|
||||
}
|
||||
@ -8,7 +8,7 @@ edition = "2021"
|
||||
publish = false
|
||||
|
||||
[dependencies]
|
||||
async-std = { version = "^1.9", features = [ "attributes" ] }
|
||||
async-std = { version = "^1.9", features = [ "attributes", "tokio1" ] }
|
||||
sea-orm = { path = "../../", features = [ "sqlx-all", "runtime-async-std-native-tls" ] }
|
||||
serde_json = { version = "^1" }
|
||||
futures = { version = "^0.3" }
|
||||
|
||||
4
examples/poem_example/.env
Normal file
4
examples/poem_example/.env
Normal file
@ -0,0 +1,4 @@
|
||||
HOST=127.0.0.1
|
||||
PORT=8000
|
||||
#DATABASE_URL="mysql://root:@localhost/poem_example"
|
||||
DATABASE_URL="sqlite::memory:"
|
||||
18
examples/poem_example/Cargo.toml
Normal file
18
examples/poem_example/Cargo.toml
Normal file
@ -0,0 +1,18 @@
|
||||
[package]
|
||||
name = "sea-orm-poem-example"
|
||||
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"]
|
||||
|
||||
[dependencies]
|
||||
tokio = { version = "1.15.0", features = ["macros", "rt-multi-thread"] }
|
||||
poem = { version = "1.2.33", features = ["static-files"] }
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
tera = "1.8.0"
|
||||
dotenv = "0.15"
|
||||
entity = { path = "entity" }
|
||||
migration = { path = "migration" }
|
||||
11
examples/poem_example/README.md
Normal file
11
examples/poem_example/README.md
Normal file
@ -0,0 +1,11 @@
|
||||
|
||||
|
||||
# Poem with SeaORM example app
|
||||
|
||||
1. Modify the `DATABASE_URL` var in `.env` to point to your chosen database
|
||||
|
||||
1. Turn on the appropriate database feature for your chosen db in `entity/Cargo.toml` (the `"sqlx-sqlite",` line)
|
||||
|
||||
1. Execute `cargo run` to start the server
|
||||
|
||||
1. Visit [localhost:8000](http://localhost:8000) in browser after seeing the `server started` line
|
||||
BIN
examples/poem_example/Screenshot.png
Normal file
BIN
examples/poem_example/Screenshot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 604 KiB |
25
examples/poem_example/entity/Cargo.toml
Normal file
25
examples/poem_example/entity/Cargo.toml
Normal file
@ -0,0 +1,25 @@
|
||||
[package]
|
||||
name = "entity"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
[lib]
|
||||
name = "entity"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
|
||||
[dependencies.sea-orm]
|
||||
# path = "../../../" # remove this line in your own project
|
||||
version = "^0.6.0"
|
||||
features = [
|
||||
"macros",
|
||||
"debug-print",
|
||||
"runtime-tokio-native-tls",
|
||||
"sqlx-sqlite",
|
||||
# "sqlx-postgres",
|
||||
# "sqlx-mysql",
|
||||
]
|
||||
default-features = false
|
||||
3
examples/poem_example/entity/src/lib.rs
Normal file
3
examples/poem_example/entity/src/lib.rs
Normal file
@ -0,0 +1,3 @@
|
||||
pub mod post;
|
||||
|
||||
pub use sea_orm;
|
||||
18
examples/poem_example/entity/src/post.rs
Normal file
18
examples/poem_example/entity/src/post.rs
Normal file
@ -0,0 +1,18 @@
|
||||
use sea_orm::entity::prelude::*;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Deserialize, Serialize)]
|
||||
#[sea_orm(table_name = "posts")]
|
||||
pub struct Model {
|
||||
#[sea_orm(primary_key)]
|
||||
#[serde(skip_deserializing)]
|
||||
pub id: i32,
|
||||
pub title: String,
|
||||
#[sea_orm(column_type = "Text")]
|
||||
pub text: String,
|
||||
}
|
||||
|
||||
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
||||
pub enum Relation {}
|
||||
|
||||
impl ActiveModelBehavior for ActiveModel {}
|
||||
13
examples/poem_example/migration/Cargo.toml
Normal file
13
examples/poem_example/migration/Cargo.toml
Normal file
@ -0,0 +1,13 @@
|
||||
[package]
|
||||
name = "migration"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
[lib]
|
||||
name = "migration"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
sea-schema = { version = "^0.5.0", default-features = false, features = [ "migration", "debug-print" ] }
|
||||
entity = { path = "../entity" }
|
||||
37
examples/poem_example/migration/README.md
Normal file
37
examples/poem_example/migration/README.md
Normal file
@ -0,0 +1,37 @@
|
||||
# Running Migrator CLI
|
||||
|
||||
- Apply all pending migrations
|
||||
```sh
|
||||
cargo run
|
||||
```
|
||||
```sh
|
||||
cargo run -- up
|
||||
```
|
||||
- Apply first 10 pending migrations
|
||||
```sh
|
||||
cargo run -- up -n 10
|
||||
```
|
||||
- Rollback last applied migrations
|
||||
```sh
|
||||
cargo run -- down
|
||||
```
|
||||
- Rollback last 10 applied migrations
|
||||
```sh
|
||||
cargo run -- down -n 10
|
||||
```
|
||||
- Drop all tables from the database, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- fresh
|
||||
```
|
||||
- Rollback all applied migrations, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- refresh
|
||||
```
|
||||
- Rollback all applied migrations
|
||||
```sh
|
||||
cargo run -- reset
|
||||
```
|
||||
- Check the status of all migrations
|
||||
```sh
|
||||
cargo run -- status
|
||||
```
|
||||
12
examples/poem_example/migration/src/lib.rs
Normal file
12
examples/poem_example/migration/src/lib.rs
Normal file
@ -0,0 +1,12 @@
|
||||
pub use sea_schema::migration::prelude::*;
|
||||
|
||||
mod m20220120_000001_create_post_table;
|
||||
|
||||
pub struct Migrator;
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigratorTrait for Migrator {
|
||||
fn migrations() -> Vec<Box<dyn MigrationTrait>> {
|
||||
vec![Box::new(m20220120_000001_create_post_table::Migration)]
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
use entity::post::*;
|
||||
use sea_schema::migration::prelude::*;
|
||||
|
||||
pub struct Migration;
|
||||
|
||||
impl MigrationName for Migration {
|
||||
fn name(&self) -> &str {
|
||||
"m20220120_000001_create_post_table"
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigrationTrait for Migration {
|
||||
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
manager
|
||||
.create_table(
|
||||
Table::create()
|
||||
.table(Entity)
|
||||
.if_not_exists()
|
||||
.col(
|
||||
ColumnDef::new(Column::Id)
|
||||
.integer()
|
||||
.not_null()
|
||||
.auto_increment()
|
||||
.primary_key(),
|
||||
)
|
||||
.col(ColumnDef::new(Column::Title).string().not_null())
|
||||
.col(ColumnDef::new(Column::Text).string().not_null())
|
||||
.to_owned(),
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
manager
|
||||
.drop_table(Table::drop().table(Entity).to_owned())
|
||||
.await
|
||||
}
|
||||
}
|
||||
7
examples/poem_example/migration/src/main.rs
Normal file
7
examples/poem_example/migration/src/main.rs
Normal file
@ -0,0 +1,7 @@
|
||||
use migration::Migrator;
|
||||
use sea_schema::migration::*;
|
||||
|
||||
#[async_std::main]
|
||||
async fn main() {
|
||||
cli::run_cli(Migrator).await;
|
||||
}
|
||||
163
examples/poem_example/src/main.rs
Normal file
163
examples/poem_example/src/main.rs
Normal file
@ -0,0 +1,163 @@
|
||||
use std::env;
|
||||
|
||||
use entity::post;
|
||||
use entity::sea_orm;
|
||||
use migration::{Migrator, MigratorTrait};
|
||||
use poem::endpoint::StaticFilesEndpoint;
|
||||
use poem::error::{BadRequest, InternalServerError};
|
||||
use poem::http::StatusCode;
|
||||
use poem::listener::TcpListener;
|
||||
use poem::web::{Data, Form, Html, Path, Query};
|
||||
use poem::{get, handler, post, EndpointExt, Error, IntoResponse, Result, Route, Server};
|
||||
use sea_orm::{entity::*, query::*, DatabaseConnection};
|
||||
use serde::Deserialize;
|
||||
use tera::Tera;
|
||||
|
||||
const DEFAULT_POSTS_PER_PAGE: usize = 5;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
struct AppState {
|
||||
templates: tera::Tera,
|
||||
conn: DatabaseConnection,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct Params {
|
||||
page: Option<usize>,
|
||||
posts_per_page: Option<usize>,
|
||||
}
|
||||
|
||||
#[handler]
|
||||
async fn create(state: Data<&AppState>, form: Form<post::Model>) -> Result<impl IntoResponse> {
|
||||
post::ActiveModel {
|
||||
title: Set(form.title.to_owned()),
|
||||
text: Set(form.text.to_owned()),
|
||||
..Default::default()
|
||||
}
|
||||
.save(&state.conn)
|
||||
.await
|
||||
.map_err(InternalServerError)?;
|
||||
|
||||
Ok(StatusCode::FOUND.with_header("location", "/"))
|
||||
}
|
||||
|
||||
#[handler]
|
||||
async fn list(state: Data<&AppState>, Query(params): Query<Params>) -> Result<impl IntoResponse> {
|
||||
let page = params.page.unwrap_or(1);
|
||||
let posts_per_page = params.posts_per_page.unwrap_or(DEFAULT_POSTS_PER_PAGE);
|
||||
let paginator = post::Entity::find()
|
||||
.order_by_asc(post::Column::Id)
|
||||
.paginate(&state.conn, posts_per_page);
|
||||
let num_pages = paginator.num_pages().await.map_err(BadRequest)?;
|
||||
let posts = paginator
|
||||
.fetch_page(page - 1)
|
||||
.await
|
||||
.map_err(InternalServerError)?;
|
||||
|
||||
let mut ctx = tera::Context::new();
|
||||
ctx.insert("posts", &posts);
|
||||
ctx.insert("page", &page);
|
||||
ctx.insert("posts_per_page", &posts_per_page);
|
||||
ctx.insert("num_pages", &num_pages);
|
||||
|
||||
let body = state
|
||||
.templates
|
||||
.render("index.html.tera", &ctx)
|
||||
.map_err(InternalServerError)?;
|
||||
Ok(Html(body))
|
||||
}
|
||||
|
||||
#[handler]
|
||||
async fn new(state: Data<&AppState>) -> Result<impl IntoResponse> {
|
||||
let ctx = tera::Context::new();
|
||||
let body = state
|
||||
.templates
|
||||
.render("new.html.tera", &ctx)
|
||||
.map_err(InternalServerError)?;
|
||||
Ok(Html(body))
|
||||
}
|
||||
|
||||
#[handler]
|
||||
async fn edit(state: Data<&AppState>, Path(id): Path<i32>) -> Result<impl IntoResponse> {
|
||||
let post: post::Model = post::Entity::find_by_id(id)
|
||||
.one(&state.conn)
|
||||
.await
|
||||
.map_err(InternalServerError)?
|
||||
.ok_or_else(|| Error::from_status(StatusCode::NOT_FOUND))?;
|
||||
|
||||
let mut ctx = tera::Context::new();
|
||||
ctx.insert("post", &post);
|
||||
|
||||
let body = state
|
||||
.templates
|
||||
.render("edit.html.tera", &ctx)
|
||||
.map_err(InternalServerError)?;
|
||||
Ok(Html(body))
|
||||
}
|
||||
|
||||
#[handler]
|
||||
async fn update(
|
||||
state: Data<&AppState>,
|
||||
Path(id): Path<i32>,
|
||||
form: Form<post::Model>,
|
||||
) -> Result<impl IntoResponse> {
|
||||
post::ActiveModel {
|
||||
id: Set(id),
|
||||
title: Set(form.title.to_owned()),
|
||||
text: Set(form.text.to_owned()),
|
||||
}
|
||||
.save(&state.conn)
|
||||
.await
|
||||
.map_err(InternalServerError)?;
|
||||
|
||||
Ok(StatusCode::FOUND.with_header("location", "/"))
|
||||
}
|
||||
|
||||
#[handler]
|
||||
async fn delete(state: Data<&AppState>, Path(id): Path<i32>) -> Result<impl IntoResponse> {
|
||||
let post: post::ActiveModel = post::Entity::find_by_id(id)
|
||||
.one(&state.conn)
|
||||
.await
|
||||
.map_err(InternalServerError)?
|
||||
.ok_or_else(|| Error::from_status(StatusCode::NOT_FOUND))?
|
||||
.into();
|
||||
post.delete(&state.conn)
|
||||
.await
|
||||
.map_err(InternalServerError)?;
|
||||
|
||||
Ok(StatusCode::FOUND.with_header("location", "/"))
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> std::io::Result<()> {
|
||||
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 host = env::var("HOST").expect("HOST is not set in .env file");
|
||||
let port = env::var("PORT").expect("PORT is not set in .env file");
|
||||
let server_url = format!("{}:{}", host, port);
|
||||
|
||||
// create post table if not exists
|
||||
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 };
|
||||
|
||||
println!("Starting server at {}", server_url);
|
||||
|
||||
let app = Route::new()
|
||||
.at("/", post(create).get(list))
|
||||
.at("/new", new)
|
||||
.at("/:id", get(edit).post(update))
|
||||
.at("/delete/:id", post(delete))
|
||||
.nest(
|
||||
"/static",
|
||||
StaticFilesEndpoint::new(concat!(env!("CARGO_MANIFEST_DIR"), "/static")),
|
||||
)
|
||||
.data(state);
|
||||
let server = Server::new(TcpListener::bind(format!("{}:{}", host, port)));
|
||||
server.run(app).await
|
||||
}
|
||||
427
examples/poem_example/static/css/normalize.css
vendored
Normal file
427
examples/poem_example/static/css/normalize.css
vendored
Normal file
@ -0,0 +1,427 @@
|
||||
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
|
||||
|
||||
/**
|
||||
* 1. Set default font family to sans-serif.
|
||||
* 2. Prevent iOS text size adjust after orientation change, without disabling
|
||||
* user zoom.
|
||||
*/
|
||||
|
||||
html {
|
||||
font-family: sans-serif; /* 1 */
|
||||
-ms-text-size-adjust: 100%; /* 2 */
|
||||
-webkit-text-size-adjust: 100%; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove default margin.
|
||||
*/
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* HTML5 display definitions
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Correct `block` display not defined for any HTML5 element in IE 8/9.
|
||||
* Correct `block` display not defined for `details` or `summary` in IE 10/11
|
||||
* and Firefox.
|
||||
* Correct `block` display not defined for `main` in IE 11.
|
||||
*/
|
||||
|
||||
article,
|
||||
aside,
|
||||
details,
|
||||
figcaption,
|
||||
figure,
|
||||
footer,
|
||||
header,
|
||||
hgroup,
|
||||
main,
|
||||
menu,
|
||||
nav,
|
||||
section,
|
||||
summary {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct `inline-block` display not defined in IE 8/9.
|
||||
* 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
|
||||
*/
|
||||
|
||||
audio,
|
||||
canvas,
|
||||
progress,
|
||||
video {
|
||||
display: inline-block; /* 1 */
|
||||
vertical-align: baseline; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Prevent modern browsers from displaying `audio` without controls.
|
||||
* Remove excess height in iOS 5 devices.
|
||||
*/
|
||||
|
||||
audio:not([controls]) {
|
||||
display: none;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address `[hidden]` styling not present in IE 8/9/10.
|
||||
* Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
|
||||
*/
|
||||
|
||||
[hidden],
|
||||
template {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Links
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove the gray background color from active links in IE 10.
|
||||
*/
|
||||
|
||||
a {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
/**
|
||||
* Improve readability when focused and also mouse hovered in all browsers.
|
||||
*/
|
||||
|
||||
a:active,
|
||||
a:hover {
|
||||
outline: 0;
|
||||
}
|
||||
|
||||
/* Text-level semantics
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Address styling not present in IE 8/9/10/11, Safari, and Chrome.
|
||||
*/
|
||||
|
||||
abbr[title] {
|
||||
border-bottom: 1px dotted;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
|
||||
*/
|
||||
|
||||
b,
|
||||
strong {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address styling not present in Safari and Chrome.
|
||||
*/
|
||||
|
||||
dfn {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address variable `h1` font-size and margin within `section` and `article`
|
||||
* contexts in Firefox 4+, Safari, and Chrome.
|
||||
*/
|
||||
|
||||
h1 {
|
||||
font-size: 2em;
|
||||
margin: 0.67em 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address styling not present in IE 8/9.
|
||||
*/
|
||||
|
||||
mark {
|
||||
background: #ff0;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address inconsistent and variable font size in all browsers.
|
||||
*/
|
||||
|
||||
small {
|
||||
font-size: 80%;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
|
||||
*/
|
||||
|
||||
sub,
|
||||
sup {
|
||||
font-size: 75%;
|
||||
line-height: 0;
|
||||
position: relative;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
sup {
|
||||
top: -0.5em;
|
||||
}
|
||||
|
||||
sub {
|
||||
bottom: -0.25em;
|
||||
}
|
||||
|
||||
/* Embedded content
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove border when inside `a` element in IE 8/9/10.
|
||||
*/
|
||||
|
||||
img {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct overflow not hidden in IE 9/10/11.
|
||||
*/
|
||||
|
||||
svg:not(:root) {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Grouping content
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Address margin not present in IE 8/9 and Safari.
|
||||
*/
|
||||
|
||||
figure {
|
||||
margin: 1em 40px;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address differences between Firefox and other browsers.
|
||||
*/
|
||||
|
||||
hr {
|
||||
-moz-box-sizing: content-box;
|
||||
box-sizing: content-box;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Contain overflow in all browsers.
|
||||
*/
|
||||
|
||||
pre {
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address odd `em`-unit font size rendering in all browsers.
|
||||
*/
|
||||
|
||||
code,
|
||||
kbd,
|
||||
pre,
|
||||
samp {
|
||||
font-family: monospace, monospace;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
/* Forms
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Known limitation: by default, Chrome and Safari on OS X allow very limited
|
||||
* styling of `select`, unless a `border` property is set.
|
||||
*/
|
||||
|
||||
/**
|
||||
* 1. Correct color not being inherited.
|
||||
* Known issue: affects color of disabled elements.
|
||||
* 2. Correct font properties not being inherited.
|
||||
* 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
|
||||
*/
|
||||
|
||||
button,
|
||||
input,
|
||||
optgroup,
|
||||
select,
|
||||
textarea {
|
||||
color: inherit; /* 1 */
|
||||
font: inherit; /* 2 */
|
||||
margin: 0; /* 3 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Address `overflow` set to `hidden` in IE 8/9/10/11.
|
||||
*/
|
||||
|
||||
button {
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address inconsistent `text-transform` inheritance for `button` and `select`.
|
||||
* All other form control elements do not inherit `text-transform` values.
|
||||
* Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
|
||||
* Correct `select` style inheritance in Firefox.
|
||||
*/
|
||||
|
||||
button,
|
||||
select {
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
|
||||
* and `video` controls.
|
||||
* 2. Correct inability to style clickable `input` types in iOS.
|
||||
* 3. Improve usability and consistency of cursor style between image-type
|
||||
* `input` and others.
|
||||
*/
|
||||
|
||||
button,
|
||||
html input[type="button"], /* 1 */
|
||||
input[type="reset"],
|
||||
input[type="submit"] {
|
||||
-webkit-appearance: button; /* 2 */
|
||||
cursor: pointer; /* 3 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-set default cursor for disabled elements.
|
||||
*/
|
||||
|
||||
button[disabled],
|
||||
html input[disabled] {
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove inner padding and border in Firefox 4+.
|
||||
*/
|
||||
|
||||
button::-moz-focus-inner,
|
||||
input::-moz-focus-inner {
|
||||
border: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
|
||||
* the UA stylesheet.
|
||||
*/
|
||||
|
||||
input {
|
||||
line-height: normal;
|
||||
}
|
||||
|
||||
/**
|
||||
* It's recommended that you don't attempt to style these elements.
|
||||
* Firefox's implementation doesn't respect box-sizing, padding, or width.
|
||||
*
|
||||
* 1. Address box sizing set to `content-box` in IE 8/9/10.
|
||||
* 2. Remove excess padding in IE 8/9/10.
|
||||
*/
|
||||
|
||||
input[type="checkbox"],
|
||||
input[type="radio"] {
|
||||
box-sizing: border-box; /* 1 */
|
||||
padding: 0; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Fix the cursor style for Chrome's increment/decrement buttons. For certain
|
||||
* `font-size` values of the `input`, it causes the cursor style of the
|
||||
* decrement button to change from `default` to `text`.
|
||||
*/
|
||||
|
||||
input[type="number"]::-webkit-inner-spin-button,
|
||||
input[type="number"]::-webkit-outer-spin-button {
|
||||
height: auto;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Address `appearance` set to `searchfield` in Safari and Chrome.
|
||||
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome
|
||||
* (include `-moz` to future-proof).
|
||||
*/
|
||||
|
||||
input[type="search"] {
|
||||
-webkit-appearance: textfield; /* 1 */
|
||||
-moz-box-sizing: content-box;
|
||||
-webkit-box-sizing: content-box; /* 2 */
|
||||
box-sizing: content-box;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove inner padding and search cancel button in Safari and Chrome on OS X.
|
||||
* Safari (but not Chrome) clips the cancel button when the search input has
|
||||
* padding (and `textfield` appearance).
|
||||
*/
|
||||
|
||||
input[type="search"]::-webkit-search-cancel-button,
|
||||
input[type="search"]::-webkit-search-decoration {
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
|
||||
/**
|
||||
* Define consistent border, margin, and padding.
|
||||
*/
|
||||
|
||||
fieldset {
|
||||
border: 1px solid #c0c0c0;
|
||||
margin: 0 2px;
|
||||
padding: 0.35em 0.625em 0.75em;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct `color` not being inherited in IE 8/9/10/11.
|
||||
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
|
||||
*/
|
||||
|
||||
legend {
|
||||
border: 0; /* 1 */
|
||||
padding: 0; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove default vertical scrollbar in IE 8/9/10/11.
|
||||
*/
|
||||
|
||||
textarea {
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
/**
|
||||
* Don't inherit the `font-weight` (applied by a rule above).
|
||||
* NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
|
||||
*/
|
||||
|
||||
optgroup {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/* Tables
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove most spacing between table cells.
|
||||
*/
|
||||
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0;
|
||||
}
|
||||
|
||||
td,
|
||||
th {
|
||||
padding: 0;
|
||||
}
|
||||
421
examples/poem_example/static/css/skeleton.css
vendored
Normal file
421
examples/poem_example/static/css/skeleton.css
vendored
Normal file
@ -0,0 +1,421 @@
|
||||
/*
|
||||
* Skeleton V2.0.4
|
||||
* Copyright 2014, Dave Gamache
|
||||
* www.getskeleton.com
|
||||
* Free to use under the MIT license.
|
||||
* https://opensource.org/licenses/mit-license.php
|
||||
* 12/29/2014
|
||||
*/
|
||||
|
||||
|
||||
/* Table of contents
|
||||
––––––––––––––––––––––––––––––––––––––––––––––––––
|
||||
- Grid
|
||||
- Base Styles
|
||||
- Typography
|
||||
- Links
|
||||
- Buttons
|
||||
- Forms
|
||||
- Lists
|
||||
- Code
|
||||
- Tables
|
||||
- Spacing
|
||||
- Utilities
|
||||
- Clearing
|
||||
- Media Queries
|
||||
*/
|
||||
|
||||
|
||||
/* Grid
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
.container {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
max-width: 960px;
|
||||
margin: 0 auto;
|
||||
padding: 0 20px;
|
||||
box-sizing: border-box; }
|
||||
.column,
|
||||
.columns {
|
||||
width: 100%;
|
||||
float: left;
|
||||
box-sizing: border-box; }
|
||||
|
||||
/* For devices larger than 400px */
|
||||
@media (min-width: 400px) {
|
||||
.container {
|
||||
width: 85%;
|
||||
padding: 0; }
|
||||
}
|
||||
|
||||
/* For devices larger than 550px */
|
||||
@media (min-width: 550px) {
|
||||
.container {
|
||||
width: 80%; }
|
||||
.column,
|
||||
.columns {
|
||||
margin-left: 4%; }
|
||||
.column:first-child,
|
||||
.columns:first-child {
|
||||
margin-left: 0; }
|
||||
|
||||
.one.column,
|
||||
.one.columns { width: 4.66666666667%; }
|
||||
.two.columns { width: 13.3333333333%; }
|
||||
.three.columns { width: 22%; }
|
||||
.four.columns { width: 30.6666666667%; }
|
||||
.five.columns { width: 39.3333333333%; }
|
||||
.six.columns { width: 48%; }
|
||||
.seven.columns { width: 56.6666666667%; }
|
||||
.eight.columns { width: 65.3333333333%; }
|
||||
.nine.columns { width: 74.0%; }
|
||||
.ten.columns { width: 82.6666666667%; }
|
||||
.eleven.columns { width: 91.3333333333%; }
|
||||
.twelve.columns { width: 100%; margin-left: 0; }
|
||||
|
||||
.one-third.column { width: 30.6666666667%; }
|
||||
.two-thirds.column { width: 65.3333333333%; }
|
||||
|
||||
.one-half.column { width: 48%; }
|
||||
|
||||
/* Offsets */
|
||||
.offset-by-one.column,
|
||||
.offset-by-one.columns { margin-left: 8.66666666667%; }
|
||||
.offset-by-two.column,
|
||||
.offset-by-two.columns { margin-left: 17.3333333333%; }
|
||||
.offset-by-three.column,
|
||||
.offset-by-three.columns { margin-left: 26%; }
|
||||
.offset-by-four.column,
|
||||
.offset-by-four.columns { margin-left: 34.6666666667%; }
|
||||
.offset-by-five.column,
|
||||
.offset-by-five.columns { margin-left: 43.3333333333%; }
|
||||
.offset-by-six.column,
|
||||
.offset-by-six.columns { margin-left: 52%; }
|
||||
.offset-by-seven.column,
|
||||
.offset-by-seven.columns { margin-left: 60.6666666667%; }
|
||||
.offset-by-eight.column,
|
||||
.offset-by-eight.columns { margin-left: 69.3333333333%; }
|
||||
.offset-by-nine.column,
|
||||
.offset-by-nine.columns { margin-left: 78.0%; }
|
||||
.offset-by-ten.column,
|
||||
.offset-by-ten.columns { margin-left: 86.6666666667%; }
|
||||
.offset-by-eleven.column,
|
||||
.offset-by-eleven.columns { margin-left: 95.3333333333%; }
|
||||
|
||||
.offset-by-one-third.column,
|
||||
.offset-by-one-third.columns { margin-left: 34.6666666667%; }
|
||||
.offset-by-two-thirds.column,
|
||||
.offset-by-two-thirds.columns { margin-left: 69.3333333333%; }
|
||||
|
||||
.offset-by-one-half.column,
|
||||
.offset-by-one-half.columns { margin-left: 52%; }
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* Base Styles
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
/* NOTE
|
||||
html is set to 62.5% so that all the REM measurements throughout Skeleton
|
||||
are based on 10px sizing. So basically 1.5rem = 15px :) */
|
||||
html {
|
||||
font-size: 62.5%; }
|
||||
body {
|
||||
font-size: 1.5em; /* currently ems cause chrome bug misinterpreting rems on body element */
|
||||
line-height: 1.6;
|
||||
font-weight: 400;
|
||||
font-family: "Raleway", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
color: #222; }
|
||||
|
||||
|
||||
/* Typography
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
margin-top: 0;
|
||||
margin-bottom: 2rem;
|
||||
font-weight: 300; }
|
||||
h1 { font-size: 4.0rem; line-height: 1.2; letter-spacing: -.1rem;}
|
||||
h2 { font-size: 3.6rem; line-height: 1.25; letter-spacing: -.1rem; }
|
||||
h3 { font-size: 3.0rem; line-height: 1.3; letter-spacing: -.1rem; }
|
||||
h4 { font-size: 2.4rem; line-height: 1.35; letter-spacing: -.08rem; }
|
||||
h5 { font-size: 1.8rem; line-height: 1.5; letter-spacing: -.05rem; }
|
||||
h6 { font-size: 1.5rem; line-height: 1.6; letter-spacing: 0; }
|
||||
|
||||
/* Larger than phablet */
|
||||
@media (min-width: 550px) {
|
||||
h1 { font-size: 5.0rem; }
|
||||
h2 { font-size: 4.2rem; }
|
||||
h3 { font-size: 3.6rem; }
|
||||
h4 { font-size: 3.0rem; }
|
||||
h5 { font-size: 2.4rem; }
|
||||
h6 { font-size: 1.5rem; }
|
||||
}
|
||||
|
||||
p {
|
||||
margin-top: 0; }
|
||||
|
||||
|
||||
/* Links
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
a {
|
||||
color: #1EAEDB; }
|
||||
a:hover {
|
||||
color: #0FA0CE; }
|
||||
|
||||
|
||||
/* Buttons
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
.button,
|
||||
button,
|
||||
input[type="submit"],
|
||||
input[type="reset"],
|
||||
input[type="button"] {
|
||||
display: inline-block;
|
||||
height: 38px;
|
||||
padding: 0 30px;
|
||||
color: #555;
|
||||
text-align: center;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
line-height: 38px;
|
||||
letter-spacing: .1rem;
|
||||
text-transform: uppercase;
|
||||
text-decoration: none;
|
||||
white-space: nowrap;
|
||||
background-color: transparent;
|
||||
border-radius: 4px;
|
||||
border: 1px solid #bbb;
|
||||
cursor: pointer;
|
||||
box-sizing: border-box; }
|
||||
.button:hover,
|
||||
button:hover,
|
||||
input[type="submit"]:hover,
|
||||
input[type="reset"]:hover,
|
||||
input[type="button"]:hover,
|
||||
.button:focus,
|
||||
button:focus,
|
||||
input[type="submit"]:focus,
|
||||
input[type="reset"]:focus,
|
||||
input[type="button"]:focus {
|
||||
color: #333;
|
||||
border-color: #888;
|
||||
outline: 0; }
|
||||
.button.button-primary,
|
||||
button.button-primary,
|
||||
button.primary,
|
||||
input[type="submit"].button-primary,
|
||||
input[type="reset"].button-primary,
|
||||
input[type="button"].button-primary {
|
||||
color: #FFF;
|
||||
background-color: #33C3F0;
|
||||
border-color: #33C3F0; }
|
||||
.button.button-primary:hover,
|
||||
button.button-primary:hover,
|
||||
button.primary:hover,
|
||||
input[type="submit"].button-primary:hover,
|
||||
input[type="reset"].button-primary:hover,
|
||||
input[type="button"].button-primary:hover,
|
||||
.button.button-primary:focus,
|
||||
button.button-primary:focus,
|
||||
button.primary:focus,
|
||||
input[type="submit"].button-primary:focus,
|
||||
input[type="reset"].button-primary:focus,
|
||||
input[type="button"].button-primary:focus {
|
||||
color: #FFF;
|
||||
background-color: #1EAEDB;
|
||||
border-color: #1EAEDB; }
|
||||
|
||||
|
||||
/* Forms
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
input[type="email"],
|
||||
input[type="number"],
|
||||
input[type="search"],
|
||||
input[type="text"],
|
||||
input[type="tel"],
|
||||
input[type="url"],
|
||||
input[type="password"],
|
||||
textarea,
|
||||
select {
|
||||
height: 38px;
|
||||
padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */
|
||||
background-color: #fff;
|
||||
border: 1px solid #D1D1D1;
|
||||
border-radius: 4px;
|
||||
box-shadow: none;
|
||||
box-sizing: border-box; }
|
||||
/* Removes awkward default styles on some inputs for iOS */
|
||||
input[type="email"],
|
||||
input[type="number"],
|
||||
input[type="search"],
|
||||
input[type="text"],
|
||||
input[type="tel"],
|
||||
input[type="url"],
|
||||
input[type="password"],
|
||||
textarea {
|
||||
-webkit-appearance: none;
|
||||
-moz-appearance: none;
|
||||
appearance: none; }
|
||||
textarea {
|
||||
min-height: 65px;
|
||||
padding-top: 6px;
|
||||
padding-bottom: 6px; }
|
||||
input[type="email"]:focus,
|
||||
input[type="number"]:focus,
|
||||
input[type="search"]:focus,
|
||||
input[type="text"]:focus,
|
||||
input[type="tel"]:focus,
|
||||
input[type="url"]:focus,
|
||||
input[type="password"]:focus,
|
||||
textarea:focus,
|
||||
select:focus {
|
||||
border: 1px solid #33C3F0;
|
||||
outline: 0; }
|
||||
label,
|
||||
legend {
|
||||
display: block;
|
||||
margin-bottom: .5rem;
|
||||
font-weight: 600; }
|
||||
fieldset {
|
||||
padding: 0;
|
||||
border-width: 0; }
|
||||
input[type="checkbox"],
|
||||
input[type="radio"] {
|
||||
display: inline; }
|
||||
label > .label-body {
|
||||
display: inline-block;
|
||||
margin-left: .5rem;
|
||||
font-weight: normal; }
|
||||
|
||||
|
||||
/* Lists
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
ul {
|
||||
list-style: circle inside; }
|
||||
ol {
|
||||
list-style: decimal inside; }
|
||||
ol, ul {
|
||||
padding-left: 0;
|
||||
margin-top: 0; }
|
||||
ul ul,
|
||||
ul ol,
|
||||
ol ol,
|
||||
ol ul {
|
||||
margin: 1.5rem 0 1.5rem 3rem;
|
||||
font-size: 90%; }
|
||||
li {
|
||||
margin-bottom: 1rem; }
|
||||
|
||||
|
||||
/* Code
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
code {
|
||||
padding: .2rem .5rem;
|
||||
margin: 0 .2rem;
|
||||
font-size: 90%;
|
||||
white-space: nowrap;
|
||||
background: #F1F1F1;
|
||||
border: 1px solid #E1E1E1;
|
||||
border-radius: 4px; }
|
||||
pre > code {
|
||||
display: block;
|
||||
padding: 1rem 1.5rem;
|
||||
white-space: pre; }
|
||||
|
||||
|
||||
/* Tables
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
th,
|
||||
td {
|
||||
padding: 12px 15px;
|
||||
text-align: left;
|
||||
border-bottom: 1px solid #E1E1E1; }
|
||||
th:first-child,
|
||||
td:first-child {
|
||||
padding-left: 0; }
|
||||
th:last-child,
|
||||
td:last-child {
|
||||
padding-right: 0; }
|
||||
|
||||
|
||||
/* Spacing
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
button,
|
||||
.button {
|
||||
margin-bottom: 1rem; }
|
||||
input,
|
||||
textarea,
|
||||
select,
|
||||
fieldset {
|
||||
margin-bottom: 1.5rem; }
|
||||
pre,
|
||||
blockquote,
|
||||
dl,
|
||||
figure,
|
||||
table,
|
||||
p,
|
||||
ul,
|
||||
ol,
|
||||
form {
|
||||
margin-bottom: 2.5rem; }
|
||||
|
||||
|
||||
/* Utilities
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
.u-full-width {
|
||||
width: 100%;
|
||||
box-sizing: border-box; }
|
||||
.u-max-full-width {
|
||||
max-width: 100%;
|
||||
box-sizing: border-box; }
|
||||
.u-pull-right {
|
||||
float: right; }
|
||||
.u-pull-left {
|
||||
float: left; }
|
||||
|
||||
|
||||
/* Misc
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
hr {
|
||||
margin-top: 3rem;
|
||||
margin-bottom: 3.5rem;
|
||||
border-width: 0;
|
||||
border-top: 1px solid #E1E1E1; }
|
||||
|
||||
|
||||
/* Clearing
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
|
||||
/* Self Clearing Goodness */
|
||||
.container:after,
|
||||
.row:after,
|
||||
.u-cf {
|
||||
content: "";
|
||||
display: table;
|
||||
clear: both; }
|
||||
|
||||
|
||||
/* Media Queries
|
||||
–––––––––––––––––––––––––––––––––––––––––––––––––– */
|
||||
/*
|
||||
Note: The best way to structure the use of media queries is to create the queries
|
||||
near the relevant code. For example, if you wanted to change the styles for buttons
|
||||
on small devices, paste the mobile query code up in the buttons section and style it
|
||||
there.
|
||||
*/
|
||||
|
||||
|
||||
/* Larger than mobile */
|
||||
@media (min-width: 400px) {}
|
||||
|
||||
/* Larger than phablet (also point when grid becomes active) */
|
||||
@media (min-width: 550px) {}
|
||||
|
||||
/* Larger than tablet */
|
||||
@media (min-width: 750px) {}
|
||||
|
||||
/* Larger than desktop */
|
||||
@media (min-width: 1000px) {}
|
||||
|
||||
/* Larger than Desktop HD */
|
||||
@media (min-width: 1200px) {}
|
||||
73
examples/poem_example/static/css/style.css
Normal file
73
examples/poem_example/static/css/style.css
Normal file
@ -0,0 +1,73 @@
|
||||
.field-error {
|
||||
border: 1px solid #ff0000 !important;
|
||||
}
|
||||
|
||||
.field-error-flash {
|
||||
color: #ff0000;
|
||||
display: block;
|
||||
margin: -10px 0 10px 0;
|
||||
}
|
||||
|
||||
.field-success {
|
||||
border: 1px solid #5ab953 !important;
|
||||
}
|
||||
|
||||
.field-success-flash {
|
||||
color: #5ab953;
|
||||
display: block;
|
||||
margin: -10px 0 10px 0;
|
||||
}
|
||||
|
||||
span.completed {
|
||||
text-decoration: line-through;
|
||||
}
|
||||
|
||||
form.inline {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
form.link,
|
||||
button.link {
|
||||
display: inline;
|
||||
color: #1eaedb;
|
||||
border: none;
|
||||
outline: none;
|
||||
background: none;
|
||||
cursor: pointer;
|
||||
padding: 0;
|
||||
margin: 0 0 0 0;
|
||||
height: inherit;
|
||||
text-decoration: underline;
|
||||
font-size: inherit;
|
||||
text-transform: none;
|
||||
font-weight: normal;
|
||||
line-height: inherit;
|
||||
letter-spacing: inherit;
|
||||
}
|
||||
|
||||
form.link:hover,
|
||||
button.link:hover {
|
||||
color: #0fa0ce;
|
||||
}
|
||||
|
||||
button.small {
|
||||
height: 20px;
|
||||
padding: 0 10px;
|
||||
font-size: 10px;
|
||||
line-height: 20px;
|
||||
margin: 0 2.5px;
|
||||
}
|
||||
|
||||
.post:hover {
|
||||
background-color: #bce2ee;
|
||||
}
|
||||
|
||||
.post td {
|
||||
padding: 5px;
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
#delete-button {
|
||||
color: red;
|
||||
border-color: red;
|
||||
}
|
||||
BIN
examples/poem_example/static/images/favicon.png
Normal file
BIN
examples/poem_example/static/images/favicon.png
Normal file
Binary file not shown.
49
examples/poem_example/templates/edit.html.tera
Normal file
49
examples/poem_example/templates/edit.html.tera
Normal file
@ -0,0 +1,49 @@
|
||||
{% extends "layout.html.tera" %} {% block content %}
|
||||
<div class="row">
|
||||
<h4>Edit Post</h4>
|
||||
<div class="twelve columns">
|
||||
<div class="ten columns">
|
||||
<form action="/{{ post.id }}" method="post">
|
||||
<div class="twelve columns">
|
||||
<input
|
||||
type="text"
|
||||
placeholder="title"
|
||||
name="title"
|
||||
id="title"
|
||||
value="{{ post.title }}"
|
||||
autofocus
|
||||
class="u-full-width"
|
||||
/>
|
||||
<input
|
||||
type="text"
|
||||
placeholder="content"
|
||||
name="text"
|
||||
id="text"
|
||||
value="{{ post.text }}"
|
||||
autofocus
|
||||
class="u-full-width"
|
||||
/>
|
||||
</div>
|
||||
<div class="twelve columns">
|
||||
<div class="two columns">
|
||||
<a href="/">
|
||||
<input type="button" value="cancel" />
|
||||
</a>
|
||||
</div>
|
||||
<div class="eight columns"></div>
|
||||
<div class="two columns">
|
||||
<input type="submit" value="save post" />
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="two columns">
|
||||
<form action="/delete/{{ post.id }}" method="post">
|
||||
<div class="two columns">
|
||||
<input id="delete-button" type="submit" value="delete post" />
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
11
examples/poem_example/templates/error/404.html.tera
Normal file
11
examples/poem_example/templates/error/404.html.tera
Normal file
@ -0,0 +1,11 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>404 - tera</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>404: Hey! There's nothing here.</h1>
|
||||
The page at {{ uri }} does not exist!
|
||||
</body>
|
||||
</html>
|
||||
52
examples/poem_example/templates/index.html.tera
Normal file
52
examples/poem_example/templates/index.html.tera
Normal file
@ -0,0 +1,52 @@
|
||||
{% extends "layout.html.tera" %} {% block content %}
|
||||
<div class="container">
|
||||
<p><!--Nothing to see here --></p>
|
||||
<h1>Posts</h1>
|
||||
{% if flash %}
|
||||
<small class="field-{{ flash.kind }}-flash">
|
||||
{{ flash.message }}
|
||||
</small>
|
||||
{% endif %}
|
||||
<table>
|
||||
<tbody>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Title</th>
|
||||
<th>Text</th>
|
||||
</tr>
|
||||
</thead>
|
||||
{% for post in posts %}
|
||||
<tr class="post" onclick="window.location='/{{ post.id }}';">
|
||||
<td>{{ post.id }}</td>
|
||||
<td>{{ post.title }}</td>
|
||||
<td>{{ post.text }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td>
|
||||
{% if page == 1 %} Previous {% else %}
|
||||
<a href="/?page={{ page - 1 }}&posts_per_page={{ posts_per_page }}"
|
||||
>Previous</a
|
||||
>
|
||||
{% endif %} | {% if page == num_pages %} Next {% else %}
|
||||
<a href="/?page={{ page + 1 }}&posts_per_page={{ posts_per_page }}"
|
||||
>Next</a
|
||||
>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
<div class="twelve columns">
|
||||
<a href="/new">
|
||||
<input type="button" value="add post" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
26
examples/poem_example/templates/layout.html.tera
Normal file
26
examples/poem_example/templates/layout.html.tera
Normal file
@ -0,0 +1,26 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>Poem Example</title>
|
||||
<meta name="description" content="Actix - SeaOrm integration example" />
|
||||
<meta name="author" content="Sam Samai" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
|
||||
<link
|
||||
href="//fonts.googleapis.com/css?family=Raleway:400,300,600"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link rel="stylesheet" href="/static/css/normalize.css" />
|
||||
<link rel="stylesheet" href="/static/css/skeleton.css" />
|
||||
<link rel="stylesheet" href="/static/css/style.css" />
|
||||
<link rel="icon" type="image/png" href="/static/images/favicon.png" />
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<p><!--Nothing to see here --></p>
|
||||
{% block content %}{% endblock content %}
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
38
examples/poem_example/templates/new.html.tera
Normal file
38
examples/poem_example/templates/new.html.tera
Normal file
@ -0,0 +1,38 @@
|
||||
{% extends "layout.html.tera" %} {% block content %}
|
||||
<div class="row">
|
||||
<h4>New Post</h4>
|
||||
<form action="/" method="post">
|
||||
<div class="twelve columns">
|
||||
<input
|
||||
type="text"
|
||||
placeholder="enter title"
|
||||
name="title"
|
||||
id="title"
|
||||
value=""
|
||||
autofocus
|
||||
class="u-full-width"
|
||||
/>
|
||||
<input
|
||||
type="text"
|
||||
placeholder="enter content"
|
||||
name="text"
|
||||
id="text"
|
||||
value=""
|
||||
autofocus
|
||||
class="u-full-width"
|
||||
/>
|
||||
</div>
|
||||
<div class="twelve columns">
|
||||
<div class="two columns">
|
||||
<a href="/">
|
||||
<input type="button" value="cancel" />
|
||||
</a>
|
||||
</div>
|
||||
<div class="eight columns"></div>
|
||||
<div class="two columns">
|
||||
<input type="submit" value="save post" />
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock content %}
|
||||
@ -6,6 +6,7 @@ edition = "2021"
|
||||
publish = false
|
||||
|
||||
[workspace]
|
||||
members = [".", "entity", "migration"]
|
||||
|
||||
[dependencies]
|
||||
async-stream = { version = "^0.3" }
|
||||
@ -19,18 +20,9 @@ rocket_dyn_templates = { version = "0.1.0-rc.1", features = [
|
||||
"tera",
|
||||
] }
|
||||
serde_json = { version = "^1" }
|
||||
|
||||
[dependencies.sea-orm]
|
||||
path = "../../" # remove this line in your own project
|
||||
version = "^0.5.0"
|
||||
features = ["macros", "runtime-tokio-native-tls"]
|
||||
default-features = false
|
||||
entity = { path = "entity" }
|
||||
migration = { path = "migration" }
|
||||
|
||||
[dependencies.sea-orm-rocket]
|
||||
path = "../../sea-orm-rocket/lib" # remove this line in your own project and use the git line
|
||||
# git = "https://github.com/SeaQL/sea-orm"
|
||||
|
||||
[features]
|
||||
default = ["sqlx-postgres"]
|
||||
sqlx-mysql = ["sea-orm/sqlx-mysql"]
|
||||
sqlx-postgres = ["sea-orm/sqlx-postgres"]
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
1. Modify the `url` var in `Rocket.toml` to point to your chosen database
|
||||
|
||||
1. Turn on the appropriate database feature for your chosen db in `Cargo.toml` (the `default = ["sqlx-postgres"]` line)
|
||||
1. Turn on the appropriate database feature for your chosen db in `entity/Cargo.toml` (the `"sqlx-postgres",` line)
|
||||
|
||||
1. `cargo run` to start the server
|
||||
1. Execute `cargo run` to start the server
|
||||
|
||||
1. Open in browser after seeing the `🚀 Rocket has launched from http://localhost:8000` line
|
||||
1. Visit [localhost:8000](http://localhost:8000) in browser after seeing the `🚀 Rocket has launched from http://localhost:8000` line
|
||||
|
||||
26
examples/rocket_example/entity/Cargo.toml
Normal file
26
examples/rocket_example/entity/Cargo.toml
Normal file
@ -0,0 +1,26 @@
|
||||
[package]
|
||||
name = "entity"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
[lib]
|
||||
name = "entity"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
rocket = { version = "0.5.0-rc.1", features = [
|
||||
"json",
|
||||
] }
|
||||
|
||||
[dependencies.sea-orm]
|
||||
# path = "../../../" # remove this line in your own project
|
||||
version = "^0.6.0"
|
||||
features = [
|
||||
"macros",
|
||||
"runtime-tokio-native-tls",
|
||||
"sqlx-postgres",
|
||||
# "sqlx-mysql",
|
||||
# "sqlx-sqlite",
|
||||
]
|
||||
default-features = false
|
||||
6
examples/rocket_example/entity/src/lib.rs
Normal file
6
examples/rocket_example/entity/src/lib.rs
Normal file
@ -0,0 +1,6 @@
|
||||
#[macro_use]
|
||||
extern crate rocket;
|
||||
|
||||
pub mod post;
|
||||
|
||||
pub use sea_orm;
|
||||
14
examples/rocket_example/migration/Cargo.toml
Normal file
14
examples/rocket_example/migration/Cargo.toml
Normal file
@ -0,0 +1,14 @@
|
||||
[package]
|
||||
name = "migration"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
[lib]
|
||||
name = "migration"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
sea-schema = { version = "^0.5.0", default-features = false, features = [ "migration", "debug-print" ] }
|
||||
entity = { path = "../entity" }
|
||||
rocket = { version = "0.5.0-rc.1" }
|
||||
37
examples/rocket_example/migration/README.md
Normal file
37
examples/rocket_example/migration/README.md
Normal file
@ -0,0 +1,37 @@
|
||||
# Running Migrator CLI
|
||||
|
||||
- Apply all pending migrations
|
||||
```sh
|
||||
cargo run
|
||||
```
|
||||
```sh
|
||||
cargo run -- up
|
||||
```
|
||||
- Apply first 10 pending migrations
|
||||
```sh
|
||||
cargo run -- up -n 10
|
||||
```
|
||||
- Rollback last applied migrations
|
||||
```sh
|
||||
cargo run -- down
|
||||
```
|
||||
- Rollback last 10 applied migrations
|
||||
```sh
|
||||
cargo run -- down -n 10
|
||||
```
|
||||
- Drop all tables from the database, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- fresh
|
||||
```
|
||||
- Rollback all applied migrations, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- refresh
|
||||
```
|
||||
- Rollback all applied migrations
|
||||
```sh
|
||||
cargo run -- reset
|
||||
```
|
||||
- Check the status of all migrations
|
||||
```sh
|
||||
cargo run -- status
|
||||
```
|
||||
12
examples/rocket_example/migration/src/lib.rs
Normal file
12
examples/rocket_example/migration/src/lib.rs
Normal file
@ -0,0 +1,12 @@
|
||||
pub use sea_schema::migration::prelude::*;
|
||||
|
||||
mod m20220120_000001_create_post_table;
|
||||
|
||||
pub struct Migrator;
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigratorTrait for Migrator {
|
||||
fn migrations() -> Vec<Box<dyn MigrationTrait>> {
|
||||
vec![Box::new(m20220120_000001_create_post_table::Migration)]
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
use entity::post::*;
|
||||
use sea_schema::migration::prelude::*;
|
||||
|
||||
pub struct Migration;
|
||||
|
||||
impl MigrationName for Migration {
|
||||
fn name(&self) -> &str {
|
||||
"m20220120_000001_create_post_table"
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigrationTrait for Migration {
|
||||
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
manager
|
||||
.create_table(
|
||||
Table::create()
|
||||
.table(Entity)
|
||||
.if_not_exists()
|
||||
.col(
|
||||
ColumnDef::new(Column::Id)
|
||||
.integer()
|
||||
.not_null()
|
||||
.auto_increment()
|
||||
.primary_key(),
|
||||
)
|
||||
.col(ColumnDef::new(Column::Title).string().not_null())
|
||||
.col(ColumnDef::new(Column::Text).string().not_null())
|
||||
.to_owned(),
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
manager
|
||||
.drop_table(Table::drop().table(Entity).to_owned())
|
||||
.await
|
||||
}
|
||||
}
|
||||
18
examples/rocket_example/migration/src/main.rs
Normal file
18
examples/rocket_example/migration/src/main.rs
Normal file
@ -0,0 +1,18 @@
|
||||
use migration::Migrator;
|
||||
use sea_schema::migration::prelude::*;
|
||||
|
||||
#[async_std::main]
|
||||
async fn main() {
|
||||
// Setting `DATABASE_URL` environment variable
|
||||
let key = "DATABASE_URL";
|
||||
if std::env::var(key).is_err() {
|
||||
// Getting the database URL from Rocket.toml if it's not set
|
||||
let figment = rocket::Config::figment();
|
||||
let database_url: String = figment
|
||||
.extract_inner("databases.sea_orm.url")
|
||||
.expect("Cannot find Database URL in Rocket.toml");
|
||||
std::env::set_var(key, database_url);
|
||||
}
|
||||
|
||||
cli::run_cli(Migrator).await;
|
||||
}
|
||||
@ -10,16 +10,16 @@ use rocket::{Build, Request, Rocket};
|
||||
use rocket_dyn_templates::Template;
|
||||
use serde_json::json;
|
||||
|
||||
use entity::sea_orm;
|
||||
use migration::MigratorTrait;
|
||||
use sea_orm::{entity::*, query::*};
|
||||
use sea_orm_rocket::{Connection, Database};
|
||||
|
||||
mod pool;
|
||||
use pool::Db;
|
||||
|
||||
mod setup;
|
||||
|
||||
mod post;
|
||||
pub use post::Entity as Post;
|
||||
pub use entity::post;
|
||||
pub use entity::post::Entity as Post;
|
||||
|
||||
const DEFAULT_POSTS_PER_PAGE: usize = 5;
|
||||
|
||||
@ -114,7 +114,7 @@ async fn list(
|
||||
"num_pages": num_pages,
|
||||
"posts": posts,
|
||||
"flash": flash.map(FlashMessage::into_inner),
|
||||
})
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
@ -131,7 +131,7 @@ async fn edit(conn: Connection<'_, Db>, id: i32) -> Template {
|
||||
"edit",
|
||||
json! ({
|
||||
"post": post,
|
||||
})
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
@ -160,13 +160,13 @@ pub fn not_found(req: &Request<'_>) -> Template {
|
||||
"error/404",
|
||||
json! ({
|
||||
"uri": req.uri()
|
||||
})
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
async fn run_migrations(rocket: Rocket<Build>) -> fairing::Result {
|
||||
let conn = &Db::fetch(&rocket).unwrap().conn;
|
||||
let _ = setup::create_post_table(conn).await;
|
||||
let _ = migration::Migrator::up(conn, None).await;
|
||||
Ok(rocket)
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
use async_trait::async_trait;
|
||||
use entity::sea_orm;
|
||||
use sea_orm::ConnectOptions;
|
||||
use sea_orm_rocket::{rocket::figment::Figment, Config, Database};
|
||||
use std::time::Duration;
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
use sea_orm::sea_query::{ColumnDef, TableCreateStatement};
|
||||
use sea_orm::{error::*, query::*, sea_query, DbConn, ExecResult};
|
||||
|
||||
async fn create_table(db: &DbConn, stmt: &TableCreateStatement) -> Result<ExecResult, DbErr> {
|
||||
let builder = db.get_database_backend();
|
||||
db.execute(builder.build(stmt)).await
|
||||
}
|
||||
|
||||
pub async fn create_post_table(db: &DbConn) -> Result<ExecResult, DbErr> {
|
||||
let stmt = sea_query::Table::create()
|
||||
.table(super::post::Entity)
|
||||
.if_not_exists()
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Id)
|
||||
.integer()
|
||||
.not_null()
|
||||
.auto_increment()
|
||||
.primary_key(),
|
||||
)
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Title)
|
||||
.string()
|
||||
.not_null(),
|
||||
)
|
||||
.col(
|
||||
ColumnDef::new(super::post::Column::Text)
|
||||
.string()
|
||||
.not_null(),
|
||||
)
|
||||
.to_owned();
|
||||
|
||||
create_table(db, &stmt).await
|
||||
}
|
||||
@ -9,4 +9,4 @@ publish = false
|
||||
|
||||
[dependencies]
|
||||
sea-orm = { path = "../../", features = [ "sqlx-all", "runtime-async-std-native-tls", "debug-print" ] }
|
||||
async-std = { version = "^1", features = ["attributes"] }
|
||||
async-std = { version = "^1", features = ["attributes", "tokio1"] }
|
||||
|
||||
@ -8,7 +8,7 @@ edition = "2021"
|
||||
publish = false
|
||||
|
||||
[dependencies]
|
||||
async-std = { version = "^1", features = ["attributes"] }
|
||||
async-std = { version = "^1", features = ["attributes", "tokio1"] }
|
||||
serde = { version = "^1", features = ["derive"] }
|
||||
sea-orm = { path = "../../", features = [
|
||||
"sqlx-mysql",
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "sea-orm-cli"
|
||||
version = "0.5.0"
|
||||
version = "0.6.0"
|
||||
authors = [ "Billy Chan <ccw.billy.123@gmail.com>" ]
|
||||
edition = "2021"
|
||||
description = "Command line utility for SeaORM"
|
||||
@ -20,15 +20,16 @@ path = "src/main.rs"
|
||||
[dependencies]
|
||||
clap = { version = "^2.33.3" }
|
||||
dotenv = { version = "^0.15" }
|
||||
async-std = { version = "^1.9", features = [ "attributes" ] }
|
||||
sea-orm-codegen = { version = "^0.5.0", path = "../sea-orm-codegen" }
|
||||
sea-schema = { version = "0.4.0", default-features = false, features = [
|
||||
async-std = { version = "^1.9", features = [ "attributes", "tokio1" ] }
|
||||
sea-orm-codegen = { version = "^0.6.0", path = "../sea-orm-codegen" }
|
||||
sea-schema = { version = "^0.5.0", default-features = false, features = [
|
||||
"debug-print",
|
||||
"sqlx-mysql",
|
||||
"sqlx-sqlite",
|
||||
"sqlx-postgres",
|
||||
"discovery",
|
||||
"writer",
|
||||
"migration",
|
||||
] }
|
||||
sqlx = { version = "^0.5", default-features = false, features = [ "mysql", "postgres" ] }
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
|
||||
@ -6,7 +6,7 @@ Getting Help:
|
||||
cargo run -- -h
|
||||
```
|
||||
|
||||
Running Entity Generator:
|
||||
## Running Entity Generator:
|
||||
|
||||
```sh
|
||||
# MySQL (`--database-schema` option is ignored)
|
||||
@ -18,3 +18,46 @@ cargo run -- generate entity -u sqlite://bakery.db -o out
|
||||
# PostgreSQL
|
||||
cargo run -- generate entity -u postgres://sea:sea@localhost/bakery -s public -o out
|
||||
```
|
||||
|
||||
## Running Migration:
|
||||
|
||||
- Initialize migration directory
|
||||
```sh
|
||||
cargo run -- migrate init
|
||||
```
|
||||
- Apply all pending migrations
|
||||
```sh
|
||||
cargo run -- migrate
|
||||
```
|
||||
```sh
|
||||
cargo run -- migrate up
|
||||
```
|
||||
- Apply first 10 pending migrations
|
||||
```sh
|
||||
cargo run -- migrate up -n 10
|
||||
```
|
||||
- Rollback last applied migrations
|
||||
```sh
|
||||
cargo run -- migrate down
|
||||
```
|
||||
- Rollback last 10 applied migrations
|
||||
```sh
|
||||
cargo run -- migrate down -n 10
|
||||
```
|
||||
- Drop all tables from the database, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- migrate fresh
|
||||
```
|
||||
- Rollback all applied migrations, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- migrate refresh
|
||||
```
|
||||
- Rollback all applied migrations
|
||||
```sh
|
||||
cargo run -- migrate reset
|
||||
```
|
||||
- Check the status of all migrations
|
||||
```sh
|
||||
cargo run -- migrate status
|
||||
```
|
||||
|
||||
|
||||
@ -74,10 +74,30 @@ pub fn build_cli() -> App<'static, 'static> {
|
||||
)
|
||||
.setting(AppSettings::SubcommandRequiredElseHelp);
|
||||
|
||||
App::new("sea-orm")
|
||||
let arg_migration_dir = Arg::with_name("MIGRATION_DIR")
|
||||
.long("migration-dir")
|
||||
.short("d")
|
||||
.help("Migration script directory")
|
||||
.takes_value(true)
|
||||
.default_value("./migration");
|
||||
let mut migrate_subcommands = SubCommand::with_name("migrate")
|
||||
.about("Migration related commands")
|
||||
.subcommand(
|
||||
SubCommand::with_name("init")
|
||||
.about("Initialize migration directory")
|
||||
.arg(arg_migration_dir.clone()),
|
||||
)
|
||||
.arg(arg_migration_dir.clone());
|
||||
for subcommand in sea_schema::migration::get_subcommands() {
|
||||
migrate_subcommands =
|
||||
migrate_subcommands.subcommand(subcommand.arg(arg_migration_dir.clone()));
|
||||
}
|
||||
|
||||
App::new("sea-orm-cli")
|
||||
.version(env!("CARGO_PKG_VERSION"))
|
||||
.setting(AppSettings::VersionlessSubcommands)
|
||||
.subcommand(entity_subcommand)
|
||||
.subcommand(migrate_subcommands)
|
||||
.arg(
|
||||
Arg::with_name("VERBOSE")
|
||||
.long("verbose")
|
||||
|
||||
@ -16,6 +16,7 @@ async fn main() {
|
||||
("generate", Some(matches)) => run_generate_command(matches)
|
||||
.await
|
||||
.unwrap_or_else(handle_error),
|
||||
("migrate", Some(matches)) => run_migrate_command(matches).unwrap_or_else(handle_error),
|
||||
_ => unreachable!("You should never see this message"),
|
||||
}
|
||||
}
|
||||
@ -187,6 +188,81 @@ async fn run_generate_command(matches: &ArgMatches<'_>) -> Result<(), Box<dyn Er
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn run_migrate_command(matches: &ArgMatches<'_>) -> Result<(), Box<dyn Error>> {
|
||||
let migrate_subcommand = matches.subcommand();
|
||||
// If it's `migrate init`
|
||||
if let ("init", Some(args)) = migrate_subcommand {
|
||||
let migration_dir = args.value_of("MIGRATION_DIR").unwrap();
|
||||
let migration_dir = match migration_dir.ends_with('/') {
|
||||
true => migration_dir.to_string(),
|
||||
false => format!("{}/", migration_dir),
|
||||
};
|
||||
println!("Initializing migration directory...");
|
||||
macro_rules! write_file {
|
||||
($filename: literal) => {
|
||||
write_file!($filename, $filename);
|
||||
};
|
||||
($filename: literal, $template: literal) => {
|
||||
let filepath = [&migration_dir, $filename].join("");
|
||||
println!("Creating file `{}`", filepath);
|
||||
let path = Path::new(&filepath);
|
||||
let prefix = path.parent().unwrap();
|
||||
fs::create_dir_all(prefix).unwrap();
|
||||
let mut file = fs::File::create(path)?;
|
||||
let content = include_str!(concat!("../template/migration/", $template));
|
||||
file.write_all(content.as_bytes())?;
|
||||
};
|
||||
}
|
||||
write_file!("src/lib.rs");
|
||||
write_file!("src/m20220101_000001_create_table.rs");
|
||||
write_file!("src/main.rs");
|
||||
write_file!("Cargo.toml", "_Cargo.toml");
|
||||
write_file!("README.md");
|
||||
println!("Done!");
|
||||
// Early exit!
|
||||
return Ok(());
|
||||
}
|
||||
let (subcommand, migration_dir, steps, verbose) = match migrate_subcommand {
|
||||
// Catch all command with pattern `migrate xxx`
|
||||
(subcommand, Some(args)) => {
|
||||
let migration_dir = args.value_of("MIGRATION_DIR").unwrap();
|
||||
let steps = args.value_of("NUM_MIGRATION");
|
||||
let verbose = args.is_present("VERBOSE");
|
||||
(subcommand, migration_dir, steps, verbose)
|
||||
}
|
||||
// Catch command `migrate`, this will be treated as `migrate up`
|
||||
_ => {
|
||||
let migration_dir = matches.value_of("MIGRATION_DIR").unwrap();
|
||||
let verbose = matches.is_present("VERBOSE");
|
||||
("up", migration_dir, None, verbose)
|
||||
}
|
||||
};
|
||||
// Construct the `--manifest-path`
|
||||
let manifest_path = if migration_dir.ends_with('/') {
|
||||
format!("{}Cargo.toml", migration_dir)
|
||||
} else {
|
||||
format!("{}/Cargo.toml", migration_dir)
|
||||
};
|
||||
// Construct the arguments that will be supplied to `cargo` command
|
||||
let mut args = vec![
|
||||
"run",
|
||||
"--manifest-path",
|
||||
manifest_path.as_str(),
|
||||
"--",
|
||||
subcommand,
|
||||
];
|
||||
if let Some(steps) = steps {
|
||||
args.extend(["-n", steps]);
|
||||
}
|
||||
if verbose {
|
||||
args.push("-v");
|
||||
}
|
||||
// Run migrator CLI on user's behalf
|
||||
println!("Running `cargo {}`", args.join(" "));
|
||||
Command::new("cargo").args(args).spawn()?.wait()?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn handle_error<E>(error: E)
|
||||
where
|
||||
E: Display,
|
||||
@ -197,11 +273,13 @@ where
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use clap::AppSettings;
|
||||
use super::*;
|
||||
use clap::AppSettings;
|
||||
|
||||
#[test]
|
||||
#[should_panic(expected = "called `Result::unwrap()` on an `Err` value: RelativeUrlWithoutBase")]
|
||||
#[should_panic(
|
||||
expected = "called `Result::unwrap()` on an `Err` value: RelativeUrlWithoutBase"
|
||||
)]
|
||||
fn test_generate_entity_no_protocol() {
|
||||
let matches = cli::build_cli()
|
||||
.setting(AppSettings::NoBinaryName)
|
||||
@ -216,7 +294,9 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic(expected = "There is no database name as part of the url path: postgresql://root:root@localhost:3306")]
|
||||
#[should_panic(
|
||||
expected = "There is no database name as part of the url path: postgresql://root:root@localhost:3306"
|
||||
)]
|
||||
fn test_generate_entity_no_database_section() {
|
||||
let matches = cli::build_cli()
|
||||
.setting(AppSettings::NoBinaryName)
|
||||
@ -231,7 +311,9 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic(expected = "There is no database name as part of the url path: mysql://root:root@localhost:3306/")]
|
||||
#[should_panic(
|
||||
expected = "There is no database name as part of the url path: mysql://root:root@localhost:3306/"
|
||||
)]
|
||||
fn test_generate_entity_no_database_path() {
|
||||
let matches = cli::build_cli()
|
||||
.setting(AppSettings::NoBinaryName)
|
||||
|
||||
37
sea-orm-cli/template/migration/README.md
Normal file
37
sea-orm-cli/template/migration/README.md
Normal file
@ -0,0 +1,37 @@
|
||||
# Running Migrator CLI
|
||||
|
||||
- Apply all pending migrations
|
||||
```sh
|
||||
cargo run
|
||||
```
|
||||
```sh
|
||||
cargo run -- up
|
||||
```
|
||||
- Apply first 10 pending migrations
|
||||
```sh
|
||||
cargo run -- up -n 10
|
||||
```
|
||||
- Rollback last applied migrations
|
||||
```sh
|
||||
cargo run -- down
|
||||
```
|
||||
- Rollback last 10 applied migrations
|
||||
```sh
|
||||
cargo run -- down -n 10
|
||||
```
|
||||
- Drop all tables from the database, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- fresh
|
||||
```
|
||||
- Rollback all applied migrations, then reapply all migrations
|
||||
```sh
|
||||
cargo run -- refresh
|
||||
```
|
||||
- Rollback all applied migrations
|
||||
```sh
|
||||
cargo run -- reset
|
||||
```
|
||||
- Check the status of all migrations
|
||||
```sh
|
||||
cargo run -- status
|
||||
```
|
||||
12
sea-orm-cli/template/migration/_Cargo.toml
Normal file
12
sea-orm-cli/template/migration/_Cargo.toml
Normal file
@ -0,0 +1,12 @@
|
||||
[package]
|
||||
name = "migration"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
[lib]
|
||||
name = "migration"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
sea-schema = { version = "^0.5.0", default-features = false, features = [ "migration", "debug-print" ] }
|
||||
12
sea-orm-cli/template/migration/src/lib.rs
Normal file
12
sea-orm-cli/template/migration/src/lib.rs
Normal file
@ -0,0 +1,12 @@
|
||||
pub use sea_schema::migration::prelude::*;
|
||||
|
||||
mod m20220101_000001_create_table;
|
||||
|
||||
pub struct Migrator;
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigratorTrait for Migrator {
|
||||
fn migrations() -> Vec<Box<dyn MigrationTrait>> {
|
||||
vec![Box::new(m20220101_000001_create_table::Migration)]
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
use sea_schema::migration::prelude::*;
|
||||
|
||||
pub struct Migration;
|
||||
|
||||
impl MigrationName for Migration {
|
||||
fn name(&self) -> &str {
|
||||
"m20220101_000001_create_table"
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl MigrationTrait for Migration {
|
||||
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
todo!()
|
||||
}
|
||||
|
||||
async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
7
sea-orm-cli/template/migration/src/main.rs
Normal file
7
sea-orm-cli/template/migration/src/main.rs
Normal file
@ -0,0 +1,7 @@
|
||||
use migration::Migrator;
|
||||
use sea_schema::migration::prelude::*;
|
||||
|
||||
#[async_std::main]
|
||||
async fn main() {
|
||||
cli::run_cli(Migrator).await;
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "sea-orm-codegen"
|
||||
version = "0.5.0"
|
||||
version = "0.6.0"
|
||||
authors = ["Billy Chan <ccw.billy.123@gmail.com>"]
|
||||
edition = "2021"
|
||||
description = "Code Generator for SeaORM"
|
||||
@ -15,7 +15,7 @@ name = "sea_orm_codegen"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
sea-query = { version = "0.20.0" }
|
||||
sea-query = { version = "0.21.0" }
|
||||
syn = { version = "^1", default-features = false, features = [
|
||||
"derive",
|
||||
"parsing",
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
use crate::WithSerde;
|
||||
use heck::CamelCase;
|
||||
use proc_macro2::TokenStream;
|
||||
use quote::{format_ident, quote};
|
||||
@ -9,7 +10,7 @@ pub struct ActiveEnum {
|
||||
}
|
||||
|
||||
impl ActiveEnum {
|
||||
pub fn impl_active_enum(&self) -> TokenStream {
|
||||
pub fn impl_active_enum(&self, with_serde: &WithSerde) -> TokenStream {
|
||||
let enum_name = &self.enum_name;
|
||||
let enum_iden = format_ident!("{}", enum_name.to_camel_case());
|
||||
let values = &self.values;
|
||||
@ -17,8 +18,11 @@ impl ActiveEnum {
|
||||
.values
|
||||
.iter()
|
||||
.map(|v| format_ident!("{}", v.to_camel_case()));
|
||||
|
||||
let extra_derive = with_serde.extra_derive();
|
||||
|
||||
quote! {
|
||||
#[derive(Debug, Clone, PartialEq, EnumIter, DeriveActiveEnum)]
|
||||
#[derive(Debug, Clone, PartialEq, EnumIter, DeriveActiveEnum #extra_derive)]
|
||||
#[sea_orm(rs_type = "String", db_type = "Enum", enum_name = #enum_name)]
|
||||
pub enum #enum_iden {
|
||||
#(
|
||||
|
||||
@ -22,6 +22,10 @@ impl Column {
|
||||
format_ident!("{}", escape_rust_keyword(self.name.to_camel_case()))
|
||||
}
|
||||
|
||||
pub fn is_snake_case_name(&self) -> bool {
|
||||
self.name.to_snake_case() == self.name
|
||||
}
|
||||
|
||||
pub fn get_rs_type(&self) -> TokenStream {
|
||||
#[allow(unreachable_patterns)]
|
||||
let ident: TokenStream = match &self.col_type {
|
||||
@ -38,7 +42,8 @@ impl Column {
|
||||
ColumnType::Json | ColumnType::JsonBinary => "Json".to_owned(),
|
||||
ColumnType::Date => "Date".to_owned(),
|
||||
ColumnType::Time(_) => "Time".to_owned(),
|
||||
ColumnType::DateTime(_) | ColumnType::Timestamp(_) => "DateTime".to_owned(),
|
||||
ColumnType::DateTime(_) => "DateTime".to_owned(),
|
||||
ColumnType::Timestamp(_) => "DateTimeUtc".to_owned(),
|
||||
ColumnType::TimestampWithTimeZone(_) => "DateTimeWithTimeZone".to_owned(),
|
||||
ColumnType::Decimal(_) | ColumnType::Money(_) => "Decimal".to_owned(),
|
||||
ColumnType::Uuid => "Uuid".to_owned(),
|
||||
@ -271,7 +276,7 @@ mod tests {
|
||||
"Date",
|
||||
"Time",
|
||||
"DateTime",
|
||||
"DateTime",
|
||||
"DateTimeUtc",
|
||||
"DateTimeWithTimeZone",
|
||||
];
|
||||
for (mut col, rs_type) in columns.into_iter().zip(rs_types) {
|
||||
|
||||
@ -81,25 +81,25 @@ impl FromStr for WithSerde {
|
||||
impl EntityWriter {
|
||||
pub fn generate(self, expanded_format: bool, with_serde: WithSerde) -> WriterOutput {
|
||||
let mut files = Vec::new();
|
||||
files.extend(self.write_entities(expanded_format, with_serde));
|
||||
files.extend(self.write_entities(expanded_format, &with_serde));
|
||||
files.push(self.write_mod());
|
||||
files.push(self.write_prelude());
|
||||
if !self.enums.is_empty() {
|
||||
files.push(self.write_sea_orm_active_enums());
|
||||
files.push(self.write_sea_orm_active_enums(&with_serde));
|
||||
}
|
||||
WriterOutput { files }
|
||||
}
|
||||
|
||||
pub fn write_entities(&self, expanded_format: bool, with_serde: WithSerde) -> Vec<OutputFile> {
|
||||
pub fn write_entities(&self, expanded_format: bool, with_serde: &WithSerde) -> Vec<OutputFile> {
|
||||
self.entities
|
||||
.iter()
|
||||
.map(|entity| {
|
||||
let mut lines = Vec::new();
|
||||
Self::write_doc_comment(&mut lines);
|
||||
let code_blocks = if expanded_format {
|
||||
Self::gen_expanded_code_blocks(entity, &with_serde)
|
||||
Self::gen_expanded_code_blocks(entity, with_serde)
|
||||
} else {
|
||||
Self::gen_compact_code_blocks(entity, &with_serde)
|
||||
Self::gen_compact_code_blocks(entity, with_serde)
|
||||
};
|
||||
Self::write(&mut lines, code_blocks);
|
||||
OutputFile {
|
||||
@ -147,20 +147,18 @@ impl EntityWriter {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn write_sea_orm_active_enums(&self) -> OutputFile {
|
||||
pub fn write_sea_orm_active_enums(&self, with_serde: &WithSerde) -> OutputFile {
|
||||
let mut lines = Vec::new();
|
||||
Self::write_doc_comment(&mut lines);
|
||||
Self::write(
|
||||
&mut lines,
|
||||
vec![quote! {
|
||||
use sea_orm::entity::prelude::*;
|
||||
}],
|
||||
vec![Self::gen_import(with_serde)],
|
||||
);
|
||||
lines.push("".to_owned());
|
||||
let code_blocks = self
|
||||
.enums
|
||||
.iter()
|
||||
.map(|(_, active_enum)| active_enum.impl_active_enum())
|
||||
.map(|(_, active_enum)| active_enum.impl_active_enum(with_serde))
|
||||
.collect();
|
||||
Self::write(&mut lines, code_blocks);
|
||||
OutputFile {
|
||||
@ -306,11 +304,22 @@ impl EntityWriter {
|
||||
}
|
||||
|
||||
pub fn gen_column_enum(entity: &Entity) -> TokenStream {
|
||||
let column_names_camel_case = entity.get_column_names_camel_case();
|
||||
let column_variants = entity.columns.iter().map(|col| {
|
||||
let variant = col.get_name_camel_case();
|
||||
let mut variant = quote! { #variant };
|
||||
if !col.is_snake_case_name() {
|
||||
let column_name = &col.name;
|
||||
variant = quote! {
|
||||
#[sea_orm(column_name = #column_name)]
|
||||
#variant
|
||||
};
|
||||
}
|
||||
variant
|
||||
});
|
||||
quote! {
|
||||
#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
|
||||
pub enum Column {
|
||||
#(#column_names_camel_case,)*
|
||||
#(#column_variants,)*
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -474,6 +483,10 @@ impl EntityWriter {
|
||||
.iter()
|
||||
.map(|col| {
|
||||
let mut attrs: Punctuated<_, Comma> = Punctuated::new();
|
||||
if !col.is_snake_case_name() {
|
||||
let column_name = &col.name;
|
||||
attrs.push(quote! { column_name = #column_name });
|
||||
}
|
||||
if primary_keys.contains(&col.name) {
|
||||
attrs.push(quote! { primary_key });
|
||||
if !col.auto_increment {
|
||||
@ -724,14 +737,14 @@ mod tests {
|
||||
unique: false,
|
||||
},
|
||||
Column {
|
||||
name: "name".to_owned(),
|
||||
name: "_name_".to_owned(),
|
||||
col_type: ColumnType::String(Some(255)),
|
||||
auto_increment: false,
|
||||
not_null: true,
|
||||
unique: false,
|
||||
},
|
||||
Column {
|
||||
name: "fruit_id".to_owned(),
|
||||
name: "fruitId".to_owned(),
|
||||
col_type: ColumnType::Integer(Some(11)),
|
||||
auto_increment: false,
|
||||
not_null: false,
|
||||
@ -740,7 +753,7 @@ mod tests {
|
||||
],
|
||||
relations: vec![Relation {
|
||||
ref_table: "fruit".to_owned(),
|
||||
columns: vec!["fruit_id".to_owned()],
|
||||
columns: vec!["fruitId".to_owned()],
|
||||
ref_columns: vec!["id".to_owned()],
|
||||
rel_type: RelationType::BelongsTo,
|
||||
on_delete: None,
|
||||
|
||||
@ -7,7 +7,9 @@ use sea_orm::entity::prelude::*;
|
||||
pub struct Model {
|
||||
#[sea_orm(primary_key)]
|
||||
pub id: i32,
|
||||
#[sea_orm(column_name = "_name_")]
|
||||
pub name: String,
|
||||
#[sea_orm(column_name = "fruitId")]
|
||||
pub fruit_id: Option<i32> ,
|
||||
}
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user