Different songs can have different ratings on different machines, so change the SQL...

[ccbs] / sql / ccbs.sql

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index 45897b336befe8d0435c231854eeb47b00475d9d..bc4b0e45287b35cf3af4a1a11dd6e503898d29ae 100644 (file)
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -24,7 +24,12 @@ CREATE TABLE songs (
        UNIQUE ( title )
 );
 
        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,
 
 CREATE TABLE scoringsystems (
        scoringsystem SERIAL PRIMARY KEY,


@@ -34,12 +39,13 @@ CREATE TABLE scoringsystems (
 );
 
 CREATE TABLE songratings (
 );
 
 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),
 
        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 (
 );
 
 CREATE TABLE players (


@@ -143,7 +149,11 @@ CREATE TABLE scores (
        chosen BOOLEAN,
        score INTEGER CHECK (score IS NULL OR (score >= 0 AND score <= 10000)),
        
        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)
 );
        FOREIGN KEY (tournament, round, parallel, player) REFERENCES roundparticipation (tournament, round, parallel, player),
        PRIMARY KEY (tournament, round, parallel, player, songnumber)
 );

+
+CREATE TABLE randomsongsused (
+       song INTEGER NOT NULL PRIMARY KEY REFERENCES songs
+);