From 6c10b95ef82faf85ce6687b3ac6260011b9a09e7 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Tue, 18 Aug 2026 16:17:12 +0200 Subject: [PATCH] database: Update v_bki_member, v_bki_delivery and rename scale_id to scale_terminal --- sql/sample/WLNS.sql | 2 +- sql/sample/WLWV.sql | 2 +- sql/v01/12.create.season.sql | 2 +- sql/v01/30.create.view.sql | 3 ++- sql/v01/99.schema_version.sql | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sql/sample/WLNS.sql b/sql/sample/WLNS.sql index 568dc3c..cac4a30 100644 --- a/sql/sample/WLNS.sql +++ b/sql/sample/WLNS.sql @@ -46,7 +46,7 @@ INSERT INTO delivery (year, did, date, time, zwstid, lnr, lsnr, mgnr, ctime, mti (2025, 1, '2025-09-30', '09:04:38', 'X', 1, '20250930X001', 101, 1759215878, 1759215878), (2025, 2, '2025-09-30', '10:47:13', 'X', 2, '20250930X002', 102, 1759222033, 1759222033); -INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, scale_id, weighing_data, ctime, mtime) VALUES +INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, scale_termianl, weighing_data, ctime, mtime) VALUES (2025, 1, 1, 'GV', NULL, 'B', 2876, 16.8, 'QUW', 'WLBL', 32019, TRUE, FALSE, '1', '{"id":"2025-09-30/1","nr":1,"date":"2025-09-30","time":"08:52:00","gross_weight":2876,"tare_weight":0,"net_weight":2876}', 1759215878, 1759215878), (2025, 1, 2, 'SB', NULL, 'B', 1342, 15.2, 'QUW', 'WLBL', 32019, TRUE, FALSE, '1', '{"id":"2025-09-30/2","nr":2,"date":"2025-09-30","time":"08:56:00","gross_weight":1342,"tare_weight":0,"net_weight":1342}', 1759215878, 1759215878), (2025, 1, 3, 'WR', 'S', NULL, 3128, 14.5, 'LDW', 'WLXX', 32019, TRUE, FALSE, '1', '{"id":"2025-09-30/4","nr":4,"date":"2025-09-30","time":"09:01:00","gross_weight":3128,"tare_weight":0,"net_weight":3128}', 1759215878, 1759215878), diff --git a/sql/sample/WLWV.sql b/sql/sample/WLWV.sql index b19ea93..35395cf 100644 --- a/sql/sample/WLWV.sql +++ b/sql/sample/WLWV.sql @@ -66,7 +66,7 @@ INSERT INTO delivery (year, did, date, time, zwstid, lnr, lsnr, mgnr, ctime, mti (2025, 1, '2025-09-30', '09:04:38', 'X', 1, '20250930X001', 101, 1759215878, 1759215878), (2025, 2, '2025-09-30', '10:47:13', 'X', 2, '20250930X002', 102, 1759222033, 1759222033); -INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, scale_id, weighing_data, ctime, mtime) VALUES +INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, scale_termianl, weighing_data, ctime, mtime) VALUES (2025, 1, 1, 'GV', NULL, 'B', 2876, 16.8, 'QUW', 'WLNO', 15224, TRUE, FALSE, '1', '{"id":"2025-09-30/1","nr":1,"date":"2025-09-30","time":"08:52:00","gross_weight":2876,"tare_weight":0,"net_weight":2876}', 1759215878, 1759215878), (2025, 1, 2, 'SB', NULL, 'B', 1342, 15.2, 'QUW', 'WLNO', 15224, TRUE, FALSE, '1', '{"id":"2025-09-30/2","nr":2,"date":"2025-09-30","time":"08:56:00","gross_weight":1342,"tare_weight":0,"net_weight":1342}', 1759215878, 1759215878), (2025, 1, 3, 'WR', 'S', NULL, 3128, 14.5, 'LDW', 'WLXX', 15224, TRUE, FALSE, '1', '{"id":"2025-09-30/4","nr":4,"date":"2025-09-30","time":"09:01:00","gross_weight":3128,"tare_weight":0,"net_weight":3128}', 1759215878, 1759215878), diff --git a/sql/v01/12.create.season.sql b/sql/v01/12.create.season.sql index f07bb9d..21dcef2 100644 --- a/sql/v01/12.create.season.sql +++ b/sql/v01/12.create.season.sql @@ -189,7 +189,7 @@ CREATE TABLE delivery_part ( temperature REAL DEFAULT NULL, acid REAL DEFAULT NULL, - scale_id TEXT, + scale_terminal TEXT, weighing_data TEXT, weighing_reason TEXT CHECK (NOT (manual_weighing = FALSE AND weighing_reason IS NOT NULL)), diff --git a/sql/v01/30.create.view.sql b/sql/v01/30.create.view.sql index 6476c64..2005e64 100644 --- a/sql/v01/30.create.view.sql +++ b/sql/v01/30.create.view.sql @@ -127,6 +127,7 @@ SELECT s.year, m.mgnr, m.lfbis_nr, m.name, (COALESCE(m.prefix || ' ', '') || m.given_name || COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '')) AS other_names, a.name AS billing_name, COALESCE(a.address, m.address) AS address, COALESCE(a.country, m.country) AS country, COALESCE(a.postal_dest, m.postal_dest) AS postal_dest, + m.volllieferant AS vollablieferer, SUM(COALESCE(IIF((c.year_from IS NULL OR c.year_from <= s.year) AND (c.year_to IS NULL OR c.year_to >= s.year), c.area, NULL), 0)) AS area FROM season s, member m LEFT JOIN member_billing_address a ON a.mgnr = m.mgnr @@ -137,7 +138,7 @@ CREATE VIEW v_bki_delivery AS SELECT m.lfbis_nr, m.name, m.other_names, m.billing_name, m.address, plz.plz, IIF(INSTR(o.name, ',') = 0, o.name, SUBSTR(o.name, 1, INSTR(o.name, ',') - 1)) AS ort, d.date, d.weight, v.type, v.sortid, d.qualid, d.year, d.hkid, d.kmw, d.oe, - m.area + m.vollablieferer, m.area FROM v_delivery d JOIN v_bki_member m ON (m.year, m.mgnr) = (d.year, d.mgnr) JOIN postal_dest pd ON (pd.country, pd.id) = (m.country, m.postal_dest) diff --git a/sql/v01/99.schema_version.sql b/sql/v01/99.schema_version.sql index a2ae4a3..1df38e6 100644 --- a/sql/v01/99.schema_version.sql +++ b/sql/v01/99.schema_version.sql @@ -1,3 +1,3 @@ -- This value MUST NOT be changed while other connections are open! -PRAGMA schema_version = 4000; +PRAGMA schema_version = 4100;