X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=sql%2Fccbs.sql;h=bc4b0e45287b35cf3af4a1a11dd6e503898d29ae;hp=11901b4e201e056b338588645b0d746d9b59451b;hb=08596cd49fe5137da3e1a1a72b68a1311f85ff2d;hpb=13d692e9ecbf67e361d7512ab79ff38238e6f19a

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index 11901b4..bc4b0e4 100644
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -2,16 +2,16 @@
 
 CREATE TABLE machines (
 	machine SERIAL PRIMARY KEY,
-	name VARCHAR NOT NULL,
+	machinename VARCHAR NOT NULL,
 
-	UNIQUE ( name )
+	UNIQUE ( machinename )
 );
 
 CREATE TABLE countries (
 	country SERIAL PRIMARY KEY,
-	name VARCHAR NOT NULL,
+	countryname VARCHAR NOT NULL,
 
-	UNIQUE ( name )
+	UNIQUE ( countryname )
 );
 
 CREATE TABLE songs (
@@ -24,22 +24,28 @@ 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,
-	name VARCHAR NOT NULL,
+	scoringsystemname VARCHAR NOT NULL,
 	
-	UNIQUE ( name )
+	UNIQUE ( scoringsystemname )
 );
 
 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 (
@@ -51,22 +57,40 @@ CREATE TABLE players (
 
 CREATE TABLE seasons (
 	season SERIAL PRIMARY KEY,
-	name VARCHAR NOT NULL,
+	seasonname VARCHAR NOT NULL,
 
-	UNIQUE ( season )
+	UNIQUE ( seasonname )
 );
 
 CREATE TABLE tournaments (
 	tournament SERIAL PRIMARY KEY,
 	season INTEGER NOT NULL REFERENCES seasons,
-	name VARCHAR NOT NULL,
+	tournamentname 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,
 
-	UNIQUE ( season, name )
+	UNIQUE ( season, tournamentname )
+);
+
+CREATE TABLE tournamentparticipation (
+	tournament INTEGER NOT NULL REFERENCES tournaments,
+	player INTEGER NOT NULL REFERENCES players,
+	paid BOOLEAN NOT NULL,
+
+	PRIMARY KEY ( tournament, player )
+);
+
+CREATE TABLE tournamentrankings (
+	tournament INTEGER NOT NULL REFERENCES tournaments,
+	ranking INTEGER NOT NULL,
+	player INTEGER NOT NULL REFERENCES players,
+	points INTEGER,
+
+	UNIQUE (tournament, player),
+	PRIMARY KEY (tournament, ranking)
 );
 
 CREATE TABLE rounds (
@@ -74,6 +98,7 @@ CREATE TABLE rounds (
 	round INTEGER NOT NULL,
 	randomsongs INTEGER NOT NULL,
 	chosensongs INTEGER NOT NULL,
+	numqualifying INTEGER,
 
 	PRIMARY KEY (tournament, round)
 );
@@ -105,7 +130,7 @@ CREATE TABLE roundparticipation (
 	position INTEGER NOT NULL,
 
 	UNIQUE (tournament, round, player),
-	UNIQUE (tournament, round, parallel, position)
+	UNIQUE (tournament, round, parallel, position),
 	FOREIGN KEY (tournament, round, parallel) REFERENCES groups (tournament, round, parallel),
 	PRIMARY KEY (tournament, round, parallel, player)
 );
@@ -115,16 +140,20 @@ CREATE TABLE scores (
 	round INTEGER NOT NULL,
 	parallel INTEGER NOT NULL,
 	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),
-	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
 );