caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Without direct rocket dependency

Browse Source
This commit is contained in:
Billy Chan 2021-08-30 22:34:02 +08:00
parent 3b21b999a7
commit dfe26f9b7c
No known key found for this signature in database
GPG Key ID: A2D690CAC7DF3CC7
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.toml
View File

@ -36,12 +36,8 @@ sqlx-core = { version = "^0.5", optional = true }
sqlx-macros = { version = "^0.5", optional = true } sqlx-macros = { version = "^0.5", optional = true }
serde_json = { version = "^1", optional = true } serde_json = { version = "^1", optional = true }
uuid = { version = "0.8", features = ["serde", "v4"], optional = true } uuid = { version = "0.8", features = ["serde", "v4"], optional = true }
rocket = { git = "https://github.com/SergioBenitez/Rocket.git", features = [ rocket_db_pools = { git = "https://github.com/SergioBenitez/Rocket.git", features = ["sqlx_mysql"], optional = true }
"json", async-trait = { version = "0.1", optional = true }
], optional = true }
rocket_db_pools = { git = "https://github.com/SergioBenitez/Rocket.git", features = [
"sqlx_mysql",
], optional = true }
[dev-dependencies] [dev-dependencies]
smol = { version = "^1.2" } smol = { version = "^1.2" }
@ -93,4 +89,4 @@ runtime-actix-rustls = ["sqlx/runtime-actix-rustls", "runtime-actix"]
runtime-tokio = [] runtime-tokio = []
runtime-tokio-native-tls = ["sqlx/runtime-tokio-native-tls", "runtime-tokio"] runtime-tokio-native-tls = ["sqlx/runtime-tokio-native-tls", "runtime-tokio"]
runtime-tokio-rustls = ["sqlx/runtime-tokio-rustls", "runtime-tokio"] runtime-tokio-rustls = ["sqlx/runtime-tokio-rustls", "runtime-tokio"]
rocket-db = ["rocket", "rocket_db_pools"] web-api-rocket = ["rocket_db_pools", "async-trait"]

6
examples/rocket_example/Cargo.toml
View File

@ -5,11 +5,9 @@ edition = "2018"
publish = false publish = false
[workspace] [workspace]
[dependencies] [dependencies]
rocket = { git = "https://github.com/SergioBenitez/Rocket.git", features = [ rocket = { git = "https://github.com/SergioBenitez/Rocket.git", features = ["json"] }
"json",
] }
rocket_db_pools = { git = "https://github.com/SergioBenitez/Rocket.git", features = [] } rocket_db_pools = { git = "https://github.com/SergioBenitez/Rocket.git", features = [] }
sea-orm = { path = "../../", features = ["rocket-db"] } sea-orm = { path = "../../", features = ["web-api-rocket"] }
sea-query = { version = "^0.12.8" } sea-query = { version = "^0.12.8" }
serde_json = { version = "^1" } serde_json = { version = "^1" }

4
src/driver/mod.rs
View File

@ -20,7 +20,7 @@ pub use sqlx_postgres::*;
#[cfg(feature = "sqlx-sqlite")] #[cfg(feature = "sqlx-sqlite")]
pub use sqlx_sqlite::*; pub use sqlx_sqlite::*;
#[cfg(feature = "rocket-db")] #[cfg(feature = "web-api-rocket")]
mod rocket_db; mod rocket_db;
#[cfg(feature = "rocket-db")] #[cfg(feature = "web-api-rocket")]
pub use rocket_db::*; pub use rocket_db::*;

6
src/driver/rocket_db.rs
View File

@ -1,7 +1,7 @@
use rocket::figment::Figment; use async_trait::async_trait;
use rocket_db_pools::{Config, Error}; use rocket_db_pools::{rocket::figment::Figment, Config, Error};
#[rocket::async_trait] #[async_trait]
impl rocket_db_pools::Pool for crate::Database { impl rocket_db_pools::Pool for crate::Database {
type Error = crate::DbErr; type Error = crate::DbErr;