Merge pull request #9 from JakenHerman/jaken/configurable-connection-…

…string Modified connection string to be configurable via `.env`
JakenHerman · Oct 14, 2024 · fd7464f · fd7464f
2 parents a1412a4 + f0db856
commit fd7464f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 target/
-*.sqlite
+*.sqlite
+.env
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,4 +8,5 @@ edition = "2021"
 rocket = { version = "0.5.1", features = ["json"] }
 diesel = { version = "2.0", features = ["r2d2", "sqlite"] }
 serde = { version = "1.0.210", features = ["derive"] }
-serde_json = "1.0.128"
+serde_json = "1.0.128"
+dotenv = "0.15"
diff --git a/src/db.rs b/src/db.rs
@@ -1,6 +1,8 @@
 use diesel::prelude::*;
 use diesel::SqliteConnection;
 use rocket::serde::{Serialize, Deserialize};
+use dotenv::dotenv;
+use std::env;
 
 use crate::schema::todos;
 
@@ -19,6 +21,9 @@ pub struct NewTodoItem<'a> {
 }
 
 pub fn establish_connection() -> SqliteConnection {
-    let database_url = "db.sqlite";
+    dotenv().ok();
+
+    let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
+
     SqliteConnection::establish(&database_url).expect(&format!("Error connecting to {}", database_url))
 }