X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=sql%2Fccbs.sql;h=3697f6e2544919bf1b0ad8b3af5b95b07b555787;hp=c13c666774d872d199351fe59b01ba43fa468f3d;hb=90657a2c45fa1043b7c30b95f21b0ee7426bf73a;hpb=c73f95e10416d77bea35c2e409f3d6cd4b81143a

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index c13c666..3697f6e 100644
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -24,7 +24,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,13 +47,15 @@ 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,
@@ -136,16 +151,37 @@ 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,
+	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
 );