X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=sql%2Fccbs.sql;h=2b1a68605721d7ce334075fbb4873eff8a83221d;hb=82082b6fb99b84f82a54458c523094f3437be192;hp=44dcdf98a6617e01ac5f35a284fce98e218a765b;hpb=8bf395371926b3686c6ba3f1dd549c7ce9a7c2fb;p=ccbs

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index 44dcdf9..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,7 +35,20 @@ CREATE TABLE songs (
 	UNIQUE ( title )
 );
 
--- CREATE TABLE machinesongs etc.
+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,
+
+	PRIMARY KEY ( song, machine )
+);
 
 CREATE TABLE scoringsystems (
 	scoringsystem SERIAL PRIMARY KEY,
@@ -34,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 )
 );
@@ -69,11 +97,19 @@ CREATE TABLE tournaments (
 	UNIQUE ( season, tournamentname )
 );
 
+CREATE TABLE tournamentparticipation (
+	tournament INTEGER NOT NULL REFERENCES tournaments,
+	player INTEGER NOT NULL REFERENCES players,
+	paid BOOLEAN NOT NULL,
+
+	PRIMARY KEY ( tournament, player )
+);
+
 CREATE TABLE tournamentrankings (
 	tournament INTEGER NOT NULL REFERENCES tournaments,
 	ranking INTEGER NOT NULL,
 	player INTEGER NOT NULL REFERENCES players,
-	points INTEGER
+	points INTEGER,
 
 	UNIQUE (tournament, player),
 	PRIMARY KEY (tournament, ranking)
@@ -84,6 +120,7 @@ CREATE TABLE rounds (
 	round INTEGER NOT NULL,
 	randomsongs INTEGER NOT NULL,
 	chosensongs INTEGER NOT NULL,
+	numqualifying INTEGER,
 
 	PRIMARY KEY (tournament, round)
 );
@@ -127,16 +164,38 @@ CREATE TABLE scores (
 	player INTEGER NOT NULL REFERENCES players,
 	songnumber INTEGER NOT NULL,
 	
-	song INTEGER NOT NULL REFERENCES songs,
+	song INTEGER REFERENCES songs,
 	playmode VARCHAR CHECK (playmode IS NULL OR playmode IN ('single','double')),
 	difficulty VARCHAR CHECK (difficulty IS NULL OR difficulty IN ('beginner','standard','difficult','expert','challenge')),
 	
-	chosen BOOLEAN NOT NULL,
-	score INTEGER NOT NULL CHECK (score >= 0 AND score <= 10000),
+	chosen BOOLEAN,
+	score INTEGER CHECK (score IS NULL OR (score >= 0 AND score <= 10000)),
 	
-	FOREIGN KEY (song) REFERENCES songs (song),
-	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),
-	UNIQUE (tournament, round, parallel, player, songnumber),
-	PRIMARY KEY (tournament, round, parallel, player, song)
+	PRIMARY KEY (tournament, round, parallel, player, songnumber)
+);
+
+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
 );