X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=sql%2Fccbs.sql;h=22c99bc55b8994de07692621f33f23fcbcccbe52;hp=e9b3d321e91a682f6f15907f7ee54046c91dcd99;hb=df9a219dc572f63e39ff432e052883c4052ff448;hpb=398357c297e5732f6ee2fcc1d4d73574e127f5af

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index e9b3d32..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 (
@@ -25,7 +36,7 @@ CREATE TABLE songs (
 );
 
 CREATE TABLE songshorttitles (
-	song INTEGER NOT NULL REFERENCES song,
+	song INTEGER NOT NULL REFERENCES songs,
 	shorttitle VARCHAR NOT NULL,
 
 	PRIMARY KEY ( song, shorttitle ),
@@ -55,10 +66,13 @@ CREATE TABLE songratings (
 
 	PRIMARY KEY (song, machine, playmode, difficulty)
 );
+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 )
 );
@@ -97,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 (
@@ -175,8 +188,13 @@ CREATE TABLE bigscreen.active_groups (
 	tournament INTEGER NOT NULL REFERENCES bigscreen.active_tournament,
 	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
 );