From ba4a702574c2008bd8be6c17ab536ca798bb2ace Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Wed, 25 Mar 2026 21:38:34 +0000 Subject: [PATCH] wip --- Cargo.lock | 121 +++++------------- Cargo.toml | 1 + crates/bot/Cargo.toml | 1 + crates/bot/src/main.rs | 2 + crates/migration/Cargo.toml | 8 +- crates/migration/src/lib.rs | 10 +- ...e_table.rs => m20260325_145211_servers.rs} | 22 ++-- .../migration/src/m20260325_145717_members.rs | 35 +++++ .../src/m20260325_162920_messages.rs | 39 ++++++ flake.nix | 7 +- 10 files changed, 128 insertions(+), 118 deletions(-) rename crates/migration/src/{m20220101_000001_create_table.rs => m20260325_145211_servers.rs} (56%) create mode 100644 crates/migration/src/m20260325_145717_members.rs create mode 100644 crates/migration/src/m20260325_162920_messages.rs diff --git a/Cargo.lock b/Cargo.lock index 38d0708..2416d7e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -563,7 +563,8 @@ dependencies = [ name = "bot" version = "0.1.0" dependencies = [ - "sea-orm 2.0.0-rc.37", + "migration", + "sea-orm", "serenity", "tokio", ] @@ -1641,6 +1642,15 @@ dependencies = [ "serde_core", ] +[[package]] +name = "indoc" +version = "2.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] + [[package]] name = "inherent" version = "1.0.13" @@ -2788,27 +2798,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "sea-orm" -version = "1.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d945f62558fac19e5988680d2fdf747b734c2dbc6ce2cb81ba33ed8dde5b103" -dependencies = [ - "async-stream", - "async-trait", - "derive_more", - "futures-util", - "log", - "ouroboros", - "sea-orm-macros 1.1.19", - "sea-query 0.32.7", - "serde", - "strum 0.26.3", - "thiserror 2.0.18", - "tracing", - "url", -] - [[package]] name = "sea-orm" version = "2.0.0-rc.37" @@ -2828,14 +2817,14 @@ dependencies = [ "pgvector", "rust_decimal", "sea-orm-arrow", - "sea-orm-macros 2.0.0-rc.37", - "sea-query 1.0.0-rc.31", + "sea-orm-macros", + "sea-query", "sea-query-sqlx", - "sea-schema 0.17.0-rc.17", + "sea-schema", "serde", "serde_json", "sqlx", - "strum 0.27.2", + "strum", "thiserror 2.0.18", "time", "tracing", @@ -2850,40 +2839,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c2eee8405f16c1f337fe3a83389361caea83c928d14dbd666a480407072c365" dependencies = [ "arrow", - "sea-query 1.0.0-rc.31", + "sea-query", "thiserror 2.0.18", ] [[package]] name = "sea-orm-cli" -version = "1.1.19" +version = "2.0.0-rc.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94492e2ab6c045b4cc38013809ce255d14c3d352c9f0d11e6b920e2adc948ad" +checksum = "cd9b34d4c8e615079c04eb7863a429c2d2a8bf9c934eb9eeb580f51f36367124" dependencies = [ "chrono", "clap", "dotenvy", "glob", + "indoc", "regex", + "sea-schema", + "sqlx", + "tokio", "tracing", "tracing-subscriber", "url", ] -[[package]] -name = "sea-orm-macros" -version = "1.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c2e64a50a9cc8339f10a27577e10062c7f995488e469f2c95762c5ee847832" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "sea-bae", - "syn 2.0.117", - "unicode-ident", -] - [[package]] name = "sea-orm-macros" version = "2.0.0-rc.37" @@ -2902,31 +2881,20 @@ dependencies = [ [[package]] name = "sea-orm-migration" -version = "1.1.19" +version = "2.0.0-rc.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7315c0cadb7e60fb17ee2bb282aa27d01911fc2a7e5836ec1d4ac37d19250bb4" +checksum = "b3ceb928aac8be83332d34d1fdbc827d43696135a800723ffeb2e0b33b7b495e" dependencies = [ "async-trait", "clap", "dotenvy", - "sea-orm 1.1.19", + "sea-orm", "sea-orm-cli", - "sea-schema 0.16.2", + "sea-schema", "tracing", "tracing-subscriber", ] -[[package]] -name = "sea-query" -version = "0.32.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5d1c518eaf5eda38e5773f902b26ab6d5e9e9e2bb2349ca6c64cf96f80448c" -dependencies = [ - "inherent", - "ordered-float", - "sea-query-derive 0.4.3", -] - [[package]] name = "sea-query" version = "1.0.0-rc.31" @@ -2937,26 +2905,12 @@ dependencies = [ "inherent", "ordered-float", "rust_decimal", - "sea-query-derive 1.0.0-rc.12", + "sea-query-derive", "serde_json", "time", "uuid", ] -[[package]] -name = "sea-query-derive" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae0cbad6ab996955664982739354128c58d16e126114fe88c2a493642502aab" -dependencies = [ - "darling", - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.117", - "thiserror 2.0.18", -] - [[package]] name = "sea-query-derive" version = "1.0.0-rc.12" @@ -2977,21 +2931,10 @@ version = "0.8.0-rc.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4377164b09a11bb692dec6966eb0e6908d63d768defef0be689b39e02cf8544" dependencies = [ - "sea-query 1.0.0-rc.31", + "sea-query", "sqlx", ] -[[package]] -name = "sea-schema" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2239ff574c04858ca77485f112afea1a15e53135d3097d0c86509cef1def1338" -dependencies = [ - "futures", - "sea-query 0.32.7", - "sea-schema-derive", -] - [[package]] name = "sea-schema" version = "0.17.0-rc.17" @@ -2999,7 +2942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b363dd21c20fe4d1488819cb2bc7f8d4696c62dd9f39554f97639f54d57dd0ab" dependencies = [ "async-trait", - "sea-query 1.0.0-rc.31", + "sea-query", "sea-query-sqlx", "sea-schema-derive", "sqlx", @@ -3496,12 +3439,6 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" - [[package]] name = "strum" version = "0.27.2" diff --git a/Cargo.toml b/Cargo.toml index bba28fa..2d012f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,3 +11,4 @@ name = "discord-server-telemetry" [workspace.dependencies] tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] } sea-orm = { version = "2.0.0-rc", features = [ "sqlx-sqlite", "runtime-tokio-rustls", "macros" ] } +migration = { path = "./crates/migration" } diff --git a/crates/bot/Cargo.toml b/crates/bot/Cargo.toml index 1c13e31..bc7283a 100644 --- a/crates/bot/Cargo.toml +++ b/crates/bot/Cargo.toml @@ -8,3 +8,4 @@ default-run = "bot" serenity = "0.12" tokio = {workspace = true} sea-orm = {workspace = true} +migration ={workspace = true} diff --git a/crates/bot/src/main.rs b/crates/bot/src/main.rs index d2e52c6..a778594 100644 --- a/crates/bot/src/main.rs +++ b/crates/bot/src/main.rs @@ -1,6 +1,7 @@ use std::env; use std::error::Error; +use migration::{Migrator, MigratorTrait}; use sea_orm::{Database, DatabaseConnection}; use serenity::async_trait; use serenity::model::channel::Message; @@ -25,6 +26,7 @@ async fn main() -> Result<(), Box> { let token = env::var("DISCORD_TOKEN").expect("Expected a token in the environment"); let dbc: DatabaseConnection = Database::connect("sqlite::memory:").await?; + Migrator::up(&dbc, None).await?; // Set gateway intents, which decides what events the bot will be notified about let intents = GatewayIntents::GUILD_MESSAGES diff --git a/crates/migration/Cargo.toml b/crates/migration/Cargo.toml index 4e31ff4..b6e0e63 100644 --- a/crates/migration/Cargo.toml +++ b/crates/migration/Cargo.toml @@ -12,11 +12,7 @@ path = "src/lib.rs" async-std = { version = "1", features = ["attributes", "tokio1"] } [dependencies.sea-orm-migration] -version = "1.1.0" +version = "2.0.0-rc" features = [ - # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI. - # View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime. - # e.g. - # "runtime-tokio-rustls", # `ASYNC_RUNTIME` feature - # "sqlx-postgres", # `DATABASE_DRIVER` feature + "sqlx-sqlite", "runtime-tokio-rustls" ] diff --git a/crates/migration/src/lib.rs b/crates/migration/src/lib.rs index 2c605af..309c068 100644 --- a/crates/migration/src/lib.rs +++ b/crates/migration/src/lib.rs @@ -1,12 +1,18 @@ pub use sea_orm_migration::prelude::*; -mod m20220101_000001_create_table; +mod m20260325_145211_servers; +mod m20260325_145717_members; +mod m20260325_162920_messages; pub struct Migrator; #[async_trait::async_trait] impl MigratorTrait for Migrator { fn migrations() -> Vec> { - vec![Box::new(m20220101_000001_create_table::Migration)] + vec![ + Box::new(m20260325_145211_servers::Migration), + Box::new(m20260325_145717_members::Migration), + Box::new(m20260325_162920_messages::Migration), + ] } } diff --git a/crates/migration/src/m20220101_000001_create_table.rs b/crates/migration/src/m20260325_145211_servers.rs similarity index 56% rename from crates/migration/src/m20220101_000001_create_table.rs rename to crates/migration/src/m20260325_145211_servers.rs index 1863d6d..1c68e85 100644 --- a/crates/migration/src/m20220101_000001_create_table.rs +++ b/crates/migration/src/m20260325_145211_servers.rs @@ -6,36 +6,30 @@ pub struct Migration; #[async_trait::async_trait] impl MigrationTrait for Migration { async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { - // Replace the sample below with your own migration scripts - todo!(); - manager .create_table( Table::create() - .table(Post::Table) + .table(Server::Table) .if_not_exists() - .col(pk_auto(Post::Id)) - .col(string(Post::Title)) - .col(string(Post::Text)) + .col(pk_auto(Server::Id)) + .col(string(Server::IdDiscord)) + .col(string(Server::Name)) .to_owned(), ) .await } async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> { - // Replace the sample below with your own migration scripts - todo!(); - manager - .drop_table(Table::drop().table(Post::Table).to_owned()) + .drop_table(Table::drop().table(Server::Table).to_owned()) .await } } #[derive(DeriveIden)] -enum Post { +enum Server { Table, Id, - Title, - Text, + IdDiscord, + Name, } diff --git a/crates/migration/src/m20260325_145717_members.rs b/crates/migration/src/m20260325_145717_members.rs new file mode 100644 index 0000000..97701ea --- /dev/null +++ b/crates/migration/src/m20260325_145717_members.rs @@ -0,0 +1,35 @@ +use sea_orm_migration::{prelude::*, schema::*}; + +#[derive(DeriveMigrationName)] +pub struct Migration; + +#[async_trait::async_trait] +impl MigrationTrait for Migration { + async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { + manager + .create_table( + Table::create() + .table(Members::Table) + .if_not_exists() + .col(pk_auto(Members::Id)) + .col(integer(Members::IdDiscord)) + .col(string(Members::Name)) + .to_owned(), + ) + .await + } + + async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> { + manager + .drop_table(Table::drop().table(Members::Table).to_owned()) + .await + } +} + +#[derive(DeriveIden)] +enum Members { + Table, + Id, + IdDiscord, + Name, +} diff --git a/crates/migration/src/m20260325_162920_messages.rs b/crates/migration/src/m20260325_162920_messages.rs new file mode 100644 index 0000000..9d9fbfd --- /dev/null +++ b/crates/migration/src/m20260325_162920_messages.rs @@ -0,0 +1,39 @@ +use sea_orm_migration::{prelude::*, schema::*}; + +#[derive(DeriveMigrationName)] +pub struct Migration; + +#[async_trait::async_trait] +impl MigrationTrait for Migration { + async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { + manager + .create_table( + Table::create() + .table(Messages::Table) + .if_not_exists() + .col(pk_auto(Messages::Id)) + .col(integer(Messages::IdDiscord)) + .col(integer(Messages::IdSender)) + .col(integer(Messages::IdContent)) // Change to foreign key + .col(integer(Messages::IdServer)) + .to_owned(), + ) + .await + } + + async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> { + manager + .drop_table(Table::drop().table(Messages::Table).to_owned()) + .await + } +} + +#[derive(DeriveIden)] +enum Messages { + Table, + Id, + IdDiscord, + IdSender, + IdContent, + IdServer, +} diff --git a/flake.nix b/flake.nix index 216581a..09e4c2e 100644 --- a/flake.nix +++ b/flake.nix @@ -188,13 +188,12 @@ # Inherit inputs from checks. checks = self.checks.${system}; - # Additional dev-shell environment variables can be set directly - # MY_CUSTOM_DEVELOPMENT_VAR = "something else"; - - # Extra inputs can be added here; cargo and rustc are provided by default. + DATABASE_URL = "sqlite://./db.sqlite?mode=rwc"; packages = [ pkgs.cargo-hakari pkgs.sea-orm-cli + pkgs.clang + pkgs.mold ]; }; }