diff --git a/src/db.rs b/src/db.rs index 2f80f67..498c10b 100644 --- a/src/db.rs +++ b/src/db.rs @@ -2,7 +2,7 @@ use anyhow::{Context, Error, Result}; use chrono::prelude::*; use lazy_static::lazy_static; use log::*; -use rusqlite::{Connection, OpenFlags}; +use rusqlite::{Connection, OpenFlags, params}; use rusqlite_migration::{M, Migrations}; use std::collections::HashMap; use std::path::PathBuf; @@ -176,7 +176,7 @@ pub fn query_all_items(conn: &Connection) -> Result> { let mut statement = conn .prepare("SELECT id, ts, size, compression, digest_type, digest_value FROM items ORDER BY id ASC") .context("Problem preparing SQL statement")?; - let mut rows = statement.query([])?; + let mut rows = statement.query(params![])?; let mut items = Vec::new(); while let Some(row) = rows.next()? { @@ -353,7 +353,7 @@ pub fn get_item(conn: &Connection, item_id: i64) -> Result> { ) .context("Problem preparing SQL statement")?; - let mut rows = statement.query([item_id])?; + let mut rows = statement.query(params![item_id])?; match rows.next()? { Some(row) => Ok(Some(Item { @@ -380,7 +380,7 @@ pub fn get_item_last(conn: &Connection) -> Result> { ) .context("Problem preparing SQL statement")?; - let mut rows = statement.query([])?; + let mut rows = statement.query(params![])?; match rows.next()? { Some(row) => Ok(Some(Item { @@ -400,7 +400,7 @@ pub fn get_item_tags(conn: &Connection, item: &Item) -> Result> { let mut statement = conn .prepare_cached("SELECT id, name FROM tags WHERE id=?1 ORDER BY name ASC") .context("Problem preparing SQL statement")?; - let mut rows = statement.query([item.id])?; + let mut rows = statement.query(params![item.id])?; let mut tags = Vec::new(); @@ -419,7 +419,7 @@ pub fn get_item_meta(conn: &Connection, item: &Item) -> Result> { let mut statement = conn .prepare_cached("SELECT id, name, value FROM metas WHERE id=?1 ORDER BY name ASC") .context("Problem preparing SQL statement")?; - let mut rows = statement.query([item.id])?; + let mut rows = statement.query(params![item.id])?; let mut metas = Vec::new(); @@ -439,7 +439,7 @@ pub fn get_item_meta_name(conn: &Connection, item: &Item, name: String) -> Resul let mut statement = conn .prepare_cached("SELECT id, name, value FROM metas WHERE id=?1 AND name=?2") .context("Problem preparing SQL statement")?; - let mut rows = statement.query([item.id, name])?; + let mut rows = statement.query(params![item.id, name])?; match rows.next()? { Some(row) => Ok(Some(Meta {