X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=ccbs.sql;h=b52bfbf98afed88742ce06107d17d4d919c21ee2;hp=3b3c4e73e1c3360a85fe1690761bc2c50422e27c;hb=f3e82673a0f908bb3047aa60f04e95180083dd89;hpb=974ede0dbdba3bfc93204798ef2a6641a46b8a88

diff --git a/ccbs.sql b/ccbs.sql
index 3b3c4e7..b52bfbf 100644
--- a/ccbs.sql
+++ b/ccbs.sql
@@ -1,15 +1,35 @@
+-- vim:set tw=0:
+
+CREATE TABLE machines (
+	machine SERIAL PRIMARY KEY,
+	name VARCHAR NOT NULL
+);
+
+CREATE TABLE countries (
+	country SERIAL PRIMARY KEY,
+	name VARCHAR NOT NULL
+);
 
 CREATE TABLE songs (
 	song SERIAL PRIMARY KEY,
 	title VARCHAR NOT NULL,
 	artist VARCHAR NOT NULL
+	minbpm INTEGER NOT NULL,
+	maxbpm INTEGER NOT NULL
+);
+
+-- CREATE TABLE machinesongs etc.
+
+CREATE TABLE scoringsystems (
+	scoringsystem SERIAL PRIMARY KEY,
+	name VARCHAR NOT NULL
 );
 
 CREATE TABLE songratings (
-	song INTEGER NOT NULL REFERENCES songs,
-	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)
+	song INTEGER NOT NULL REFERENCES songs,   -- strictly song+machine
+	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)
 );
@@ -24,10 +44,15 @@ CREATE TABLE seasons (
 	name VARCHAR NOT NULL
 );
 
-CREATE TABLE tournament (
+CREATE TABLE tournaments (
 	tournament SERIAL PRIMARY KEY,
 	season INTEGER NOT NULL REFERENCES seasons,
-	name VARCHAR NOT NULL
+	name VARCHAR NOT NULL,
+	country INTEGER NOT NULL REFERENCES countries,
+	location VARCHAR NOT NULL,
+	"date" DATE NOT NULL,
+	machine INTEGER NOT NULL REFERENCES machines,
+	scoringsystem INTEGER NOT NULL REFERENCES scoringsystems
 );
 
 CREATE TABLE rounds (
@@ -76,12 +101,14 @@ CREATE TABLE scores (
 	player INTEGER NOT NULL REFERENCES players,
 	
 	song INTEGER NOT NULL REFERENCES songs,
-	playmode VARCHAR NOT NULL CHECK playmode IN ('single','double'),
-	difficulty VARCHAR NOT NULL CHECK difficulty IN ('beginner','standard','difficult','expert','challenge'),
+	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),
 	
-	FOREIGN KEY (song, playmode, difficulty) REFERENCES songs (song, playmode, difficulty),
-	FOREIGN KEY (tournament, round, parallel) REFERENCES groups (tournament, round, parallel),
-	PRIMARY KEY (tournament, round, parallel, player, songs)
-);	
+	FOREIGN KEY (song) REFERENCES songs (song),
+	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, song)
+);