X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=sql%2Fcc04%2Fcc1-04.sql;h=ddb4b5fd85fc62159a099fda1d904cfc976e9dea;hp=5a1d89ebe17c87750b91368d68c6ee7cb90f6119;hb=58cde1344f8427cdcd4612bda0aadd4b4f3ec32d;hpb=1f60fb5390460b3db78b28cadc8790cce5da267c

diff --git a/sql/cc04/cc1-04.sql b/sql/cc04/cc1-04.sql
index 5a1d89e..ddb4b5f 100644
--- a/sql/cc04/cc1-04.sql
+++ b/sql/cc04/cc1-04.sql
@@ -1,47 +1,250 @@
 begin;
 INSERT INTO tournaments 
-  (season, name, country, location, "date", machine, scoringsystem) VALUES (
-    (SELECT season FROM seasons WHERE name='Challenge Cup 2004'),
+  (season, tournamentname, country, location, "date", machine, scoringsystem) VALUES (
+    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004'),
     'Challenge Cup 1 - 2004',
-    (SELECT country FROM countries WHERE name='Norway'),
+    (SELECT country FROM countries WHERE countryname='Norway'),
     'Oslo Bowling',
     '2004-03-07',
-    (SELECT machine FROM machines WHERE name='Dancing Stage EuroMix 2'),
-    (SELECT scoringsystem FROM scoringsystems WHERE name='10K Machine score')
+    (SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),
+    (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='10K Machine score')
 );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   1,
+   (SELECT player FROM players WHERE nick='Snute'),
+   100);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   2,
+   (SELECT player FROM players WHERE nick='DufF'),
+   90);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   3,
+   (SELECT player FROM players WHERE nick='OJK'),
+   81);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   4,
+   (SELECT player FROM players WHERE nick='Oliyzia'),
+   73);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   5,
+   (SELECT player FROM players WHERE nick='Tom'),
+   66);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   6,
+   (SELECT player FROM players WHERE nick='Snofox'),
+   60);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   7,
+   (SELECT player FROM players WHERE nick='RiChY'),
+   0);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   8,
+   (SELECT player FROM players WHERE nick='Haggar'),
+   0);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   9,
+   (SELECT player FROM players WHERE nick='Mulefisk'),
+   48);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   10,
+   (SELECT player FROM players WHERE nick='Daniil'),
+   46);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   11,
+   (SELECT player FROM players WHERE nick='T|na'),
+   0);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   12,
+   (SELECT player FROM players WHERE nick='Stream'),
+   44);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Purity' AS nick WHERE 'Purity' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   13,
+   (SELECT player FROM players WHERE nick='Purity'),
+   43);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Spinnvill' AS nick WHERE 'Spinnvill' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   14,
+   (SELECT player FROM players WHERE nick='Spinnvill'),
+   42);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jallaman' AS nick WHERE 'Jallaman' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   15,
+   (SELECT player FROM players WHERE nick='Jallaman'),
+   41);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   16,
+   (SELECT player FROM players WHERE nick='Smiph'),
+   40);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Electus' AS nick WHERE 'Electus' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   17,
+   (SELECT player FROM players WHERE nick='Electus'),
+   39);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick WHERE 'Havok' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   18,
+   (SELECT player FROM players WHERE nick='Havok'),
+   38);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dexter' AS nick WHERE 'Dexter' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   19,
+   (SELECT player FROM players WHERE nick='Dexter'),
+   37);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   20,
+   (SELECT player FROM players WHERE nick='Draconia'),
+   36);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Advena' AS nick WHERE 'Advena' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   21,
+   (SELECT player FROM players WHERE nick='Advena'),
+   35);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Slusk' AS nick WHERE 'Slusk' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   22,
+   (SELECT player FROM players WHERE nick='Slusk'),
+   34);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Telc' AS nick WHERE 'Telc' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   23,
+   (SELECT player FROM players WHERE nick='Telc'),
+   33);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Matsi' AS nick WHERE 'Matsi' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   24,
+   (SELECT player FROM players WHERE nick='Matsi'),
+   32);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   25,
+   (SELECT player FROM players WHERE nick='Olemann'),
+   0);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   26,
+   (SELECT player FROM players WHERE nick='Duckling'),
+   0);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   27,
+   (SELECT player FROM players WHERE nick='Ylini'),
+   0);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Golddragon' AS nick WHERE 'Golddragon' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   28,
+   (SELECT player FROM players WHERE nick='Golddragon'),
+   28);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'tombot' AS nick WHERE 'tombot' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   29,
+   (SELECT player FROM players WHERE nick='tombot'),
+   27);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'x3mnrj' AS nick WHERE 'x3mnrj' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   30,
+   (SELECT player FROM players WHERE nick='x3mnrj'),
+   26);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tha Dragon' AS nick WHERE 'Tha Dragon' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   31,
+   (SELECT player FROM players WHERE nick='Tha Dragon'),
+   25);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Octu' AS nick WHERE 'Octu' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   32,
+   (SELECT player FROM players WHERE nick='Octu'),
+   24);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ink' AS nick WHERE 'Ink' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   33,
+   (SELECT player FROM players WHERE nick='Ink'),
+   23);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Auran' AS nick WHERE 'Auran' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   34,
+   (SELECT player FROM players WHERE nick='Auran'),
+   22);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Candy'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -49,7 +252,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7505);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -57,22 +260,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7204);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova')),
    't',
    7952);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -80,7 +282,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5104);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -88,22 +290,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6302);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Jam Jam Reggae (AM Swing Mix)')),
    't',
    6940);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -111,7 +312,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7279);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -119,22 +320,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7205);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova')),
    't',
    7649);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Slusk' AS nick WHERE 'Slusk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    0,
