X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=sql%2Fccbs.sql;h=2b1a68605721d7ce334075fbb4873eff8a83221d;hb=629352f0146f1e096bfe61cb604bbf848145f844;hp=d7d461fa205aa7eb8a54e97f5b9c912721132932;hpb=ea702e677702b5cbb22f819d8f0731715e887d03;p=ccbs

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index d7d461f..2b1a686 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 (
@@ -24,6 +35,14 @@ CREATE TABLE songs (
 	UNIQUE ( title )
 );
 
+CREATE TABLE songshorttitles (
+	song INTEGER NOT NULL REFERENCES songs,
+	shorttitle VARCHAR NOT NULL,
+
+	PRIMARY KEY ( song, shorttitle ),
+	UNIQUE ( shorttitle )
+);
+
 CREATE TABLE machinesongs (
 	song INTEGER NOT NULL REFERENCES songs,
 	machine INTEGER NOT NULL REFERENCES machines,
@@ -39,17 +58,21 @@ CREATE TABLE scoringsystems (
 );
 
 CREATE TABLE songratings (
-	song INTEGER NOT NULL REFERENCES songs,   -- strictly song+machine
+	song INTEGER NOT NULL REFERENCES songs,
+	machine INTEGER NOT NULL REFERENCES machines,
 	playmode VARCHAR NOT NULL CHECK (playmode IN ('single','double')),
 	difficulty VARCHAR NOT NULL CHECK (difficulty IN ('beginner','standard','difficult','expert','challenge')),
 	feetrating INTEGER NOT NULL CHECK (feetrating >= 0 AND feetrating <= 10),
 
-	PRIMARY KEY (song, playmode, difficulty)
+	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 )
 );
@@ -148,7 +171,7 @@ CREATE TABLE scores (
 	chosen BOOLEAN,
 	score INTEGER CHECK (score IS NULL OR (score >= 0 AND score <= 10000)),
 	
-	FOREIGN KEY (song, playmode, difficulty) REFERENCES songratings (song, playmode, difficulty),
+	-- FOREIGN KEY (song, playmode, difficulty) REFERENCES songratings (song, playmode, difficulty),
 	FOREIGN KEY (tournament, round, parallel, player) REFERENCES roundparticipation (tournament, round, parallel, player),
 	PRIMARY KEY (tournament, round, parallel, player, songnumber)
 );
@@ -156,3 +179,23 @@ CREATE TABLE scores (
 CREATE TABLE randomsongsused (
 	song INTEGER NOT NULL PRIMARY KEY REFERENCES songs
 );
+
+CREATE SCHEMA bigscreen;
+
+CREATE TABLE bigscreen.active_tournament (
+	tournament INTEGER NOT NULL PRIMARY KEY REFERENCES tournaments
+);
+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
+);