warp-tech/warpgate
1
1
Fork 0
mirror of https://github.com/warp-tech/warpgate.git synced 2024-09-20 06:46:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

bumped sea-orm

Browse source
This commit is contained in:
Eugene Pankov 2022-05-30 10:04:51 +02:00
parent a922a3fb49
commit b6ccd5516d
No known key found for this signature in database
GPG key ID: 5896FCBBDD1CF4F4
13 changed files with 79 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
Cargo.lock generated
View file

@ -2817,9 +2817,9 @@ checksum = "2fde85c94a50dc789df8ca7b39f6b8b1eaa6cd320cc729e9ce1e1e1104292719"
[[package]]
name = "sea-orm"
version = "0.7.1"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27dbb8a742003f8dbf2ba290d128134d4275a6b55fd02f4d728683b6b55ea9bf"
checksum = "51de529763804dd4f74c133055f53eccdda2221bdded94351009be28cc80d2fb"
dependencies = [
"async-stream",
"async-trait",
@ -2830,7 +2830,7 @@ dependencies = [
"ouroboros",
"rust_decimal",
"sea-orm-macros",
"sea-query 0.23.0",
"sea-query",
"sea-strum",
"serde",
"serde_json",
@ -2842,10 +2842,27 @@ dependencies = [
]
[[package]]
name = "sea-orm-macros"
version = "0.7.0"
name = "sea-orm-cli"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "953bf5fb9f6ec985c139c4a98550b600c2f7c97bea74e2acc4025438469cb5a2"
checksum = "fca862fdba12c753bffba9c9adf95d3d3f5dcc82fd589b12faeee7068bb173d5"
dependencies = [
"async-std",
"chrono",
"clap 2.34.0",
"dotenv",
"regex",
"sea-schema",
"tracing",
"tracing-subscriber",
"url",
]
[[package]]
name = "sea-orm-macros"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f9378e21366b119d281489013c8170c49972fd3709c2155eb4504a913715d2d"
dependencies = [
"bae",
"heck 0.3.3",
@ -2855,23 +2872,31 @@ dependencies = [
]
[[package]]
name = "sea-query"
version = "0.22.0"
name = "sea-orm-migration"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "727090e8d1e61edd07305d237664315226748ad559e16daa6293fa26c4e7a3c3"
checksum = "15589f057677f57bea393572bd8eb9e8feb843a5f09b4fa518be6cef3a6ffedc"
dependencies = [
"sea-query-derive",
"async-trait",
"clap 2.34.0",
"dotenv",
"sea-orm",
"sea-orm-cli",
"sea-schema",
"tracing",
"tracing-subscriber",
]
[[package]]
name = "sea-query"
version = "0.23.0"
version = "0.24.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bf24fc03259e206d8cd4c957ce7446fe54ab00ba5ada4cdb028aa3513e26231"
checksum = "6b0fa62db5ae33dfc61e805b0b0c9d579c3733f1ed90326b3779f5b38f30fa2a"
dependencies = [
"chrono",
"rust_decimal",
"sea-query-derive",
"sea-query-driver",
"serde_json",
"time 0.2.27",
"uuid",
@ -2891,21 +2916,25 @@ dependencies = [
]
[[package]]
name = "sea-schema"
version = "0.7.1"
name = "sea-query-driver"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d492f4550a428d2be29e4df8e43b2e9e46717424c9603fafa3365ae6079bd73"
checksum = "7e3953baee94dcb90f0e19e8b4b91b91e9394867b0fc1886d0221cfc6d0439f5"
dependencies = [
"async-std",
"async-trait",
"clap 2.34.0",
"dotenv",
"log",
"sea-orm",
"sea-query 0.22.0",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "sea-schema"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09fea4b9dccc8b0667f108de2d09bdabd42a137b8437de092374a4e36de8c12f"
dependencies = [
"futures",
"sea-query",
"sea-schema-derive",
"tracing",
"tracing-subscriber",
]
[[package]]
@ -4101,7 +4130,7 @@ version = "0.1.0"
dependencies = [
"chrono",
"sea-orm",
"sea-schema",
"sea-orm-migration",
"uuid",
]

2
warpgate-admin/Cargo.toml
View file

@ -16,7 +16,7 @@ poem = {version = "^1.3.24", features = ["cookie", "session", "anyhow", "rustls"
poem-openapi = {version = "^1.3.30", features = ["swagger-ui", "chrono", "uuid", "static-files"]}
russh-keys = {version = "0.22.0-beta.1", features = ["openssl"]}
rust-embed = "6.3"
sea-orm = {version = "^0.7", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false}
sea-orm = {version = "^0.8", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false}
serde = "1.0"
serde_json = "1.0"
thiserror = "1.0"

2
warpgate-common/Cargo.toml
View file

@ -20,7 +20,7 @@ poem-openapi = {version = "^1.3.30", features = ["swagger-ui", "chrono", "uuid",
rand = "0.8"
rand_chacha = "0.3"
rand_core = {version = "0.6", features = ["std"]}
sea-orm = {version = "^0.7", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false}
sea-orm = {version = "^0.8", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false}
serde = "1.0"
serde_json = "1.0"
thiserror = "1.0"

5
warpgate-common/src/db/mod.rs
View file

@ -7,7 +7,7 @@ use sea_orm::{
};
use std::time::Duration;
use warpgate_db_entities::LogEntry;
use warpgate_db_migrations::{Migrator, MigratorTrait};
use warpgate_db_migrations::migrate_database;
pub async fn connect_to_db(config: &WarpgateConfig) -> Result<DatabaseConnection> {
let mut url = url::Url::parse(&config.store.database_url.expose_secret()[..])?;
@ -46,8 +46,7 @@ pub async fn connect_to_db(config: &WarpgateConfig) -> Result<DatabaseConnection
let connection = Database::connect(opt).await?;
Migrator::up(&connection, None).await?;
migrate_database(&connection).await?;
Ok(connection)
}

2
warpgate-db-entities/Cargo.toml
View file

@ -7,7 +7,7 @@ version = "0.1.0"
[dependencies]
chrono = {version = "0.4", features = ["serde"]}
poem-openapi = {version = "^1.3.30", features = ["chrono", "uuid"]}
sea-orm = {version = "^0.7", features = ["macros", "with-chrono", "with-uuid"], default-features = false}
sea-orm = {version = "^0.8", features = ["macros", "with-chrono", "with-uuid"], default-features = false}
serde = "1.0"
serde_json = "1.0"
uuid = {version = "0.8", features = ["v4", "serde"]}

4
warpgate-db-migrations/Cargo.toml
View file

@ -9,6 +9,6 @@ version = "0.1.0"
[dependencies]
chrono = "0.4"
sea-orm = {version = "^0.7", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false}
sea-schema = {version = "0.7", default-features = false, features = ["migration", "debug-print"]}
sea-orm = {version = "^0.8", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false}
sea-orm-migration = {version = "^0.8", default-features = false}
uuid = {version = "0.8", features = ["v4", "serde"]}

8
warpgate-db-migrations/src/lib.rs
View file

@ -1,4 +1,6 @@
pub use sea_schema::migration::*;
use sea_orm::DatabaseConnection;
use sea_orm_migration::MigrationTrait;
use sea_orm_migration::prelude::*;
mod m00001_create_ticket;
mod m00002_create_session;
@ -20,3 +22,7 @@ impl MigratorTrait for Migrator {
]
}
}
pub async fn migrate_database(connection: &DatabaseConnection) -> Result<(), DbErr> {
Migrator::up(&connection, None).await
}

5
warpgate-db-migrations/src/m00001_create_ticket.rs
View file

@ -1,6 +1,5 @@
use sea_schema::migration::sea_orm::Schema;
use sea_schema::migration::sea_query::*;
use sea_schema::migration::*;
use sea_orm::Schema;
use sea_orm_migration::prelude::*;
pub mod ticket {
use sea_orm::entity::prelude::*;

5
warpgate-db-migrations/src/m00002_create_session.rs
View file

@ -1,6 +1,5 @@
use sea_schema::migration::sea_orm::Schema;
use sea_schema::migration::sea_query::*;
use sea_schema::migration::*;
use sea_orm::Schema;
use sea_orm_migration::prelude::*;
pub mod session {
use crate::m00001_create_ticket::ticket;

5
warpgate-db-migrations/src/m00003_create_recording.rs
View file

@ -1,6 +1,5 @@
use sea_schema::migration::sea_orm::Schema;
use sea_schema::migration::sea_query::*;
use sea_schema::migration::*;
use sea_orm::Schema;
use sea_orm_migration::prelude::*;
pub mod recording {
use crate::m00002_create_session::session;

5
warpgate-db-migrations/src/m00004_create_known_host.rs
View file

@ -1,6 +1,5 @@
use sea_schema::migration::sea_orm::Schema;
use sea_schema::migration::sea_query::*;
use sea_schema::migration::*;
use sea_orm::Schema;
use sea_orm_migration::prelude::*;
pub mod known_host {
use sea_orm::entity::prelude::*;

5
warpgate-db-migrations/src/m00005_create_log_entry.rs
View file

@ -1,6 +1,5 @@
use sea_schema::migration::sea_orm::Schema;
use sea_schema::migration::sea_query::*;
use sea_schema::migration::*;
use sea_orm::Schema;
use sea_orm_migration::prelude::*;
pub mod log_entry {
use chrono::{DateTime, Utc};

2
warpgate-protocol-ssh/Cargo.toml
View file

@ -14,7 +14,7 @@ dialoguer = "0.10"
futures = "0.3"
russh = {version = "0.34.0-beta.2", features = ["openssl"]}
russh-keys = {version = "0.22.0-beta.1", features = ["openssl"]}
sea-orm = {version = "^0.7", features = ["runtime-tokio-native-tls"], default-features = false}
sea-orm = {version = "^0.8", features = ["runtime-tokio-native-tls"], default-features = false}
thiserror = "1.0"
time = "0.3"
tokio = {version = "1.18", features = ["tracing", "signal"]}