@@ -142,7 +342,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5544);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    1,
@@ -150,22 +350,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6465);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    7619);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -173,7 +372,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6968);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -181,7 +380,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8480);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    2,
@@ -189,33 +388,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7702);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('www.blonde girl (MOMO Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Let Them Move'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Golddragon' AS nick WHERE 'Golddragon' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    0,
@@ -223,7 +421,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5536);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    1,
@@ -231,22 +429,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5202);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    6905);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jallaman' AS nick WHERE 'Jallaman' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    0,
@@ -254,7 +451,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5390);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    1,
@@ -262,22 +459,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4746);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8151);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -285,7 +481,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6849);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -293,22 +489,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6513);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave')),
    't',
    8242);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Matsi' AS nick WHERE 'Matsi' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    0,
@@ -316,7 +511,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5675);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    1,
@@ -324,22 +519,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4952);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    7354);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -347,7 +541,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6720);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -355,7 +549,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6243);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -363,33 +557,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8513);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Nori Nori Nori'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'tombot' AS nick WHERE 'tombot' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    0,
@@ -397,7 +590,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4876);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    1,
@@ -405,22 +598,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6868);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    6622);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ink' AS nick WHERE 'Ink' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    0,
@@ -428,7 +620,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4458);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    1,
@@ -436,22 +628,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4053);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('era (nostalmix)')),
    't',
    5636);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -459,7 +650,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5985);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -467,22 +658,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7459);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('My Summer Love')),
    't',
    7837);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Spinnvill' AS nick WHERE 'Spinnvill' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    0,
@@ -490,7 +680,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6173);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    1,
@@ -498,22 +688,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7732);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8031);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Telc' AS nick WHERE 'Telc' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    0,
@@ -521,7 +710,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5563);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    1,
@@ -529,22 +718,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7290);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Hypnotic Crisis')),
    't',
    7467);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -552,7 +740,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6545);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -560,7 +748,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8636);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -568,33 +756,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7666);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -602,7 +789,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5235);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -610,22 +797,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5049);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    7172);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Auran' AS nick WHERE 'Auran' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    0,
@@ -633,7 +819,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4330);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    1,
@@ -641,22 +827,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3698);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300')),
    't',
    4459);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Advena' AS nick WHERE 'Advena' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    0,
@@ -664,7 +849,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5233);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    1,
@@ -672,22 +857,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5076);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    7787);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -695,7 +879,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7143);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -703,22 +887,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7727);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Jam Jam Reggae (AM Swing Mix)')),
    't',
    7700);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -726,7 +909,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4862);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -734,22 +917,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6848);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Jam Jam Reggae (AM Swing Mix)')),
    't',
    6668);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -757,7 +939,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8288);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -765,7 +947,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8252);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -773,33 +955,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7566);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('DXY!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'x3mnrj' AS nick WHERE 'x3mnrj' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    0,
@@ -807,7 +988,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6004);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    1,
@@ -815,22 +996,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5699);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    6712);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Octu' AS nick WHERE 'Octu' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    0,
@@ -838,7 +1018,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5789);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    1,
@@ -846,22 +1026,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4891);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    6321);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Electus' AS nick WHERE 'Electus' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    0,
@@ -869,7 +1048,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6256);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    1,
@@ -877,22 +1056,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6376);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    7992);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Purity' AS nick WHERE 'Purity' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    0,
@@ -900,7 +1078,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6498);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    1,
@@ -908,22 +1086,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6584);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8079);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick WHERE 'Havok' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    0,
@@ -931,7 +1108,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6482);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    1,
@@ -939,22 +1116,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5994);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    7576);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    0,
@@ -962,7 +1138,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6130);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    1,
@@ -970,7 +1146,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5705);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    2,
@@ -978,33 +1154,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7935);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('Memories'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dexter' AS nick WHERE 'Dexter' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    0,
@@ -1012,7 +1187,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6276);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    1,
@@ -1020,22 +1195,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7296);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8433);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -1043,7 +1217,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6171);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -1051,22 +1225,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6554);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    7315);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tha Dragon' AS nick WHERE 'Tha Dragon' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    0,
@@ -1074,7 +1247,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5269);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    1,
@@ -1082,22 +1255,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5511);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    7357);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1105,7 +1277,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6425);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1113,22 +1285,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8002);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8452);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1136,7 +1307,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6501);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1144,22 +1315,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8519);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    8529);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -1167,7 +1337,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6503);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -1175,7 +1345,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7729);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -1184,37 +1354,36 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8248);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova Primeval'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -1222,7 +1391,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5962);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -1230,22 +1399,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5704);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8098);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -1253,7 +1421,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7436);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -1261,22 +1429,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6489);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    8489);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1284,7 +1451,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7619);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -1292,22 +1459,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6603);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8445);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1315,7 +1481,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8436);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1323,22 +1489,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6567);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Trip Machine Climax')),
    't',
    8425);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Purity' AS nick WHERE 'Purity' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    0,
