X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=sql%2Fccbs.sql;h=44dcdf98a6617e01ac5f35a284fce98e218a765b;hp=0bbc0097b8f0212b58017c3bfd6adf42a7e4fdd4;hb=8bf395371926b3686c6ba3f1dd549c7ce9a7c2fb;hpb=a0c29dc24500059c580f6ec2647e8a2d2385ea77

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index 0bbc009..44dcdf9 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 (
@@ -28,9 +28,9 @@ CREATE TABLE songs (
 
 CREATE TABLE scoringsystems (
 	scoringsystem SERIAL PRIMARY KEY,
-	name VARCHAR NOT NULL,
+	scoringsystemname VARCHAR NOT NULL,
 	
-	UNIQUE ( name )
+	UNIQUE ( scoringsystemname )
 );
 
 CREATE TABLE songratings (
@@ -51,20 +51,32 @@ 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
+	scoringsystem INTEGER NOT NULL REFERENCES scoringsystems,
+
+	UNIQUE ( season, tournamentname )
+);
+
+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 (
@@ -100,8 +112,10 @@ CREATE TABLE roundparticipation (
 	round INTEGER NOT NULL,
 	parallel INTEGER NOT NULL,
 	player INTEGER NOT NULL REFERENCES players,
+	position INTEGER NOT NULL,
 
 	UNIQUE (tournament, round, player),
+	UNIQUE (tournament, round, parallel, position),
 	FOREIGN KEY (tournament, round, parallel) REFERENCES groups (tournament, round, parallel),
 	PRIMARY KEY (tournament, round, parallel, player)
 );
@@ -111,6 +125,7 @@ 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,
 	playmode VARCHAR CHECK (playmode IS NULL OR playmode IN ('single','double')),
@@ -122,5 +137,6 @@ CREATE TABLE scores (
 	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),
+	UNIQUE (tournament, round, parallel, player, songnumber),
 	PRIMARY KEY (tournament, round, parallel, player, song)
 );