refactor: combine models and db crate together

2023-04-22 12:12:02 +01:00
parent f2bb388b3b
commit e43833c0ea
27 changed files with 306 additions and 147 deletions
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -57,7 +57,6 @@ revolt-quark = { path = "../quark" }

 # core
 revolt-database = { path = "../core/database" }
-revolt-models = { path = "../core/models" }

 [build-dependencies]
 vergen = "7.5.0"
--- a/crates/delta/src/main.rs
+++ b/crates/delta/src/main.rs
@@ -23,7 +23,6 @@ async fn rocket() -> _ {

    // Setup database
    let db = revolt_database::DatabaseInfo::Auto.connect().await.unwrap();
-    let db = revolt_models::Database(db);
    db.migrate_database().await.unwrap();

    // Legacy database setup from quark