-use std::path::Path;\r
-use std::fs;\r
+use std::{fs::{self, File}, path::Path, io::Read};\r
\r
+use itertools::Itertools;\r
//use rusqlite::types::ToSql;\r
//use rusqlite::{Connection, Result, NO_PARAMS};\r
+use r2d2::Pool;\r
+use r2d2_sqlite::SqliteConnectionManager;\r
\r
-//extern crate r2d2;\r
-//extern crate r2d2_sqlite;\r
-//extern crate rusqlite;\r
+use crate::consts;\r
+use crate::model;\r
\r
-use r2d2_sqlite::SqliteConnectionManager;\r
-use r2d2::Pool;\r
+const CURRENT_DB_VERSION: u32 = 1;\r
\r
#[derive(Debug)]\r
-pub enum DbError {\r
+pub enum DBError {\r
SqliteError(rusqlite::Error),\r
R2d2Error(r2d2::Error),\r
- UnsupportedVersion(i32),\r
-}\r
-\r
-use super::consts;\r
-\r
-const CURRENT_DB_VERSION: u32 = 1;\r
-\r
-pub struct Connection {\r
- //con: rusqlite::Connection\r
- pool: Pool<SqliteConnectionManager>\r
+ UnsupportedVersion(u32),\r
+ Other(String),\r
}\r
\r
-pub struct Recipe {\r
- pub title: String,\r
- pub id: i32,\r
-}\r
-\r
-impl std::convert::From<rusqlite::Error> for DbError {\r
+impl From<rusqlite::Error> for DBError {\r
fn from(error: rusqlite::Error) -> Self {\r
- DbError::SqliteError(error)\r
+ DBError::SqliteError(error)\r
}\r
}\r
\r
-impl std::convert::From<r2d2::Error> for DbError {\r
+impl From<r2d2::Error> for DBError {\r
fn from(error: r2d2::Error) -> Self {\r
- DbError::R2d2Error(error)\r
+ DBError::R2d2Error(error)\r
}\r
}\r
\r
+type Result<T> = std::result::Result<T, DBError>;\r
+\r
+#[derive(Clone)]\r
+pub struct Connection {\r
+ //con: rusqlite::Connection\r
+ pool: Pool<SqliteConnectionManager>\r
+}\r
+\r
impl Connection {\r
- pub fn new() -> Result<Connection, DbError> {\r
+ pub fn new() -> Result<Connection> {\r
\r
let data_dir = Path::new(consts::DB_DIRECTORY);\r
\r
fs::DirBuilder::new().create(data_dir).unwrap();\r
}\r
\r
- let manager = SqliteConnectionManager::file("file.db");\r
+ let manager = SqliteConnectionManager::file(consts::DB_FILENAME);\r
let pool = r2d2::Pool::new(manager).unwrap();\r
\r
let connection = Connection { pool };\r
* Called after the connection has been established for creating or updating the database.\r
* The 'Version' table tracks the current state of the database.\r
*/\r
- fn create_or_update(self: &Self) -> Result<(), DbError> {\r
- // let connection = Connection::new();\r
- // let mut stmt = connection.sqlite_con.prepare("SELECT * FROM versions ORDER BY date").unwrap();\r
- // let mut stmt = connection.sqlite_con.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='versions'").unwrap();\r
-\r
+ fn create_or_update(&self) -> Result<()> {\r
// Check the Database version.\r
let mut con = self.pool.get()?;\r
let tx = con.transaction()?;\r
\r
+ // Version 0 corresponds to an empty database.\r
let mut version = {\r
match tx.query_row(\r
"SELECT [name] FROM [sqlite_master] WHERE [type] = 'table' AND [name] = 'Version'",\r
- rusqlite::NO_PARAMS,\r
+ [],\r
|row| row.get::<usize, String>(0)\r
) {\r
- Ok(_) => tx.query_row("SELECT [version] FROM [Version]", rusqlite::NO_PARAMS, |row| row.get(0)).unwrap_or_default(),\r
+ Ok(_) => tx.query_row("SELECT [version] FROM [Version] ORDER BY [id] DESC", [], |row| row.get(0)).unwrap_or_default(),\r
Err(_) => 0\r
}\r
};\r
Ok(())\r
}\r
\r
- fn update_to_next_version(version: i32, tx: &rusqlite::Transaction) -> Result<bool, DbError> {\r
- match version {\r
- 0 => {\r
- println!("Update to version 1...");\r
-\r
- // Initial structure.\r
- tx.execute_batch(\r
- "\r
- CREATE TABLE [Version] (\r
- [id] INTEGER PRIMARY KEY,\r
- [version] INTEGER NOT NULL UNIQUE,\r
- [datetime] INTEGER DATETIME\r
- );\r
-\r
- CREATE TABLE [Recipe] (\r
- [id] INTEGER PRIMARY KEY,\r
- [title] INTEGER NOT NULL,\r
- [description] INTEGER DATETIME\r
- );\r
- "\r
- )?;\r
-\r
- /*\r
- tx.execute(\r
- "\r
- INSERT INTO Version\r
- ",\r
- rusqlite::NO_PARAMS\r
- );*/\r
-\r
- Ok(true)\r
+ fn update_to_next_version(current_version: u32, tx: &rusqlite::Transaction) -> Result<bool> {\r
+ let next_version = current_version + 1;\r
+\r
+ if next_version <= CURRENT_DB_VERSION {\r
+ println!("Update to version {}...", next_version);\r
+ }\r
+\r
+ fn update_version(to_version: u32, tx: &rusqlite::Transaction) -> Result<()> {\r
+ tx.execute("INSERT INTO [Version] ([version], [datetime]) VALUES (?1, datetime('now'))", [to_version]).map(|_| ()).map_err(DBError::from)\r
+ }\r
+\r
+ fn ok(updated: bool) -> Result<bool> {\r
+ if updated {\r
+ println!("Version updated");\r
}\r
+ Ok(updated)\r
+ }\r
+\r
+ match next_version {\r
+ 1 => {\r
+ tx.execute_batch(&load_sql_file(next_version)?)?;\r
+ update_version(next_version, tx)?;\r
\r
- // Current version.\r
- 1 =>\r
- Ok(false),\r
+ ok(true)\r
+ }\r
+\r
+ // Version 1 doesn't exist yet.\r
+ 2 =>\r
+ ok(false),\r
\r
v =>\r
- Err(DbError::UnsupportedVersion(v)),\r
+ Err(DBError::UnsupportedVersion(v)),\r
}\r
}\r
\r
- pub fn get_all_recipes() {\r
+ pub fn get_all_recipe_titles(&self) -> Result<Vec<(i32, String)>> {\r
+ let con = self.pool.get()?;\r
+ let mut stmt = con.prepare("SELECT [id], [title] FROM [Recipe] ORDER BY [title]")?;\r
+ let titles =\r
+ stmt.query_map([], |row| {\r
+ Ok((row.get(0)?, row.get(1)?))\r
+ })?.map(|r| r.unwrap()).collect_vec(); // TODO: remove unwrap.\r
+ Ok(titles)\r
+ }\r
\r
+ pub fn get_all_recipes(&self) -> Result<Vec<model::Recipe>> {\r
+ let con = self.pool.get()?;\r
+ let mut stmt = con.prepare("SELECT [id], [title] FROM [Recipe] ORDER BY [title]")?;\r
+ let recipes =\r
+ stmt.query_map([], |row| {\r
+ Ok(model::Recipe::new(row.get(0)?, row.get(1)?))\r
+ })?.map(|r| r.unwrap()).collect_vec(); // TODO: remove unwrap.\r
+ Ok(recipes)\r
}\r
+\r
+ pub fn get_recipe(&self, id: i32) -> Result<model::Recipe> {\r
+ let con = self.pool.get()?;\r
+ con.query_row("SELECT [id], [title] FROM [Recipe] WHERE [id] = ?1", [id], |row| {\r
+ Ok(model::Recipe::new(row.get(0)?, row.get(1)?))\r
+ }).map_err(DBError::from)\r
+ }\r
+}\r
+\r
+fn load_sql_file(version: u32) -> Result<String> {\r
+ let sql_file = consts::SQL_FILENAME.replace("{VERSION}", &version.to_string());\r
+ let mut file = File::open(&sql_file).map_err(|err| DBError::Other(format!("Cannot open SQL file ({}): {}", &sql_file, err.to_string())))?;\r
+ let mut sql = String::new();\r
+ file.read_to_string(&mut sql).map_err(|err| DBError::Other(format!("Cannot read SQL file ({}) : {}", &sql_file, err.to_string())))?;\r
+ Ok(sql)\r
}
\ No newline at end of file
projects / recipes.git / blobdiff