Lot of thing

[recipes.git] / backend / src / db.rs

diff --git a/backend/src/db.rs b/backend/src/db.rs
index a2066b8..a4a0d97 100644 (file)
--- a/backend/src/db.rs
+++ b/backend/src/db.rs
@@ -4,46 +4,94 @@ use std::fs;
 //use rusqlite::types::ToSql;\r
 //use rusqlite::{Connection, Result, NO_PARAMS};\r
 \r
+//extern crate r2d2;\r
+//extern crate r2d2_sqlite;\r
+//extern crate rusqlite;\r
+\r
+use r2d2_sqlite::SqliteConnectionManager;\r
+use r2d2::Pool;\r
+\r
+\r
+use super::consts;\r
+\r
 const CURRENT_DB_VERSION: u32 = 1;\r
 \r
 pub struct Connection {\r
-    con: rusqlite::Connection\r
+    //con: rusqlite::Connection\r
+    pool: Pool<SqliteConnectionManager>\r
+}\r
+\r
+pub struct Recipe {\r
+    pub title: String,\r
+    pub id: i32,\r
 }\r
 \r
 impl Connection {\r
     pub fn new() -> Connection {\r
 \r
-        // TODO: use a constant in consts module.\r
-        let data_dir = Path::new("data");\r
+        let data_dir = Path::new(consts::DB_DIRECTORY);\r
 \r
         if !data_dir.exists() {\r
             fs::DirBuilder::new().create(data_dir).unwrap();\r
         }\r
 \r
-        Connection { con: rusqlite::Connection::open(data_dir.join("recipes.sqlite")).unwrap() }\r
+        let manager = SqliteConnectionManager::file("file.db");\r
+        let pool = r2d2::Pool::new(manager).unwrap();\r
+\r
+        let connection = Connection { pool };\r
+        connection.create_or_update();\r
+        connection\r
     }\r
 \r
-    pub fn create_or_update(self: &Self) -> rusqlite::Result<&str> {\r
-        //let connection = Connection::new();\r
+    fn create_or_update(self: &Self) {\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
         // Check the Database version.\r
+        let con = self.pool.get().unwrap();\r
+\r
         let version = {\r
-            let stmt_version_table = self.con.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='versions'")?;\r
-            /*if stmt_version_table.query(rusqlite::NO_PARAMS)?.count() == 0 {\r
-                0\r
-            } else {\r
-                1 // let stmt_versions = self.con.prepare("SELECT number FROM [")\r
-            }*/\r
-            0\r
+            match\r
+                con.query_row(\r
+                    "SELECT [name] FROM [sqlite_master] WHERE [type] = 'table' AND [name] = 'Version'",\r
+                    rusqlite::NO_PARAMS,\r
+                    |row| row.get::<usize, String>(0)\r
+                ) {\r
+\r
+                Ok(_) => con.query_row("SELECT [version] FROM [Version]", rusqlite::NO_PARAMS, |row| row.get(0)).unwrap_or_default(),\r
+                Err(_) => 0\r
+            }\r
         };\r
 \r
-        self.con.query_row(\r
-            "SELECT name FROM sqlite_master WHERE type='table' AND name='versions'",\r
-            rusqlite::NO_PARAMS,\r
-            |row| Ok(dbg!("test"))\r
-        )\r
+        match version {\r
+            0 => {\r
+                println!("Update to version 1...");\r
+                con.execute(\r
+                    "\r
+                    CREATE TABLE [Version] (\r
+                        [id] INTEGER PRIMARY KEY,\r
+                        [version] INTEGER NOT NULL,\r
+                        [datetime] INTEGER DATETIME\r
+                    )\r
+                    ",\r
+                    rusqlite::NO_PARAMS\r
+                );\r
+                con.execute(\r
+                    "\r
+                    CREATE TABLE [Recipe] (\r
+                        [id] INTEGER PRIMARY KEY,\r
+                        [title] INTEGER NOT NULL,\r
+                        [description] INTEGER DATETIME\r
+                    )\r
+                    ",\r
+                    rusqlite::NO_PARAMS\r
+                );\r
+                ()\r
+            }\r
+            v =>\r
+                panic!("Unsupported database version: {}", v)\r
+        };\r
     }\r
 \r
     pub fn get_all_recipes() {\r