X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=sql%2Fccbs.sql;h=e0b62840e2a78a63994a78038fc91d0b9aec9812;hp=e8045a0046ee21b8f52219c73f2bac3f061c8898;hb=aee1f77ca1957086ed876b49e1b5e4f744eef2f2;hpb=57f7b1dfc6159ed0adc3d4ce0bcf47ecf09f35af

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index e8045a0..e0b6284 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,22 +51,22 @@ CREATE TABLE players (
 
 CREATE TABLE seasons (
 	season SERIAL PRIMARY KEY,
-	name VARCHAR NOT NULL,
+	seasonname VARCHAR NOT NULL,
 
-	UNIQUE ( name )
+	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 rounds (