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

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index d7d461fa205aa7eb8a54e97f5b9c912721132932..bc4b0e45287b35cf3af4a1a11dd6e503898d29ae 100644 (file)
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -39,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 (
@@ -148,7 +149,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)
 );