X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=sql%2Fcc04%2Fcc2-04.sql;h=92668a232a4725bb89065816dd858765c182f31f;hp=e50ba53022323a57d26f132c5d95f2a6b1637b44;hb=4d3c5e7d8ae5d0846d0b4241811ffe20e57a006b;hpb=1f60fb5390460b3db78b28cadc8790cce5da267c

diff --git a/sql/cc04/cc2-04.sql b/sql/cc04/cc2-04.sql
index e50ba53..92668a2 100644
--- a/sql/cc04/cc2-04.sql
+++ b/sql/cc04/cc2-04.sql
@@ -1,47 +1,136 @@
 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 2',
-    (SELECT country FROM countries WHERE name='Norway'),
+    (SELECT country FROM countries WHERE countryname='Norway'),
     'Kino 1 Sandvika',
     '2004-04-25',
-    (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, '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 2'),
+   1,
+   (SELECT player FROM players WHERE nick='OJK'),
+   100);
+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 2'),
+   2,
+   (SELECT player FROM players WHERE nick='Snute'),
+   0);
+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 2'),
+   3,
+   (SELECT player FROM players WHERE nick='DufF'),
+   0);
+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 2'),
+   4,
+   (SELECT player FROM players WHERE nick='Snofox'),
+   73);
+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 2'),
+   5,
+   (SELECT player FROM players WHERE nick='T|na'),
+   66);
+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 2'),
+   6,
+   (SELECT player FROM players WHERE nick='RiChY'),
+   60);
+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 2'),
+   7,
+   (SELECT player FROM players WHERE nick='Stream'),
+   55);
+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 2'),
+   8,
+   (SELECT player FROM players WHERE nick='Olemann'),
+   51);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Raazu' AS nick WHERE 'Raazu' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   9,
+   (SELECT player FROM players WHERE nick='Raazu'),
+   48);
+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 2'),
+   10,
+   (SELECT player FROM players WHERE nick='Ylini'),
+   46);
+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 2'),
+   11,
+   (SELECT player FROM players WHERE nick='Smiph'),
+   45);
+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 2'),
+   12,
+   (SELECT player FROM players WHERE nick='Havok'),
+   44);
+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 2'),
+   13,
+   (SELECT player FROM players WHERE nick='Draconia'),
+   43);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dabi' AS nick WHERE 'Dabi' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   14,
+   (SELECT player FROM players WHERE nick='Dabi'),
+   42);
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bush' AS nick WHERE 'Bush' NOT IN ( SELECT nick FROM players );
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   15,
+   (SELECT player FROM players WHERE nick='Bush'),
+   41);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('era (nostalmix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bush' AS nick WHERE 'Bush' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    0,
@@ -49,7 +138,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4327);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    1,
@@ -57,22 +146,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4251);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U')),
    't',
    5910);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -80,7 +168,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5476);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -88,22 +176,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6242);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    7977);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -111,7 +198,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6224);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -119,22 +206,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6659);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('My Summer Love')),
    't',
    7572);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -142,7 +228,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6530);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -150,22 +236,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6702);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Jam Jam Reggae (AM Swing Mix)')),
    't',
    7631);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -173,7 +258,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7561);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -181,7 +266,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7616);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -189,33 +274,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6839);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Vanity Angel'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dabi' AS nick WHERE 'Dabi' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    0,
@@ -223,7 +307,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3973);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1,
@@ -231,22 +315,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3845);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Jam Jam Reggae (AM Swing Mix)')),
    't',
    6484);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -254,7 +337,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7827);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -262,22 +345,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6329);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (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',
    8032);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -285,7 +367,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7830);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -293,22 +375,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6336);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    7544);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -316,7 +397,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8058);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -324,22 +405,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7672);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)')),
    't',
    8167);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -347,7 +427,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8651);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -355,7 +435,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8426);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -363,33 +443,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8392);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('D2R'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Raazu' AS nick WHERE 'Raazu' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    0,
@@ -397,7 +476,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5012);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    1,
@@ -405,22 +484,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4014);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    6940);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    0,
@@ -428,7 +506,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5541);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    1,
@@ -436,22 +514,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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)')),
    't',
    7524);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    0,
@@ -459,7 +536,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4355);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    1,
@@ -467,22 +544,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6284);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It')),
    't',
    4399);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -490,7 +566,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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -498,22 +574,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8076);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
    (SELECT song FROM songs WHERE lower(title)=lower('My Summer Love')),
    't',
    7735);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -521,7 +596,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6044);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -529,7 +604,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8303);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -538,32 +613,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8625);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=2;
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Raazu' AS nick WHERE 'Raazu' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Raazu'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Raazu'),
    0,
@@ -571,22 +645,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7286);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Raazu'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    7657);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -594,22 +667,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7814);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    7986);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Olemann'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -617,22 +689,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7747);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('My Summer Love')),
    't',
    7721);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -640,22 +711,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8215);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    't',
    8053);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -663,22 +733,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8529);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8570);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -686,22 +755,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8478);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    8174);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -709,22 +777,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8743);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)')),
    't',
    8447);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    8
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -732,22 +799,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8695);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave')),
    't',
    8440);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    9
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -755,7 +821,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8798);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -764,32 +830,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8500);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=3;
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -797,22 +862,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7698);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    7874);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -820,22 +884,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8241);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8574);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -843,22 +906,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8139);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8403);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -866,22 +928,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8661);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8456);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -889,22 +950,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8272);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic')),
    't',
    8353);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -912,22 +972,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8783);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)')),
    't',
    8673);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -935,7 +994,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8633);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -944,32 +1003,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8584);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('5, 6, 7, 8'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=4;
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -977,22 +1035,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5706);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru')),
    't',
    8583);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1000,22 +1057,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5726);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)')),
    't',
    8056);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1023,22 +1079,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5553);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 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',
    8525);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1046,22 +1101,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5822);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)')),
    't',
    8460);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1069,7 +1123,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5922);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1078,32 +1132,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8725);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('www.blonde girl (MOMO Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=5;
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1111,22 +1164,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6450);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300')),
    't',
    8236);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1134,22 +1186,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6742);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')),
    't',
    8728);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1157,22 +1208,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6605);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End')),
    't',
    8534);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1180,7 +1230,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6689);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1189,32 +1239,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8828);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') 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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1222,22 +1271,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7343);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8871);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1245,22 +1293,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7152);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300')),
    't',
    8718);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1268,7 +1315,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6908);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1277,32 +1324,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    9276);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=7;
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1310,22 +1356,21 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8662);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')),
    't',
    8776);
-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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1333,7 +1378,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8676);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,