From 6bcb3620d8be2f3bcfe72432d17955827894bb6e Mon Sep 17 00:00:00 2001 From: Melody Horn / boringcactus Date: Mon, 14 Jun 2021 18:35:22 -0600 Subject: make backend more explicit --- examples/tutorial02/main.rs | 1 - src/db/backend.rs | 5 +++++ src/db/mod.rs | 1 + src/settings.rs | 8 ++++++-- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 src/db/backend.rs diff --git a/examples/tutorial02/main.rs b/examples/tutorial02/main.rs index c662001..eeb7524 100644 --- a/examples/tutorial02/main.rs +++ b/examples/tutorial02/main.rs @@ -17,7 +17,6 @@ fn settings() -> Settings { &polls::APP, &admin::APP, ], - database_url: "example_data.sqlite3", ..Settings::default() } } diff --git a/src/db/backend.rs b/src/db/backend.rs new file mode 100644 index 0000000..5ae4de2 --- /dev/null +++ b/src/db/backend.rs @@ -0,0 +1,5 @@ +pub enum DbBackend { + Sqlite { + db_file: &'static str, + } +} diff --git a/src/db/mod.rs b/src/db/mod.rs index c446ac8..b6528f5 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -1 +1,2 @@ +pub mod backend; pub mod models; diff --git a/src/settings.rs b/src/settings.rs index 9d34c0d..37a3395 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -1,13 +1,17 @@ +use crate::db::backend::DbBackend; + pub struct Settings { pub installed_apps: &'static [&'static crate::apps::AppConfig], - pub database_url: &'static str, + pub database: DbBackend, } impl Default for Settings { fn default() -> Self { Self { installed_apps: &[], - database_url: "", + database: DbBackend::Sqlite { + db_file: "db.sqlite3", + }, } } } -- cgit v1.2.3