winzer/elwig-misc
3
1
Fork 0
Code Pull Requests Activity

Rename wine_quality to wine_quality_level

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-05-14 11:56:15 +02:00
parent bc93887988
commit 04dcbb37de
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/v01/10.create.sql
View File

@ -158,14 +158,14 @@ CREATE TABLE wine_variety (
CONSTRAINT pk_wine_variety PRIMARY KEY (sortid) CONSTRAINT pk_wine_variety PRIMARY KEY (sortid)
) STRICT; ) STRICT;
CREATE TABLE wine_quality ( CREATE TABLE wine_quality_level (
qualid TEXT NOT NULL CHECK (qualid REGEXP '^[A-Z]{3}$'), qualid TEXT NOT NULL CHECK (qualid REGEXP '^[A-Z]{3}$'),
origin_level INTEGER NOT NULL, origin_level INTEGER NOT NULL,
predicate INTEGER NOT NULL CHECK(predicate IN (TRUE, FALSE)), predicate INTEGER NOT NULL CHECK(predicate IN (TRUE, FALSE)),
min_kmw REAL DEFAULT NULL, min_kmw REAL DEFAULT NULL,
name TEXT NOT NULL, name TEXT NOT NULL,
CONSTRAINT pk_wine_quality PRIMARY KEY (qualid) CONSTRAINT pk_wine_quality_level PRIMARY KEY (qualid)
) STRICT; ) STRICT;
CREATE TABLE wine_origin ( CREATE TABLE wine_origin (
@ -304,6 +304,7 @@ CREATE TABLE member (
email TEXT CHECK (email REGEXP '^[^@ ]+@([a-z0-9_\x2Däöüß]+\.)+[a-z]{2,}$') DEFAULT NULL, email TEXT CHECK (email REGEXP '^[^@ ]+@([a-z0-9_\x2Däöüß]+\.)+[a-z]{2,}$') DEFAULT NULL,
phone_landline TEXT CHECK (phone_landline REGEXP '^\+[0-9]+$') DEFAULT NULL, phone_landline TEXT CHECK (phone_landline REGEXP '^\+[0-9]+$') DEFAULT NULL,
fax TEXT CHECK (fax REGEXP '^\+[0-9]+$') DEFAULT NULL,
phone_mobile_1 TEXT CHECK (phone_mobile_1 REGEXP '^\+[0-9]+$') DEFAULT NULL, phone_mobile_1 TEXT CHECK (phone_mobile_1 REGEXP '^\+[0-9]+$') DEFAULT NULL,
phone_mobile_2 TEXT CHECK (phone_mobile_2 REGEXP '^\+[0-9]+$') DEFAULT NULL, phone_mobile_2 TEXT CHECK (phone_mobile_2 REGEXP '^\+[0-9]+$') DEFAULT NULL,
@ -510,7 +511,7 @@ CREATE TABLE delivery_part (
CONSTRAINT fk_delivery_part_wine_variety FOREIGN KEY (sortid) REFERENCES wine_variety (sortid) CONSTRAINT fk_delivery_part_wine_variety FOREIGN KEY (sortid) REFERENCES wine_variety (sortid)
ON UPDATE CASCADE ON UPDATE CASCADE
ON DELETE RESTRICT, ON DELETE RESTRICT,
CONSTRAINT fk_delivery_part_wine_quality FOREIGN KEY (qualid) REFERENCES wine_quality (qualid) CONSTRAINT fk_delivery_part_wine_quality_level FOREIGN KEY (qualid) REFERENCES wine_quality_level (qualid)
ON UPDATE CASCADE ON UPDATE CASCADE
ON DELETE RESTRICT, ON DELETE RESTRICT,
CONSTRAINT fk_delivery_part_wine_origin FOREIGN KEY (hkid) REFERENCES wine_origin (hkid) CONSTRAINT fk_delivery_part_wine_origin FOREIGN KEY (hkid) REFERENCES wine_origin (hkid)

8
sql/v01/50.base.sql
View File

@ -14,9 +14,9 @@ INSERT INTO country VALUES
('PT', 'PRT', 620, 'Portugal', FALSE); ('PT', 'PRT', 620, 'Portugal', FALSE);
INSERT INTO currency VALUES INSERT INTO currency VALUES
('EUR', 'Euro', '€', 1000000), ('EUR', 'Euro', '€', 1000000),
('ATS', 'Schilling', 'S', 13760300), ('ATS', 'Schilling', 'S', 13760300),
('XXP', 'Punkte', 'Pkt.', NULL); ('XXP', 'Punkte', 'Pkt.', NULL);
INSERT INTO AT_bundesland VALUES INSERT INTO AT_bundesland VALUES
(1, 'B', 'Bgld.', 'Burgenland'), (1, 'B', 'Bgld.', 'Burgenland'),
@ -29,7 +29,7 @@ INSERT INTO AT_bundesland VALUES
(8, 'V', 'Vbg.', 'Vorarlberg'), (8, 'V', 'Vbg.', 'Vorarlberg'),
(9, 'W', NULL, 'Wien'); (9, 'W', NULL, 'Wien');
INSERT INTO wine_quality VALUES INSERT INTO wine_quality_level VALUES
('WEI', 0, FALSE, NULL, 'Wein'), ('WEI', 0, FALSE, NULL, 'Wein'),
('RSW', 0, FALSE, 11.5, 'Rebsortenwein'), ('RSW', 0, FALSE, 11.5, 'Rebsortenwein'),
('LDW', 1, FALSE, 14.0, 'Landwein'), ('LDW', 1, FALSE, 14.0, 'Landwein'),
@ -41,7 +41,7 @@ INSERT INTO wine_quality VALUES
('TBA', 3, TRUE, 30.0, 'Trockenbeerenauslese'), ('TBA', 3, TRUE, 30.0, 'Trockenbeerenauslese'),
('DAC', 3, TRUE, 15.0, 'Districtus Austriae Controllatus'); ('DAC', 3, TRUE, 15.0, 'Districtus Austriae Controllatus');
--INSERT INTO wine_quality (qualid, name) --INSERT INTO wine_quality_level (qualid, name)
--('EIW', 'Eiswein'), --('EIW', 'Eiswein'),
--('INW', 'Industriewein'), --('INW', 'Industriewein'),
--('RAB', 'Ruster Ausbruch'), --('RAB', 'Ruster Ausbruch'),

6
wgmaster/migrate.py
View File

@ -366,7 +366,7 @@ def migrate_members(in_dir: str, out_dir: str) -> None:
'birthday', 'entry_date', 'exit_date', 'business_shares', 'accounting_nr', 'zwstid', 'birthday', 'entry_date', 'exit_date', 'business_shares', 'accounting_nr', 'zwstid',
'lfbis_nr', 'ustid', 'volllieferant', 'buchführend', 'funktionär', 'active', 'iban', 'bic', 'lfbis_nr', 'ustid', 'volllieferant', 'buchführend', 'funktionär', 'active', 'iban', 'bic',
'country', 'postal_dest', 'address', 'country', 'postal_dest', 'address',
'email', 'phone_landline', 'phone_mobile_1', 'phone_mobile_2', 'email', 'phone_landline', 'fax', 'phone_mobile_1', 'phone_mobile_2',
'default_kgnr', 'comment') 'default_kgnr', 'comment')
f_mba.header('mgnr', 'name', 'country', 'postal_dest', 'address') f_mba.header('mgnr', 'name', 'country', 'postal_dest', 'address')
@ -524,7 +524,7 @@ def migrate_members(in_dir: str, out_dir: str) -> None:
phone_1: Optional[str] = m['Telefon'] phone_1: Optional[str] = m['Telefon']
phone_2: Optional[str] = m['Mobiltelefon'] phone_2: Optional[str] = m['Mobiltelefon']
email: Optional[str] = m['EMail'] email: Optional[str] = m['EMail']
phone_landline = None phone_landline, fax = None, None
phone_mobile = [] phone_mobile = []
if email is not None: if email is not None:
@ -588,7 +588,7 @@ def migrate_members(in_dir: str, out_dir: str) -> None:
m['Geburtsjahr'], m['Eintrittsdatum'], m['Austrittsdatum'], m['Geschäftsanteile1'] or 0, m['Geburtsjahr'], m['Eintrittsdatum'], m['Austrittsdatum'], m['Geschäftsanteile1'] or 0,
m['BHKontonummer'], zwstid, bnr, ustid, m['BHKontonummer'], zwstid, bnr, ustid,
m['Volllieferant'] or False, m['Buchführend'] or False, funktionaer, active, m['Volllieferant'] or False, m['Buchführend'] or False, funktionaer, active,
iban, bic, 'AT', postal_dest, address or '-', email, phone_landline, iban, bic, 'AT', postal_dest, address or '-', email, phone_landline, fax,
phone_mobile[0] if len(phone_mobile) > 0 else None, phone_mobile[1] if len(phone_mobile) > 1 else None, phone_mobile[0] if len(phone_mobile) > 0 else None, phone_mobile[1] if len(phone_mobile) > 1 else None,
kgnr, m['Anmerkung'] kgnr, m['Anmerkung']
) )