Show the real score instead of 1234.

[ccbs] / sql / ccbs.sql

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index c13c666774d872d199351fe59b01ba43fa468f3d..c3005d142eaa5261b2175a9efee8661370caf81c 100644 (file)
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -24,7 +24,12 @@ CREATE TABLE songs (
        UNIQUE ( title )
 );
 
--- CREATE TABLE machinesongs etc.
+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,12 +39,13 @@ 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 TABLE players (
@@ -136,16 +142,33 @@ 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,
+
+       PRIMARY KEY ( tournament, round, parallel ),
+       FOREIGN KEY ( tournament, round, parallel ) REFERENCES groups
+);
 );