v0.1.1

src/db/saved_searches.rs

@@ -1,4 +1,4 @@
-use rusqlite::{Connection, params};
+use crate::db::pool::{Connection, params};
 use serde::Serialize;
 
 #[derive(Debug, Clone, Serialize)]
@@ -10,7 +10,7 @@ pub struct SavedSearch {
     pub updated_at: String,
 }
 
-fn row_to_saved(row: &rusqlite::Row<'_>) -> rusqlite::Result<SavedSearch> {
+fn row_to_saved(row: &crate::db::pool::Row<'_>) -> Result<SavedSearch, crate::db::pool::DbError> {
     Ok(SavedSearch {
         id: row.get(0)?,
         name: row.get(1)?,
@@ -22,7 +22,7 @@ fn row_to_saved(row: &rusqlite::Row<'_>) -> rusqlite::Result<SavedSearch> {
 
 pub fn list(conn: &Connection) -> Result<Vec<SavedSearch>, String> {
     let mut stmt = conn
-        .prepare(crate::queries::sqlite::queries::db_saved_searches::Q_001)
+        .prepare(crate::dbq!(db_saved_searches::Q_001))
         .map_err(|e| format!("Failed to prepare saved searches: {e}"))?;
     let rows = stmt
         .query_map([], row_to_saved)
@@ -37,12 +37,12 @@ pub fn create(conn: &Connection, name: &str, query_string: &str) -> Result<Saved
     if name.is_empty() || query_string.is_empty() {
         return Err("Saved search name and query are required".to_string());
     }
-    conn.execute(
-        crate::queries::sqlite::queries::db_saved_searches::Q_002,
-        params![name, query_string],
-    )
-    .map_err(|e| format!("Failed to save search: {e}"))?;
-    let id = conn.last_insert_rowid();
+    let id = conn
+        .insert_id(
+            crate::dbq!(db_saved_searches::Q_002),
+            params![name, query_string],
+        )
+        .map_err(|e| format!("Failed to save search: {e}"))?;
     get(conn, id)?.ok_or_else(|| "Failed to read saved search".to_string())
 }
 
@@ -59,7 +59,7 @@ pub fn update(
     }
     let changed = conn
         .execute(
-            crate::queries::sqlite::queries::db_saved_searches::Q_003,
+            crate::dbq!(db_saved_searches::Q_003),
             params![name, query_string, id],
         )
         .map_err(|e| format!("Failed to update saved search: {e}"))?;
@@ -71,22 +71,19 @@ pub fn update(
 
 pub fn get(conn: &Connection, id: i64) -> Result<Option<SavedSearch>, String> {
     match conn.query_row(
-        crate::queries::sqlite::queries::db_saved_searches::Q_004,
+        crate::dbq!(db_saved_searches::Q_004),
         params![id],
         row_to_saved,
     ) {
         Ok(value) => Ok(Some(value)),
-        Err(rusqlite::Error::QueryReturnedNoRows) => Ok(None),
+        Err(crate::db::pool::DbError::QueryReturnedNoRows) => Ok(None),
         Err(e) => Err(format!("Failed to get saved search: {e}")),
     }
 }
 
 pub fn delete(conn: &Connection, id: i64) -> Result<bool, String> {
     Ok(conn
-        .execute(
-            crate::queries::sqlite::queries::db_saved_searches::Q_005,
-            params![id],
-        )
+        .execute(crate::dbq!(db_saved_searches::Q_005), params![id])
         .map_err(|e| format!("Failed to delete saved search: {e}"))?
         > 0)
 }