From 5e14d933560f829cade44b66a7f835acdf10cc8e Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Wed, 24 May 2023 14:46:50 +0200
Subject: [PATCH] Update country table pk

---
 sql/v01/10.create.sql |  8 ++++----
 sql/v01/50.base.sql   | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sql/v01/10.create.sql b/sql/v01/10.create.sql
index f12f8ca..9523fd6 100644
--- a/sql/v01/10.create.sql
+++ b/sql/v01/10.create.sql
@@ -19,16 +19,16 @@ CREATE TABLE client_parameter (
 ) STRICT;
 
 CREATE TABLE country (
+    num    INTEGER NOT NULL CHECK (num >= 0),
     alpha2 TEXT    NOT NULL CHECK (alpha2 REGEXP '^[A-Z]{2}$'),
     alpha3 TEXT    NOT NULL CHECK (alpha3 REGEXP '^[A-Z]{3}$'),
-    num    INTEGER NOT NULL CHECK (num >= 0),
     name   TEXT    NOT NULL,
 
-    is_visible INTEGER NOT NULL CHECK (is_visible = TRUE OR is_visible = FALSE) DEFAULT TRUE,
+    is_visible INTEGER NOT NULL CHECK (is_visible IN (TRUE, FALSE)) DEFAULT TRUE,
 
-    CONSTRAINT pk_country PRIMARY KEY (alpha2),
+    CONSTRAINT pk_country PRIMARY KEY (num),
+    CONSTRAINT sk_country_alpha2 UNIQUE (alpha2),
     CONSTRAINT sk_country_alpha3 UNIQUE (alpha3),
-    CONSTRAINT sk_country_numeric UNIQUE (num),
     CONSTRAINT sk_country_name UNIQUE (name)
 ) STRICT;
 
diff --git a/sql/v01/50.base.sql b/sql/v01/50.base.sql
index f3b13de..2eadae0 100644
--- a/sql/v01/50.base.sql
+++ b/sql/v01/50.base.sql
@@ -1,17 +1,17 @@
 
 INSERT INTO country VALUES
-('AT', 'AUT',  40, 'Österreich',  TRUE),
-('DE', 'DEU', 276, 'Deutschland', FALSE),
-('CZ', 'CZE', 203, 'Tschechien',  FALSE),
-('HU', 'HUN', 348, 'Ungarn',      FALSE),
-('SK', 'SVK', 703, 'Slowakei',    FALSE),
-('IT', 'ITA', 380, 'Italien',     FALSE),
-('NL', 'NLD', 528, 'Niederlande', FALSE),
-('LU', 'LUX', 442, 'Luxemburg',   FALSE),
-('BE', 'BEL',  56, 'Belgien',     FALSE),
-('FR', 'FRA', 250, 'France',      FALSE),
-('ES', 'ESP', 724, 'Spanien',     FALSE),
-('PT', 'PRT', 620, 'Portugal',    FALSE);
+( 40, 'AT', 'AUT', 'Österreich',  TRUE),
+(276, 'DE', 'DEU', 'Deutschland', FALSE),
+(203, 'CZ', 'CZE', 'Tschechien',  FALSE),
+(348, 'HU', 'HUN', 'Ungarn',      FALSE),
+(703, 'SK', 'SVK', 'Slowakei',    FALSE),
+(380, 'IT', 'ITA', 'Italien',     FALSE),
+(528, 'NL', 'NLD', 'Niederlande', FALSE),
+(442, 'LU', 'LUX', 'Luxemburg',   FALSE),
+( 56, 'BE', 'BEL', 'Belgien',     FALSE),
+(250, 'FR', 'FRA', 'France',      FALSE),
+(724, 'ES', 'ESP', 'Spanien',     FALSE),
+(620, 'PT', 'PRT', 'Portugal',    FALSE);
 
 INSERT INTO currency VALUES
 ('EUR', 'Euro',      '€',     1000000),