Merge branch 'new_parser' into dev

This commit is contained in:
PhilRunninger 2023-02-28 15:10:21 -05:00
commit bc9aa4a456
3 changed files with 23 additions and 23 deletions

Binary file not shown.

BIN
Master Template.xlsm Normal file

Binary file not shown.

View File

@ -1,8 +1,8 @@
--\timing
--explain (analyze, buffers)
WITH
WITH
mseq AS (
SELECT * FROM
SELECT * FROM
(
VALUES
('01 - Jun',1)
@ -36,7 +36,7 @@ FROM
rlarp.osm_pool
WHERE
where_clause
AND order_season IN (2021,2022)
AND order_season IN (2022,2023)
GROUP BY
order_season
,order_month
@ -67,7 +67,7 @@ GROUP BY
,CASE WHEN sum(value_usd) over () = 0 THEN 0 ELSE value_usd/sum(value_usd) over () END mix
FROM
basket1
ORDER BY
ORDER BY
mix DESC
)
,months AS (
@ -94,14 +94,14 @@ GROUP BY
SELECT
order_month
,seq
,SUM(units) FILTER (WHERE order_season = 2021) "2021 qty"
,SUM(units) FILTER (WHERE order_season = 2022 AND iter IN ('copy','short ship','bad_ship','plan')) "2022 base qty"
,SUM(units) FILTER (WHERE order_season = 2022 AND iter NOT IN ('copy','short ship','bad_ship','plan')) "2022 adj qty"
,SUM(units) FILTER (WHERE order_season = 2022) "2022 tot qty"
,SUM(value_usd) FILTER (WHERE order_season = 2021) "2021 value_usd"
,SUM(value_usd) FILTER (WHERE order_season = 2022 AND iter IN ('copy','short ship','bad_ship','plan')) "2022 base value_usd"
,SUM(value_usd) FILTER (WHERE order_season = 2022 AND iter NOT IN ('copy','short ship','bad_ship','plan')) "2022 adj value_usd"
,SUM(value_usd) FILTER (WHERE order_season = 2022) "2022 tot value_usd"
,SUM(units) FILTER (WHERE order_season = 2022) "2022 qty"
,SUM(units) FILTER (WHERE order_season = 2023 AND iter IN ('copy','short ship','bad_ship','plan')) "2023 base qty"
,SUM(units) FILTER (WHERE order_season = 2023 AND iter NOT IN ('copy','short ship','bad_ship','plan')) "2023 adj qty"
,SUM(units) FILTER (WHERE order_season = 2023) "2023 tot qty"
,SUM(value_usd) FILTER (WHERE order_season = 2022) "2022 value_usd"
,SUM(value_usd) FILTER (WHERE order_season = 2023 AND iter IN ('copy','short ship','bad_ship','plan')) "2023 base value_usd"
,SUM(value_usd) FILTER (WHERE order_season = 2023 AND iter NOT IN ('copy','short ship','bad_ship','plan')) "2023 adj value_usd"
,SUM(value_usd) FILTER (WHERE order_season = 2023) "2023 tot value_usd"
FROM
months
GROUP BY
@ -113,14 +113,14 @@ GROUP BY
,mlist AS (
SELECT
mseq.m order_month
,"2021 qty"
,"2022 base qty"
,"2022 adj qty"
,"2022 tot qty"
,"2021 value_usd"
,"2022 base value_usd"
,"2022 adj value_usd"
,"2022 tot value_usd"
,"2022 qty"
,"2023 base qty"
,"2023 adj qty"
,"2023 tot qty"
,"2022 value_usd"
,"2023 base value_usd"
,"2023 adj value_usd"
,"2023 tot value_usd"
FROM
mseq
LEFT OUTER JOIN mpvt ON
@ -147,12 +147,12 @@ GROUP BY
doc->>'tag' tag
FROM
rlarp.osm_log
WHERE
WHERE
doc ? 'tag'
AND id <> 1
UNION
SELECT * FROM
(VALUES
(VALUES
('price'),
('volume')
) x(tag)
@ -168,7 +168,7 @@ GROUP BY
bill_cust_descr
,ship_cust_descr
)
SELECT
SELECT
jsonb_build_object(
'months'
,(SELECT jsonb_agg(row_to_json(months)::jsonb) FROM months)