diff --git a/bki/kuerzel-2025.pdf b/bki/kuerzel-2025.pdf new file mode 100644 index 0000000..f052cf6 Binary files /dev/null and b/bki/kuerzel-2025.pdf differ diff --git a/sql/v01/10.create.base.sql b/sql/v01/10.create.base.sql index 91a2fa7..b2d6e7b 100644 --- a/sql/v01/10.create.base.sql +++ b/sql/v01/10.create.base.sql @@ -136,15 +136,6 @@ BEGIN DELETE FROM postal_dest WHERE (country, id) = (OLD.country, OLD.id); END; -CREATE TABLE wine_variety ( - sortid TEXT NOT NULL CHECK (sortid REGEXP '^[A-Z]{2}$'), - type TEXT NOT NULL CHECK (type IN ('R', 'W')), - name TEXT NOT NULL, - comment TEXT, - - CONSTRAINT pk_wine_variety PRIMARY KEY (sortid) -) STRICT; - CREATE TABLE wine_quality_level ( qualid TEXT NOT NULL CHECK (qualid REGEXP '^[A-Z]{3}$'), origin_level INTEGER NOT NULL, @@ -155,6 +146,19 @@ CREATE TABLE wine_quality_level ( CONSTRAINT pk_wine_quality_level PRIMARY KEY (qualid) ) STRICT; +CREATE TABLE wine_variety ( + sortid TEXT NOT NULL CHECK (sortid REGEXP '^[A-Z]{2}$'), + type TEXT NOT NULL CHECK (type IN ('R', 'W')), + max_qualid TEXT NOT NULL, + name TEXT NOT NULL, + comment TEXT, + + CONSTRAINT pk_wine_variety PRIMARY KEY (sortid), + CONSTRAINT fk_wine_variety_wine_quality_level FOREIGN KEY (max_qualid) REFERENCES wine_quality_level (qualid) + ON UPDATE CASCADE + ON DELETE RESTRICT +) STRICT; + CREATE TABLE wine_origin ( hkid TEXT NOT NULL CHECK (hkid REGEXP '^[A-Z]{4}$'), parent_hkid TEXT, diff --git a/sql/v01/50.insert.base.sql b/sql/v01/50.insert.base.sql index c02d4c1..11b1989 100644 --- a/sql/v01/50.insert.base.sql +++ b/sql/v01/50.insert.base.sql @@ -37,7 +37,7 @@ INSERT INTO wine_quality_level VALUES ('QUW', 2, FALSE, 15.0, 'Qualitätswein'), ('KAB', 2, FALSE, 17.0, 'Kabinett'), ('SPL', 2, TRUE, 19.0, 'Spätlese'), -('AUL', 2, TRUE, 21.0, 'Auslese'), +('ALW', 2, TRUE, 21.0, 'Auslese'), ('BAL', 2, TRUE, 25.0, 'Beerenauslese'), ('TBA', 2, TRUE, 30.0, 'Trockenbeerenauslese'), ('DAC', 3, TRUE, 15.0, 'DAC'); @@ -85,48 +85,58 @@ INSERT INTO wine_origin VALUES ('WLEB', 'WLBL', 'Eisenberg', NULL); INSERT INTO wine_variety VALUES -('BL', 'R', 'Blauburger', NULL), -('BB', 'R', 'Blauer Burgunder', 'Blauer Spätburgunder, Blauburgunder, Pinot Noir'), -('BP', 'R', 'Blauer Portugieser', NULL), -('BW', 'R', 'Blauer Wildbacher', NULL), -('BF', 'R', 'Blaufränkisch', 'Frankovka'), -('BM', 'W', 'Blütenmuskateller', NULL), -('BO', 'W', 'Bouvier', NULL), -('CF', 'R', 'Cabernet Franc', NULL), -('CS', 'R', 'Cabernet Sauvignon', NULL), -('CH', 'W', 'Chardonnay', 'Morillon'), -('FV', 'W', 'Frühroter Veltliner', 'Malvasier'), -('FU', 'W', 'Furmint', NULL), -('GW', 'W', 'Gemischter Satz weiß', NULL), -('GB', 'W', 'Goldburger', NULL), -('GL', 'W', 'Goldmuskateller', NULL), -('GR', 'W', 'Grauer Burgunder', 'Grauburgunder, Pinot Gris, Ruländer'), -('GV', 'W', 'Grüner Veltliner', 'Weißgipfler'), -('JU', 'W', 'Jubiläumsrebe', NULL), -('ME', 'R', 'Merlot', NULL), -('MT', 'W', 'Müller Thurgau', 'Rivaner'), -('MC', 'W', 'Muscaris', NULL), -('MO', 'W', 'Muskat Ottonel', NULL), -('MU', 'W', 'Muskateller', 'Gelber Muskateller, Roter Muskateller'), -('NB', 'W', 'Neuburger', NULL), -('RH', 'R', 'Rathay', NULL), -('RR', 'W', 'Riesling', 'Weißer Riesling, Rheinriesling, Roter Riesling'), -('RL', 'R', 'Roesler', NULL), -('RM', 'R', 'Rosenmuskateller', NULL), -('RV', 'W', 'Roter Veltliner', NULL), -('RG', 'W', 'Rotgipfler', NULL), -('SB', 'W', 'Sauvignon Blanc', NULL), -('SA', 'W', 'Scheurebe', 'Sämling 88'), --- ('SP', '', 'Sortenverschnitt gleichgepresst', NULL), -('SR', 'R', 'Sortenverschnitt Rosé', NULL), -('SO', 'R', 'Sortenverschnitt rot', NULL), -('SW', 'W', 'Sortenverschnitt weiß', NULL), -('SG', 'W', 'Souvignier Gris', NULL), -('SL', 'R', 'St. Laurent', NULL), -('SY', 'W', 'Sylvaner', 'Grüner Sylvaner'), -('SH', 'R', 'Syrah', 'Shiraz'), -('TR', 'W', 'Traminer', 'Gewürztraminer, Roter Traminer, Gelber Traminer'), -('WB', 'W', 'Weißer Burgunder', 'Weißburgunder, Pinot Blanc, Klevner'), -('WR', 'W', 'Welschriesling', NULL), -('ZF', 'W', 'Zierfandler', 'Spätrot'), -('ZW', 'R', 'Zweigelt', 'Blauer Zweigelt, Rotburger'); +('BN', 'W', 'RSW', 'Bronner', NULL), +('CB', 'W', 'RSW', 'Cabernet Blanc', NULL), +('CJ', 'R', 'RSW', 'Cabernet Jura', NULL), +('JO', 'W', 'RSW', 'Johanniter', NULL), +('OR', 'W', 'RSW', 'Orangetraube', NULL), +('PI', 'R', 'RSW', 'Pinot Nova', NULL), +('RE', 'R', 'RSW', 'Regent', NULL), +('SI', 'W', 'RSW', 'Solaris', NULL), +('BL', 'R', 'QUW', 'Blauburger', NULL), +('BB', 'R', 'QUW', 'Blauer Burgunder', 'Blauer Spätburgunder, Blauburgunder, Pinot Noir'), +('BP', 'R', 'QUW', 'Blauer Portugieser', NULL), +('BW', 'R', 'QUW', 'Blauer Wildbacher', NULL), +('BF', 'R', 'QUW', 'Blaufränkisch', 'Frankovka'), +('BM', 'W', 'QUW', 'Blütenmuskateller', NULL), +('BO', 'W', 'QUW', 'Bouvier', NULL), +('CF', 'R', 'QUW', 'Cabernet Franc', NULL), +('CS', 'R', 'QUW', 'Cabernet Sauvignon', NULL), +('CH', 'W', 'QUW', 'Chardonnay', 'Morillon'), +('DR', 'W', 'QUW', 'Donauriesling', NULL), +('DV', 'W', 'QUW', 'Donauveltliner', NULL), +('FV', 'W', 'QUW', 'Frühroter Veltliner', 'Malvasier'), +('FU', 'W', 'QUW', 'Furmint', NULL), +('GW', 'W', 'QUW', 'Gemischter Satz weiß', NULL), +('GB', 'W', 'QUW', 'Goldburger', NULL), +('GL', 'W', 'QUW', 'Goldmuskateller', NULL), +('GR', 'W', 'QUW', 'Grauer Burgunder', 'Grauburgunder, Pinot Gris, Ruländer'), +('GV', 'W', 'QUW', 'Grüner Veltliner', 'Weißgipfler'), +('JU', 'W', 'QUW', 'Jubiläumsrebe', NULL), +('ME', 'R', 'QUW', 'Merlot', NULL), +('MT', 'W', 'QUW', 'Müller Thurgau', 'Rivaner'), +('MC', 'W', 'QUW', 'Muscaris', NULL), +('MO', 'W', 'QUW', 'Muskat Ottonel', 'Muscato'), +('MU', 'W', 'QUW', 'Muskateller', 'Gelber Muskateller, Roter Muskateller'), +('NB', 'W', 'QUW', 'Neuburger', NULL), +('RH', 'R', 'QUW', 'Rathay', NULL), +('RR', 'W', 'QUW', 'Riesling', 'Weißer Riesling, Rheinriesling, Roter Riesling'), +('RL', 'R', 'QUW', 'Roesler', NULL), +('RM', 'R', 'QUW', 'Rosenmuskateller', NULL), +('RV', 'W', 'QUW', 'Roter Veltliner', NULL), +('RG', 'W', 'QUW', 'Rotgipfler', NULL), +('SB', 'W', 'QUW', 'Sauvignon Blanc', NULL), +('SA', 'W', 'QUW', 'Scheurebe', 'Sämling 88'), +-- ('SP', '', 'QUW', 'Sortenverschnitt gleichgepresst', NULL), +('SR', 'R', 'QUW', 'Sortenverschnitt Rosé', NULL), +('SO', 'R', 'QUW', 'Sortenverschnitt rot', NULL), +('SW', 'W', 'QUW', 'Sortenverschnitt weiß', NULL), +('SG', 'W', 'QUW', 'Souvignier Gris', NULL), +('SL', 'R', 'QUW', 'St. Laurent', NULL), +('SY', 'W', 'QUW', 'Sylvaner', 'Grüner Sylvaner'), +('SH', 'R', 'QUW', 'Syrah', 'Shiraz'), +('TR', 'W', 'QUW', 'Traminer', 'Gewürztraminer, Roter Traminer, Gelber Traminer'), +('WB', 'W', 'QUW', 'Weißer Burgunder', 'Weißburgunder, Pinot Blanc, Klevner'), +('WR', 'W', 'QUW', 'Welschriesling', NULL), +('ZF', 'W', 'QUW', 'Zierfandler', 'Spätrot'), +('ZW', 'R', 'QUW', 'Zweigelt', 'Blauer Zweigelt, Rotburger'); diff --git a/sql/v01/99.schema_version.sql b/sql/v01/99.schema_version.sql index b11c970..0f96939 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 = 3200; +PRAGMA schema_version = 3300;