From d54361decac64e354107bfef9f753a2abd5a439a Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 10 Apr 2021 21:21:53 +0200 Subject: [PATCH] Change submodule name database to bot-databas for new naming scheme Signed-off-by: trivernis --- Cargo.lock | 30 +++++++++---------- Cargo.toml | 2 +- {database => bot-database}/.gitignore | 0 {database => bot-database}/Cargo.lock | 0 {database => bot-database}/Cargo.toml | 2 +- {database => bot-database}/diesel.toml | 0 .../migrations/.gitkeep | 0 .../down.sql | 0 .../up.sql | 0 .../2021-04-09-075309_create_tables/down.sql | 0 .../2021-04-09-075309_create_tables/up.sql | 0 .../down.sql | 0 .../up.sql | 0 {database => bot-database}/src/database.rs | 0 {database => bot-database}/src/error.rs | 0 {database => bot-database}/src/lib.rs | 2 +- {database => bot-database}/src/models.rs | 0 {database => bot-database}/src/schema.rs | 0 src/client.rs | 2 +- src/utils/context_data.rs | 2 +- src/utils/error.rs | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) rename {database => bot-database}/.gitignore (100%) rename {database => bot-database}/Cargo.lock (100%) rename {database => bot-database}/Cargo.toml (95%) rename {database => bot-database}/diesel.toml (100%) rename {database => bot-database}/migrations/.gitkeep (100%) rename {database => bot-database}/migrations/00000000000000_diesel_initial_setup/down.sql (100%) rename {database => bot-database}/migrations/00000000000000_diesel_initial_setup/up.sql (100%) rename {database => bot-database}/migrations/2021-04-09-075309_create_tables/down.sql (100%) rename {database => bot-database}/migrations/2021-04-09-075309_create_tables/up.sql (100%) rename {database => bot-database}/migrations/2021-04-09-095329_create_guild_playlists/down.sql (100%) rename {database => bot-database}/migrations/2021-04-09-095329_create_guild_playlists/up.sql (100%) rename {database => bot-database}/src/database.rs (100%) rename {database => bot-database}/src/error.rs (100%) rename {database => bot-database}/src/lib.rs (95%) rename {database => bot-database}/src/models.rs (100%) rename {database => bot-database}/src/schema.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 166e54c..312cff8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,6 +178,20 @@ dependencies = [ "generic-array", ] +[[package]] +name = "bot-database" +version = "0.1.0" +dependencies = [ + "chrono", + "diesel", + "diesel_migrations", + "dotenv", + "log 0.4.14", + "r2d2", + "thiserror", + "tokio-diesel", +] + [[package]] name = "bumpalo" version = "3.6.1" @@ -377,20 +391,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "database" -version = "0.1.0" -dependencies = [ - "chrono", - "diesel", - "diesel_migrations", - "dotenv", - "log 0.4.14", - "r2d2", - "thiserror", - "tokio-diesel", -] - [[package]] name = "diesel" version = "1.4.6" @@ -2272,10 +2272,10 @@ name = "tobi-rs" version = "0.2.1" dependencies = [ "aspotify", + "bot-database", "chrono", "chrono-tz", "colored", - "database", "dotenv", "fern", "futures", diff --git a/Cargo.toml b/Cargo.toml index d1dd6e6..964fd49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +bot-database = {path="./bot-database"} serenity = "0.10.5" dotenv = "0.15.0" tokio = { version = "1.4.0", features = ["macros", "rt-multi-thread"] } @@ -26,7 +27,6 @@ fern = "0.6.0" chrono = "0.4.19" colored = "2.0.0" sysinfo = "0.16.5" -database = {path="./database"} reqwest = "0.11.2" chrono-tz = "0.5.3" sauce-api = "0.7.1" diff --git a/database/.gitignore b/bot-database/.gitignore similarity index 100% rename from database/.gitignore rename to bot-database/.gitignore diff --git a/database/Cargo.lock b/bot-database/Cargo.lock similarity index 100% rename from database/Cargo.lock rename to bot-database/Cargo.lock diff --git a/database/Cargo.toml b/bot-database/Cargo.toml similarity index 95% rename from database/Cargo.toml rename to bot-database/Cargo.toml index 095772d..6f30fbc 100644 --- a/database/Cargo.toml +++ b/bot-database/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "database" +name = "bot-database" version = "0.1.0" authors = ["trivernis "] edition = "2018" diff --git a/database/diesel.toml b/bot-database/diesel.toml similarity index 100% rename from database/diesel.toml rename to bot-database/diesel.toml diff --git a/database/migrations/.gitkeep b/bot-database/migrations/.gitkeep similarity index 100% rename from database/migrations/.gitkeep rename to bot-database/migrations/.gitkeep diff --git a/database/migrations/00000000000000_diesel_initial_setup/down.sql b/bot-database/migrations/00000000000000_diesel_initial_setup/down.sql similarity index 100% rename from database/migrations/00000000000000_diesel_initial_setup/down.sql rename to bot-database/migrations/00000000000000_diesel_initial_setup/down.sql diff --git a/database/migrations/00000000000000_diesel_initial_setup/up.sql b/bot-database/migrations/00000000000000_diesel_initial_setup/up.sql similarity index 100% rename from database/migrations/00000000000000_diesel_initial_setup/up.sql rename to bot-database/migrations/00000000000000_diesel_initial_setup/up.sql diff --git a/database/migrations/2021-04-09-075309_create_tables/down.sql b/bot-database/migrations/2021-04-09-075309_create_tables/down.sql similarity index 100% rename from database/migrations/2021-04-09-075309_create_tables/down.sql rename to bot-database/migrations/2021-04-09-075309_create_tables/down.sql diff --git a/database/migrations/2021-04-09-075309_create_tables/up.sql b/bot-database/migrations/2021-04-09-075309_create_tables/up.sql similarity index 100% rename from database/migrations/2021-04-09-075309_create_tables/up.sql rename to bot-database/migrations/2021-04-09-075309_create_tables/up.sql diff --git a/database/migrations/2021-04-09-095329_create_guild_playlists/down.sql b/bot-database/migrations/2021-04-09-095329_create_guild_playlists/down.sql similarity index 100% rename from database/migrations/2021-04-09-095329_create_guild_playlists/down.sql rename to bot-database/migrations/2021-04-09-095329_create_guild_playlists/down.sql diff --git a/database/migrations/2021-04-09-095329_create_guild_playlists/up.sql b/bot-database/migrations/2021-04-09-095329_create_guild_playlists/up.sql similarity index 100% rename from database/migrations/2021-04-09-095329_create_guild_playlists/up.sql rename to bot-database/migrations/2021-04-09-095329_create_guild_playlists/up.sql diff --git a/database/src/database.rs b/bot-database/src/database.rs similarity index 100% rename from database/src/database.rs rename to bot-database/src/database.rs diff --git a/database/src/error.rs b/bot-database/src/error.rs similarity index 100% rename from database/src/error.rs rename to bot-database/src/error.rs diff --git a/database/src/lib.rs b/bot-database/src/lib.rs similarity index 95% rename from database/src/lib.rs rename to bot-database/src/lib.rs index 57866b5..0b6af1f 100644 --- a/database/src/lib.rs +++ b/bot-database/src/lib.rs @@ -18,7 +18,7 @@ pub use database::Database; type PoolConnection = Pool>; -embed_migrations!("../database/migrations"); +embed_migrations!("../bot-database/migrations"); fn get_connection() -> DatabaseResult { dotenv::dotenv()?; diff --git a/database/src/models.rs b/bot-database/src/models.rs similarity index 100% rename from database/src/models.rs rename to bot-database/src/models.rs diff --git a/database/src/schema.rs b/bot-database/src/schema.rs similarity index 100% rename from database/src/schema.rs rename to bot-database/src/schema.rs diff --git a/src/client.rs b/src/client.rs index 6170afd..1885737 100644 --- a/src/client.rs +++ b/src/client.rs @@ -12,7 +12,7 @@ use crate::utils::context_data::{ DatabaseContainer, EventDrivenMessageContainer, Store, StoreData, }; use crate::utils::error::{BotError, BotResult}; -use database::get_database; +use bot_database::get_database; use serenity::model::id::UserId; use std::collections::{HashMap, HashSet}; diff --git a/src/utils/context_data.rs b/src/utils/context_data.rs index 054e770..5c0fd19 100644 --- a/src/utils/context_data.rs +++ b/src/utils/context_data.rs @@ -8,7 +8,7 @@ use tokio::sync::Mutex; use crate::providers::music::queue::MusicQueue; use crate::providers::music::spotify::SpotifyApi; use crate::utils::messages::EventDrivenMessage; -use database::Database; +use bot_database::Database; use sauce_api::prelude::SauceNao; use serenity::client::Context; use std::env; diff --git a/src/utils/error.rs b/src/utils/error.rs index 33d7c8e..6fa0475 100644 --- a/src/utils/error.rs +++ b/src/utils/error.rs @@ -8,7 +8,7 @@ pub enum BotError { SerenityError(#[from] serenity::Error), #[error("Database Error: {0}")] - Database(#[from] database::error::DatabaseError), + Database(#[from] bot_database::error::DatabaseError), #[error("Missing Bot Token")] MissingToken,