Change submodule name database to bot-databas for new naming scheme

Signed-off-by: trivernis <trivernis@protonmail.com>
3 years ago · d54361deca
parent 255e11833b
commit d54361deca
21 changed files with 21 additions and 21 deletions
--- 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",
--- 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"
--- a/bot-database/.gitignore
+++ b/bot-database/.gitignore
--- a/bot-database/Cargo.lock
+++ b/bot-database/Cargo.lock
--- a/bot-database/Cargo.toml
+++ b/bot-database/Cargo.toml
@ -1,5 +1,5 @@
 [package]
-name = "database"
+name = "bot-database"
 version = "0.1.0"
 authors = ["trivernis <trivernis@protonmail.com>"]
 edition = "2018"
--- a/bot-database/diesel.toml
+++ b/bot-database/diesel.toml
--- a/bot-database/migrations/.gitkeep
+++ b/bot-database/migrations/.gitkeep
--- a/bot-database/migrations/00000000000000_diesel_initial_setup/down.sql
+++ b/bot-database/migrations/00000000000000_diesel_initial_setup/down.sql
--- a/bot-database/migrations/00000000000000_diesel_initial_setup/up.sql
+++ b/bot-database/migrations/00000000000000_diesel_initial_setup/up.sql
--- a/bot-database/migrations/2021-04-09-075309_create_tables/down.sql
+++ b/bot-database/migrations/2021-04-09-075309_create_tables/down.sql
--- a/bot-database/migrations/2021-04-09-075309_create_tables/up.sql
+++ b/bot-database/migrations/2021-04-09-075309_create_tables/up.sql
--- a/bot-database/migrations/2021-04-09-095329_create_guild_playlists/down.sql
+++ b/bot-database/migrations/2021-04-09-095329_create_guild_playlists/down.sql
--- a/bot-database/migrations/2021-04-09-095329_create_guild_playlists/up.sql
+++ b/bot-database/migrations/2021-04-09-095329_create_guild_playlists/up.sql
--- a/bot-database/src/database.rs
+++ b/bot-database/src/database.rs
--- a/bot-database/src/error.rs
+++ b/bot-database/src/error.rs
--- a/bot-database/src/lib.rs
+++ b/bot-database/src/lib.rs
@ -18,7 +18,7 @@ pub use database::Database;

 type PoolConnection = Pool<ConnectionManager<PgConnection>>;

-embed_migrations!("../database/migrations");
+embed_migrations!("../bot-database/migrations");

 fn get_connection() -> DatabaseResult<PoolConnection> {
    dotenv::dotenv()?;
--- a/bot-database/src/models.rs
+++ b/bot-database/src/models.rs
--- a/bot-database/src/schema.rs
+++ b/bot-database/src/schema.rs
--- 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};

--- 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;
--- 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,