.
This commit is contained in:
@@ -162,7 +162,7 @@ impl crud::Read for Todo {
|
||||
FROM trip_todos AS todo
|
||||
INNER JOIN trips
|
||||
ON trips.id = todo.trip_id
|
||||
WHERE
|
||||
WHERE
|
||||
trips.id = $1
|
||||
AND trips.user_id = $2
|
||||
"#,
|
||||
@@ -199,7 +199,7 @@ impl crud::Read for Todo {
|
||||
FROM trip_todos AS todo
|
||||
INNER JOIN trips
|
||||
ON trips.id = todo.trip_id
|
||||
WHERE
|
||||
WHERE
|
||||
trips.id = $1
|
||||
AND todo.id = $2
|
||||
AND trips.user_id = $3
|
||||
@@ -361,8 +361,8 @@ impl crud::Update for Todo {
|
||||
r#"
|
||||
UPDATE trip_todos
|
||||
SET description = ?
|
||||
WHERE
|
||||
id = ?
|
||||
WHERE
|
||||
id = ?
|
||||
AND trip_id = ?
|
||||
AND EXISTS(SELECT 1 FROM trips WHERE trip_id = ? AND user_id = ?)
|
||||
RETURNING
|
||||
|
||||
@@ -23,8 +23,8 @@ impl Inventory {
|
||||
"SELECT
|
||||
id,
|
||||
name,
|
||||
description
|
||||
FROM inventory_items_categories
|
||||
description
|
||||
FROM inventory_items_categories
|
||||
WHERE user_id = ?",
|
||||
user_id
|
||||
)
|
||||
@@ -87,7 +87,7 @@ impl Category {
|
||||
name,
|
||||
description
|
||||
FROM inventory_items_categories AS category
|
||||
WHERE
|
||||
WHERE
|
||||
category.id = ?
|
||||
AND category.user_id = ?",
|
||||
id_param,
|
||||
@@ -155,7 +155,7 @@ impl Category {
|
||||
description,
|
||||
category_id
|
||||
FROM inventory_items
|
||||
WHERE
|
||||
WHERE
|
||||
category_id = ?
|
||||
AND user_id = ?",
|
||||
id,
|
||||
@@ -261,7 +261,7 @@ impl InventoryItem {
|
||||
ON item.category_id = category.id
|
||||
LEFT JOIN inventory_products AS product
|
||||
ON item.product_id = product.id
|
||||
WHERE
|
||||
WHERE
|
||||
item.id = ?
|
||||
AND item.user_id = ?",
|
||||
id_param,
|
||||
@@ -285,7 +285,7 @@ impl InventoryItem {
|
||||
pool,
|
||||
"SELECT id
|
||||
FROM inventory_items
|
||||
WHERE
|
||||
WHERE
|
||||
name = ?
|
||||
AND user_id = ?",
|
||||
name,
|
||||
@@ -305,7 +305,7 @@ impl InventoryItem {
|
||||
},
|
||||
pool,
|
||||
"DELETE FROM inventory_items
|
||||
WHERE
|
||||
WHERE
|
||||
id = ?
|
||||
AND user_id = ?",
|
||||
id_param,
|
||||
@@ -338,7 +338,7 @@ impl InventoryItem {
|
||||
SET
|
||||
name = ?,
|
||||
weight = ?
|
||||
WHERE
|
||||
WHERE
|
||||
item.id = ?
|
||||
AND item.user_id = ?
|
||||
RETURNING inventory_items.category_id AS id
|
||||
@@ -405,7 +405,7 @@ impl InventoryItem {
|
||||
FROM inventory_items_categories as category
|
||||
INNER JOIN inventory_items as i_item
|
||||
ON i_item.category_id = category.id
|
||||
WHERE
|
||||
WHERE
|
||||
category_id = ?
|
||||
AND category.user_id = ?
|
||||
",
|
||||
@@ -473,7 +473,7 @@ impl Item {
|
||||
ON i_item.category_id = category.id
|
||||
INNER JOIN trips_items as t_item
|
||||
ON i_item.id = t_item.item_id
|
||||
WHERE
|
||||
WHERE
|
||||
category_id = ?
|
||||
AND category.user_id = ?
|
||||
AND t_item.pick = 1
|
||||
|
||||
@@ -263,7 +263,7 @@ impl TripCategory {
|
||||
ON item.id = trip.item_id
|
||||
INNER JOIN inventory_items_categories as category
|
||||
ON category.id = item.category_id
|
||||
WHERE
|
||||
WHERE
|
||||
trip.trip_id = ?
|
||||
AND trip.user_id = ?
|
||||
) AS inner
|
||||
@@ -888,14 +888,14 @@ impl Trip {
|
||||
},
|
||||
&mut *transaction,
|
||||
r#"INSERT INTO trips_items (
|
||||
item_id,
|
||||
trip_id,
|
||||
pick,
|
||||
pack,
|
||||
item_id,
|
||||
trip_id,
|
||||
pick,
|
||||
pack,
|
||||
ready,
|
||||
new,
|
||||
user_id
|
||||
) SELECT
|
||||
) SELECT
|
||||
item_id,
|
||||
$1 as trip_id,
|
||||
pick,
|
||||
@@ -918,14 +918,14 @@ impl Trip {
|
||||
},
|
||||
&mut *transaction,
|
||||
r#"INSERT INTO trips_items (
|
||||
item_id,
|
||||
trip_id,
|
||||
pick,
|
||||
pack,
|
||||
item_id,
|
||||
trip_id,
|
||||
pick,
|
||||
pack,
|
||||
ready,
|
||||
new,
|
||||
user_id
|
||||
) SELECT
|
||||
) SELECT
|
||||
id as item_id,
|
||||
$1 as trip_id,
|
||||
false as pick,
|
||||
|
||||
Reference in New Issue
Block a user