@@ -1346,7 +1511,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7441);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    1,
@@ -1354,22 +1519,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6068);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    8424);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1377,7 +1541,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8253);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1385,7 +1549,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6456);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -1393,33 +1557,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8595);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('My Summer Love'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Living in America'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick WHERE 'Havok' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    0,
@@ -1427,7 +1590,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6396);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    1,
@@ -1435,22 +1598,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    0);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Hysteria 2001')),
    't',
    3161);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jallaman' AS nick WHERE 'Jallaman' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    0,
@@ -1458,7 +1620,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6943);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    1,
@@ -1466,22 +1628,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4881);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300')),
    't',
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1489,7 +1650,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7235);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1497,22 +1658,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6126);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8160);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1520,7 +1680,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6370);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1528,22 +1688,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5386);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8107);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1551,7 +1710,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7691);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1559,22 +1718,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6540);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)')),
    't',
    8190);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1582,7 +1740,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7777);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1590,7 +1748,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6359);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1598,33 +1756,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7800);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Caribbean Queen'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -1632,7 +1789,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5974);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -1640,22 +1797,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7951);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    't',
    8229);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -1663,7 +1819,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5953);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -1671,22 +1827,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7738);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    7874);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Electus' AS nick WHERE 'Electus' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    0,
@@ -1694,7 +1849,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5444);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    1,
@@ -1702,22 +1857,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7090);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('era (nostalmix)')),
    't',
    7249);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Spinnvill' AS nick WHERE 'Spinnvill' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    0,
@@ -1725,7 +1879,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5540);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    1,
@@ -1733,22 +1887,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6936);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    't',
    7821);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1756,7 +1909,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6206);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1764,22 +1917,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8084);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Spin the disc')),
    't',
    7733);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -1787,7 +1939,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5836);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -1795,7 +1947,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8046);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    2,
@@ -1804,32 +1956,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8508);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=3;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1837,22 +1988,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8251);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8380);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1860,22 +2010,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7881);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8316);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1883,22 +2032,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8295);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    8678);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1906,22 +2054,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8092);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8680);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -1929,22 +2076,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7806);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    7815);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1952,22 +2098,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8414);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    8180);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1975,22 +2120,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8406);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    8260);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    8
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1998,22 +2142,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8441);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    8539);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    9
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -2021,7 +2164,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8489);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -2030,32 +2173,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8381);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Never Gonna Make (Factory Team Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=4;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2063,22 +2205,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6595);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    8588);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2086,22 +2227,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6301);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8706);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2109,22 +2249,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6654);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    8693);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2132,22 +2271,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6596);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    7821);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -2155,22 +2293,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6766);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
    't',
    8379);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2178,22 +2315,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6433);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    8563);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2201,7 +2337,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6803);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2210,32 +2346,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8351);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Memories'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=5;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2243,22 +2378,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7245);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8452);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -2266,22 +2400,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6701);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300')),
    't',
    8960);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2289,22 +2422,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7521);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!')),
    't',
    8615);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2312,22 +2444,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7227);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8541);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2335,7 +2466,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6819);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2344,32 +2475,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8853);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Groove 2001'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=6;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2377,22 +2507,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6663);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    8637);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2400,22 +2529,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6662);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Trip Machine (Luv Mix)')),
    't',
    8044);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2423,22 +2551,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6810);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova Primeval')),
    't',
    8506);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2446,7 +2573,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6759);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2455,32 +2582,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8544);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=7;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2488,22 +2614,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8391);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8130);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2511,22 +2636,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    9537);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)')),
    't',
    8352);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2534,7 +2658,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    9032);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2543,32 +2667,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8623);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Never Let You Down'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=8;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=8;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2576,22 +2699,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6678);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    't',
    8781);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2599,7 +2721,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6827);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,