diff options
| author | Fuwn <[email protected]> | 2021-06-09 12:25:27 +0000 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2021-06-09 12:25:27 +0000 |
| commit | 6c516b132bd58c11a2380a28b2db2b2e6b81bc52 (patch) | |
| tree | 0bc4b9bd6f0dac69ae84365f0013cdd343b84712 | |
| parent | refactor(config): rename `Whirl.toml` to `Config.toml` (diff) | |
| download | whirl-6c516b132bd58c11a2380a28b2db2b2e6b81bc52.tar.xz whirl-6c516b132bd58c11a2380a28b2db2b2e6b81bc52.zip | |
refactor(database): rename database file
The file name `whirl.sqlite3` is redundant as the file is already in the `.whirl` directory.
BREAKING CHANGE: Database file renamed
| -rw-r--r-- | .env | 2 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | crates/whirl/src/lib.rs | 2 | ||||
| -rw-r--r-- | crates/whirl_db/src/lib.rs | 2 | ||||
| -rw-r--r-- | docker.nix | 2 | ||||
| -rw-r--r-- | shell.nix | 2 |
6 files changed, 6 insertions, 6 deletions
@@ -1,5 +1,5 @@ # This file is *mostly* just a backup for environment variables in case Nix is # either not working or you just don't want to use it. :) -DATABASE_URl=.whirl/whirl.sqlite3 +DATABASE_URl=.whirl/db.sqlite3 RUST_BACKTRACE=1 @@ -19,7 +19,7 @@ Cargo.lock /crates/**/target/ /.whirl/log/ /.whirl/Config.toml -/.whirl/whirl.sqlite3 +/.whirl/db.sqlite3 # Wireshark *.pcapng diff --git a/crates/whirl/src/lib.rs b/crates/whirl/src/lib.rs index e335d6c..ab446d7 100644 --- a/crates/whirl/src/lib.rs +++ b/crates/whirl/src/lib.rs @@ -46,7 +46,7 @@ impl Whirl { /// - An error may arise if logger fails to start. pub async fn splash() -> Result<(), Box<dyn std::error::Error>> { // Environment - std::env::set_var("DATABASE_URL", ".whirl/whirl.sqlite3"); + std::env::set_var("DATABASE_URL", ".whirl/db.sqlite3"); // Logging dotenv::dotenv().ok(); diff --git a/crates/whirl_db/src/lib.rs b/crates/whirl_db/src/lib.rs index 41b2863..d2c6b33 100644 --- a/crates/whirl_db/src/lib.rs +++ b/crates/whirl_db/src/lib.rs @@ -38,7 +38,7 @@ use diesel::prelude::*; #[must_use] pub fn establish_connection() -> SqliteConnection { let database_url = - std::env::var("DATABASE_URL").unwrap_or_else(|_| ".whirl/whirl.sqlite3".to_string()); + std::env::var("DATABASE_URL").unwrap_or_else(|_| ".whirl/db.sqlite3".to_string()); SqliteConnection::establish(&database_url) .unwrap_or_else(|_| panic!("error connecting to {}", database_url)) } @@ -33,7 +33,7 @@ let Cmd = [ "run" ]; WorkingDir = "/"; Env = [ - "DATABASE_URl=.whirl/whirl.sqlite3" + "DATABASE_URl=.whirl/db.sqlite3" "DISABLE_PROMPT=true" "LOG_FILE=false" ]; @@ -27,7 +27,7 @@ in pkgs.mkShell { niv ]; - DATABASE_URL = ".whirl/whirl.sqlite3"; + DATABASE_URL = ".whirl/db.sqlite3"; RUST_SRC_PATH = "${pkgs.latest.rustChannels.nightly.rust-src}/lib/rustlib/src/rust/library"; RUST_BACKTRACE = "1"; } |