From 0d76f4b8266169224658a17e4525c714fa503351 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Thu, 12 Jan 2023 18:14:44 -0500 Subject: [PATCH] Fix issue with retrieving inventory data query --- kitchen/sqlx-data.json | 138 +++++++++--------- kitchen/src/web/storage/fetch_extra_items.sql | 2 - .../fetch_inventory_filtered_ingredients.sql | 6 - .../storage/fetch_inventory_modified_amts.sql | 7 - 4 files changed, 69 insertions(+), 84 deletions(-) diff --git a/kitchen/sqlx-data.json b/kitchen/sqlx-data.json index 443fa09..95ad150 100644 --- a/kitchen/sqlx-data.json +++ b/kitchen/sqlx-data.json @@ -1,35 +1,5 @@ { "db": "SQLite", - "04987493e4b13793a2dff75cc2710972bb28abf303275f5e6346470cdf5c2c17": { - "describe": { - "columns": [ - { - "name": "name", - "ordinal": 0, - "type_info": "Text" - }, - { - "name": "form", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "measure_type", - "ordinal": 2, - "type_info": "Text" - } - ], - "nullable": [ - false, - false, - false - ], - "parameters": { - "Right": 1 - } - }, - "query": "with latest_dates as (\n select\n user_id,\n name,\n form,\n measure_type,\n max(plan_date) as plan_date\n from filtered_ingredients\n where user_id = ?\n)\n\nselect\n filtered_ingredients.name,\n filtered_ingredients.form,\n filtered_ingredients.measure_type\nfrom latest_dates\ninner join filtered_ingredients on\n latest_dates.user_id = filtered_ingredients.user_id\n and latest_dates.name = filtered_ingredients.name\n and latest_dates.form = filtered_ingredients.form\n and latest_dates.measure_type = filtered_ingredients.measure_type\n and latest_dates.plan_date = filtered_ingredients.plan_date" - }, "104f07472670436d3eee1733578bbf0c92dc4f965d3d13f9bf4bfbc92958c5b6": { "describe": { "columns": [ @@ -132,6 +102,30 @@ }, "query": "insert into category_mappings\n (user_id, ingredient_name, category_name)\n values (?, ?, ?)\n on conflict (user_id, ingredient_name)\n do update set category_name=excluded.category_name\n" }, + "3493b265a2f13a4f9ca487f240d5dcfdf387478d2e401dc0e1a91bbd0ef69b36": { + "describe": { + "columns": [ + { + "name": "name", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "amt", + "ordinal": 1, + "type_info": "Text" + } + ], + "nullable": [ + false, + false + ], + "parameters": { + "Right": 1 + } + }, + "query": "with latest_dates as (\n select\n user_id,\n max(plan_date) as plan_date\n from extra_items\n where user_id = ?\n group by user_id, name\n)\n\nselect\n extra_items.name,\n extra_items.amt\nfrom latest_dates\ninner join extra_items on\n latest_dates.user_id = extra_items.user_id\n and latest_dates.plan_date= extra_items.plan_date" + }, "37f382be1b53efd2f79a0d59ae6a8717f88a86908a7a4128d5ed7339147ca59d": { "describe": { "columns": [ @@ -176,42 +170,6 @@ }, "query": "insert into recipes (user_id, recipe_id, recipe_text) values (?, ?, ?)\n on conflict(user_id, recipe_id) do update set recipe_text=excluded.recipe_text" }, - "406aac6ac2b0084c31c29adec6fa2fb9bb925d92121305c8afbac009caf1ecc0": { - "describe": { - "columns": [ - { - "name": "name", - "ordinal": 0, - "type_info": "Text" - }, - { - "name": "form", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "measure_type", - "ordinal": 2, - "type_info": "Text" - }, - { - "name": "amt", - "ordinal": 3, - "type_info": "Text" - } - ], - "nullable": [ - false, - false, - false, - false - ], - "parameters": { - "Right": 1 - } - }, - "query": "with latest_dates as (\n select\n user_id,\n name,\n form,\n measure_type,\n amt,\n max(plan_date) as plan_date\n from modified_amts\n where user_id = ?\n)\n\nselect\n modified_amts.name,\n modified_amts.form,\n modified_amts.measure_type,\n modified_amts.amt\nfrom latest_dates\ninner join modified_amts on\n latest_dates.user_id = modified_amts.user_id\n and latest_dates.name = modified_amts.name\n and latest_dates.form = modified_amts.form\n and latest_dates.amt = modified_amts.amt\n and latest_dates.plan_date = modified_amts.plan_date" - }, "5d743897fb0d8fd54c3708f1b1c6e416346201faa9e28823c1ba5a421472b1fa": { "describe": { "columns": [], @@ -372,6 +330,42 @@ }, "query": "with max_date as (\n select user_id, max(date(plan_date)) as plan_date from plan_recipes group by user_id\n)\n\nselect plan_recipes.plan_date as \"plan_date: NaiveDate\", plan_recipes.recipe_id, plan_recipes.count\n from plan_recipes\n inner join max_date on plan_recipes.user_id = max_date.user_id\nwhere\n plan_recipes.user_id = ?\n and plan_recipes.plan_date = max_date.plan_date" }, + "b5a4bfffc9a2cd14e8cadc7ccff925a950a4a7cbea5cf28323cf2cc0f843209e": { + "describe": { + "columns": [ + { + "name": "name", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "form", + "ordinal": 1, + "type_info": "Text" + }, + { + "name": "measure_type", + "ordinal": 2, + "type_info": "Text" + }, + { + "name": "amt", + "ordinal": 3, + "type_info": "Text" + } + ], + "nullable": [ + false, + false, + false, + false + ], + "parameters": { + "Right": 1 + } + }, + "query": "with latest_dates as (\n select\n user_id,\n max(plan_date) as plan_date\n from modified_amts\n where user_id = ?\n)\n\nselect\n modified_amts.name,\n modified_amts.form,\n modified_amts.measure_type,\n modified_amts.amt\nfrom latest_dates\ninner join modified_amts on\n latest_dates.user_id = modified_amts.user_id\n and latest_dates.plan_date = modified_amts.plan_date" + }, "c988364f9f83f4fa8bd0e594bab432ee7c9ec47ca40f4d16e5e2a8763653f377": { "describe": { "columns": [ @@ -400,7 +394,7 @@ }, "query": "delete from sessions" }, - "f34ec23c5cc8f61f92464ecf68620150a8d4521b68b5099a0a7dac3328651880": { + "e8eb76386f514f92792c5b1882bbc98afbde62ec0a665fbc8cce7db3b123ad14": { "describe": { "columns": [ { @@ -409,12 +403,18 @@ "type_info": "Text" }, { - "name": "amt", + "name": "form", "ordinal": 1, "type_info": "Text" + }, + { + "name": "measure_type", + "ordinal": 2, + "type_info": "Text" } ], "nullable": [ + false, false, false ], @@ -422,6 +422,6 @@ "Right": 1 } }, - "query": "with latest_dates as (\n select\n user_id,\n name,\n max(plan_date) as plan_date\n from extra_items\n where user_id = ?\n group by user_id, name\n)\n\nselect\n extra_items.name,\n extra_items.amt\nfrom latest_dates\ninner join extra_items on\n latest_dates.user_id = extra_items.user_id\n and latest_dates.name = extra_items.name\n and latest_dates.plan_date= extra_items.plan_date" + "query": "with latest_dates as (\n select\n user_id,\n max(plan_date) as plan_date\n from filtered_ingredients\n where user_id = ?\n)\n\nselect\n filtered_ingredients.name,\n filtered_ingredients.form,\n filtered_ingredients.measure_type\nfrom latest_dates\ninner join filtered_ingredients on\n latest_dates.user_id = filtered_ingredients.user_id\n and latest_dates.plan_date = filtered_ingredients.plan_date" } } \ No newline at end of file diff --git a/kitchen/src/web/storage/fetch_extra_items.sql b/kitchen/src/web/storage/fetch_extra_items.sql index bff8fbd..42a4e55 100644 --- a/kitchen/src/web/storage/fetch_extra_items.sql +++ b/kitchen/src/web/storage/fetch_extra_items.sql @@ -1,7 +1,6 @@ with latest_dates as ( select user_id, - name, max(plan_date) as plan_date from extra_items where user_id = ? @@ -14,5 +13,4 @@ select from latest_dates inner join extra_items on latest_dates.user_id = extra_items.user_id - and latest_dates.name = extra_items.name and latest_dates.plan_date= extra_items.plan_date \ No newline at end of file diff --git a/kitchen/src/web/storage/fetch_inventory_filtered_ingredients.sql b/kitchen/src/web/storage/fetch_inventory_filtered_ingredients.sql index d98c5ff..6828486 100644 --- a/kitchen/src/web/storage/fetch_inventory_filtered_ingredients.sql +++ b/kitchen/src/web/storage/fetch_inventory_filtered_ingredients.sql @@ -1,9 +1,6 @@ with latest_dates as ( select user_id, - name, - form, - measure_type, max(plan_date) as plan_date from filtered_ingredients where user_id = ? @@ -16,7 +13,4 @@ select from latest_dates inner join filtered_ingredients on latest_dates.user_id = filtered_ingredients.user_id - and latest_dates.name = filtered_ingredients.name - and latest_dates.form = filtered_ingredients.form - and latest_dates.measure_type = filtered_ingredients.measure_type and latest_dates.plan_date = filtered_ingredients.plan_date \ No newline at end of file diff --git a/kitchen/src/web/storage/fetch_inventory_modified_amts.sql b/kitchen/src/web/storage/fetch_inventory_modified_amts.sql index 6a3d317..b87b0cb 100644 --- a/kitchen/src/web/storage/fetch_inventory_modified_amts.sql +++ b/kitchen/src/web/storage/fetch_inventory_modified_amts.sql @@ -1,10 +1,6 @@ with latest_dates as ( select user_id, - name, - form, - measure_type, - amt, max(plan_date) as plan_date from modified_amts where user_id = ? @@ -18,7 +14,4 @@ select from latest_dates inner join modified_amts on latest_dates.user_id = modified_amts.user_id - and latest_dates.name = modified_amts.name - and latest_dates.form = modified_amts.form - and latest_dates.amt = modified_amts.amt and latest_dates.plan_date = modified_amts.plan_date \ No newline at end of file