X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=sql%2Fccbs.sql;h=22c99bc55b8994de07692621f33f23fcbcccbe52;hb=7b746dbde2f6ca885b27056df96cd028b805bb1c;hp=6cd515465607f02f5f6f6f032379ba7041aa622f;hpb=914b810749b54bb07e1944e558015d6c8f615528;p=ccbs

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index 6cd5154..22c99bc 100644
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -10,8 +10,19 @@ CREATE TABLE machines (
 CREATE TABLE countries (
 	country SERIAL PRIMARY KEY,
 	countryname VARCHAR NOT NULL,
+	countrycode CHAR(3) NOT NULL,   -- IOC country code
 
-	UNIQUE ( countryname )
+	UNIQUE ( countryname ),
+	UNIQUE ( countrycode )
+);
+
+CREATE TABLE clubs (
+	club SERIAL PRIMARY KEY,
+	clubname VARCHAR NOT NULL,
+	clubcode CHAR(3) NOT NULL,
+
+	UNIQUE ( clubname ),
+	UNIQUE ( clubcode )
 );
 
 CREATE TABLE songs (
@@ -60,6 +71,8 @@ CREATE INDEX songratings_feetrating ON songratings ( feetrating );
 CREATE TABLE players (
 	player SERIAL PRIMARY KEY,
 	nick VARCHAR NOT NULL,
+	country INTEGER NOT NULL REFERENCES countries,
+	club INTEGER REFERENCES clubs,
 
 	UNIQUE ( nick )
 );
@@ -98,8 +111,7 @@ CREATE TABLE tournamentrankings (
 	player INTEGER NOT NULL REFERENCES players,
 	points INTEGER,
 
-	UNIQUE (tournament, player),
-	PRIMARY KEY (tournament, ranking)
+	PRIMARY KEY (tournament, player)
 );
 
 CREATE TABLE rounds (
@@ -177,8 +189,12 @@ CREATE TABLE bigscreen.active_groups (
 	round INTEGER NOT NULL,
 	parallel INTEGER NOT NULL,
 	num_machines INTEGER NOT NULL,
+	players_per_machine INTEGER NOT NULL CHECK ( players_per_machine IN (1, 2) ),
 	last_updated TIMESTAMP NOT NULL,
 
 	PRIMARY KEY ( tournament, round, parallel ),
 	FOREIGN KEY ( tournament, round, parallel ) REFERENCES groups
 );
+CREATE TABLE bigscreen.active_screens (
+	id VARCHAR NOT NULL PRIMARY KEY
+);