Pull in changes from --baby.

[ccbs] / sql / ccbs.sql

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index e73464c8de07f5817d08bb392f08abaca1d0148c..756f54c4e5c35f09eb092e7b29ee7908a396e303 100644 (file)
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -10,8 +10,19 @@ CREATE TABLE machines (
 CREATE TABLE countries (
        country SERIAL PRIMARY KEY,
        countryname VARCHAR NOT NULL,
+       countrycode CHAR(3) NOT NULL,   -- IOC country code
 
-       UNIQUE ( countryname )
+       UNIQUE ( countryname ),
+       UNIQUE ( countrycode )
+);
+
+CREATE TABLE clubs (
+       club SERIAL PRIMARY KEY,
+       clubname VARCHAR NOT NULL,
+       clubcode CHAR(3) NOT NULL,
+
+       UNIQUE ( clubname ),
+       UNIQUE ( clubcode )
 );
 
 CREATE TABLE songs (
@@ -24,6 +35,14 @@ CREATE TABLE songs (
        UNIQUE ( title )
 );
 
+CREATE TABLE songshorttitles (
+       song INTEGER NOT NULL REFERENCES songs,
+       shorttitle VARCHAR NOT NULL,
+
+       PRIMARY KEY ( song, shorttitle ),
+       UNIQUE ( shorttitle )
+);
+
 CREATE TABLE machinesongs (
        song INTEGER NOT NULL REFERENCES songs,
        machine INTEGER NOT NULL REFERENCES machines,
@@ -47,10 +66,15 @@ CREATE TABLE songratings (
 
        PRIMARY KEY (song, machine, playmode, difficulty)
 );
+CREATE INDEX songratings_feetrating ON songratings ( feetrating );
+
+CREATE VIEW max_single_feetrating AS SELECT machine,song,MAX(feetrating) AS feetrating FROM songratings WHERE playmode='single' GROUP BY machine,song;
 
 CREATE TABLE players (
        player SERIAL PRIMARY KEY,
        nick VARCHAR NOT NULL,
+       country INTEGER NOT NULL REFERENCES countries,
+       club INTEGER REFERENCES clubs,
 
        UNIQUE ( nick )
 );
@@ -89,8 +113,7 @@ CREATE TABLE tournamentrankings (
        player INTEGER NOT NULL REFERENCES players,
        points INTEGER,
 
-       UNIQUE (tournament, player),
-       PRIMARY KEY (tournament, ranking)
+       PRIMARY KEY (tournament, player)
 );
 
 CREATE TABLE rounds (
@@ -161,21 +184,19 @@ CREATE TABLE randomsongsused (
 CREATE SCHEMA bigscreen;
 
 CREATE TABLE bigscreen.active_tournament (
-       tournament INTEGER NOT NULL REFERENCES tournaments
+       tournament INTEGER NOT NULL PRIMARY KEY REFERENCES tournaments
 );
+CREATE TABLE bigscreen.active_groups (
+       tournament INTEGER NOT NULL REFERENCES bigscreen.active_tournament,
+       round INTEGER NOT NULL,
+       parallel INTEGER NOT NULL,
+       num_machines INTEGER NOT NULL,
+       players_per_machine INTEGER NOT NULL CHECK ( players_per_machine IN (1, 2) ),
+       last_updated TIMESTAMP NOT NULL,
 
--- install PL/PgSQL
-CREATE FUNCTION plpgsql_call_handler() RETURNS opaque
-    AS '/usr/lib/postgresql/lib/plpgsql.so', 'plpgsql_call_handler'
-    LANGUAGE "C";
-CREATE TRUSTED PROCEDURAL LANGUAGE plpgsql HANDLER plpgsql_call_handler;
-
--- NOTIFY active_tournament when anything has changed
-CREATE FUNCTION notify_active_tournament() RETURNS trigger
-AS '
-    DECLARE
-    BEGIN
-        NOTIFY bigscreen.active_tournament;
-    END;'
-LANGUAGE plpgsql;
-
+       PRIMARY KEY ( tournament, round, parallel ),
+       FOREIGN KEY ( tournament, round, parallel ) REFERENCES groups
+);
+CREATE TABLE bigscreen.active_screens (
+       id VARCHAR NOT NULL PRIMARY KEY
+);