Change all instances of "name" to something more sane, to get easy natural joins.

[ccbs] / sql / ccbs.sql

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index e8045a0046ee21b8f52219c73f2bac3f061c8898..e0b62840e2a78a63994a78038fc91d0b9aec9812 100644 (file)
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -2,16 +2,16 @@
 
 CREATE TABLE machines (
        machine SERIAL PRIMARY KEY,
 
 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,
 );
 
 CREATE TABLE countries (
        country SERIAL PRIMARY KEY,

-       name VARCHAR NOT NULL,
+       countryname VARCHAR NOT NULL,

 
 

-       UNIQUE ( name )
+       UNIQUE ( countryname )

 );
 
 CREATE TABLE songs (
 );
 
 CREATE TABLE songs (


@@ -28,9 +28,9 @@ CREATE TABLE songs (
 
 CREATE TABLE scoringsystems (
        scoringsystem SERIAL PRIMARY KEY,
 
 CREATE TABLE scoringsystems (
        scoringsystem SERIAL PRIMARY KEY,

-       name VARCHAR NOT NULL,
+       scoringsystemname VARCHAR NOT NULL,

        
        

-       UNIQUE ( name )
+       UNIQUE ( scoringsystemname )

 );
 
 CREATE TABLE songratings (
 );
 
 CREATE TABLE songratings (


@@ -51,22 +51,22 @@ CREATE TABLE players (
 
 CREATE TABLE seasons (
        season SERIAL PRIMARY KEY,
 
 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,
 );
 
 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,
 
        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 (
 );
 
 CREATE TABLE rounds (