From 8ea074e872d66a02e8a5bcfaacf9739b7a162a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Tue, 29 Aug 2023 21:34:01 +0200 Subject: [PATCH] update --- ...8b5ea4f49773f2de3c3e10e718a09d6816cb0.json | 12 -------- ...a2e8fef843f0c95affadfa66091e4b97756f0.json | 12 ++++++++ ...4b1602b82fb350668102d496683374556d830.json | 12 -------- ...31c4cbe1ff5b6c693d27e4879b56a7e850d86.json | 12 ++++++++ ...4a6a61e94394846e84315fbe10a9956960dd7.json | 12 -------- rust/src/models/trips.rs | 30 +++++++++++-------- 6 files changed, 42 insertions(+), 48 deletions(-) delete mode 100644 rust/.sqlx/query-41f96460749516db0bb510c01cf8b5ea4f49773f2de3c3e10e718a09d6816cb0.json create mode 100644 rust/.sqlx/query-67199202f732164b183ac4813e4a2e8fef843f0c95affadfa66091e4b97756f0.json delete mode 100644 rust/.sqlx/query-c3da65d50b22628d03eeaaf8c5e4b1602b82fb350668102d496683374556d830.json create mode 100644 rust/.sqlx/query-fc4d85404d4e9db18364616a13731c4cbe1ff5b6c693d27e4879b56a7e850d86.json delete mode 100644 rust/.sqlx/query-fcf7bcb784f0271e2e4c87cde754a6a61e94394846e84315fbe10a9956960dd7.json diff --git a/rust/.sqlx/query-41f96460749516db0bb510c01cf8b5ea4f49773f2de3c3e10e718a09d6816cb0.json b/rust/.sqlx/query-41f96460749516db0bb510c01cf8b5ea4f49773f2de3c3e10e718a09d6816cb0.json deleted file mode 100644 index e2c6648..0000000 --- a/rust/.sqlx/query-41f96460749516db0bb510c01cf8b5ea4f49773f2de3c3e10e718a09d6816cb0.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "db_name": "SQLite", - "query": "UPDATE trips_items\n SET pack = ?\n WHERE trip_id = ?\n AND item_id = ?\n AND user_id = ?", - "describe": { - "columns": [], - "parameters": { - "Right": 4 - }, - "nullable": [] - }, - "hash": "41f96460749516db0bb510c01cf8b5ea4f49773f2de3c3e10e718a09d6816cb0" -} diff --git a/rust/.sqlx/query-67199202f732164b183ac4813e4a2e8fef843f0c95affadfa66091e4b97756f0.json b/rust/.sqlx/query-67199202f732164b183ac4813e4a2e8fef843f0c95affadfa66091e4b97756f0.json new file mode 100644 index 0000000..648fd4c --- /dev/null +++ b/rust/.sqlx/query-67199202f732164b183ac4813e4a2e8fef843f0c95affadfa66091e4b97756f0.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "UPDATE trips_items\n SET pack = ?\n WHERE trip_id = ?\n AND item_id = ?\n AND user_id = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 4 + }, + "nullable": [] + }, + "hash": "67199202f732164b183ac4813e4a2e8fef843f0c95affadfa66091e4b97756f0" +} diff --git a/rust/.sqlx/query-c3da65d50b22628d03eeaaf8c5e4b1602b82fb350668102d496683374556d830.json b/rust/.sqlx/query-c3da65d50b22628d03eeaaf8c5e4b1602b82fb350668102d496683374556d830.json deleted file mode 100644 index 1b014f0..0000000 --- a/rust/.sqlx/query-c3da65d50b22628d03eeaaf8c5e4b1602b82fb350668102d496683374556d830.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "db_name": "SQLite", - "query": "UPDATE trips_items\n SET pick = ?\n WHERE trip_id = ?\n AND item_id = ?\n AND user_id = ?", - "describe": { - "columns": [], - "parameters": { - "Right": 4 - }, - "nullable": [] - }, - "hash": "c3da65d50b22628d03eeaaf8c5e4b1602b82fb350668102d496683374556d830" -} diff --git a/rust/.sqlx/query-fc4d85404d4e9db18364616a13731c4cbe1ff5b6c693d27e4879b56a7e850d86.json b/rust/.sqlx/query-fc4d85404d4e9db18364616a13731c4cbe1ff5b6c693d27e4879b56a7e850d86.json new file mode 100644 index 0000000..55039fd --- /dev/null +++ b/rust/.sqlx/query-fc4d85404d4e9db18364616a13731c4cbe1ff5b6c693d27e4879b56a7e850d86.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "UPDATE trips_items\n SET ready = ?\n WHERE trip_id = ?\n AND item_id = ?\n AND user_id = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 4 + }, + "nullable": [] + }, + "hash": "fc4d85404d4e9db18364616a13731c4cbe1ff5b6c693d27e4879b56a7e850d86" +} diff --git a/rust/.sqlx/query-fcf7bcb784f0271e2e4c87cde754a6a61e94394846e84315fbe10a9956960dd7.json b/rust/.sqlx/query-fcf7bcb784f0271e2e4c87cde754a6a61e94394846e84315fbe10a9956960dd7.json deleted file mode 100644 index 63c5cfa..0000000 --- a/rust/.sqlx/query-fcf7bcb784f0271e2e4c87cde754a6a61e94394846e84315fbe10a9956960dd7.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "db_name": "SQLite", - "query": "UPDATE trips_items\n SET ready = ?\n WHERE trip_id = ?\n AND item_id = ?\n AND user_id = ?", - "describe": { - "columns": [], - "parameters": { - "Right": 4 - }, - "nullable": [] - }, - "hash": "fcf7bcb784f0271e2e4c87cde754a6a61e94394846e84315fbe10a9956960dd7" -} diff --git a/rust/src/models/trips.rs b/rust/src/models/trips.rs index b7f355b..a9a196e 100644 --- a/rust/src/models/trips.rs +++ b/rust/src/models/trips.rs @@ -13,6 +13,12 @@ use serde::{Deserialize, Serialize}; use time; use uuid::Uuid; +macro_rules! build_state_query { + () => { + println!("hi") + }; +} + #[derive(sqlite::Type, PartialEq, PartialOrd, Deserialize, Debug)] pub enum TripState { Init, @@ -382,10 +388,10 @@ impl TripItem { }, pool, "UPDATE trips_items - SET pick = ? - WHERE trip_id = ? - AND item_id = ? - AND user_id = ?", + SET pick = ? + WHERE trip_id = ? + AND item_id = ? + AND user_id = ?", value, trip_id_param, item_id_param, @@ -401,10 +407,10 @@ impl TripItem { }, pool, "UPDATE trips_items - SET pack = ? - WHERE trip_id = ? - AND item_id = ? - AND user_id = ?", + SET pack = ? + WHERE trip_id = ? + AND item_id = ? + AND user_id = ?", value, trip_id_param, item_id_param, @@ -420,10 +426,10 @@ impl TripItem { }, pool, "UPDATE trips_items - SET ready = ? - WHERE trip_id = ? - AND item_id = ? - AND user_id = ?", + SET ready = ? + WHERE trip_id = ? + AND item_id = ? + AND user_id = ?", value, trip_id_param, item_id_param,