X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=sql%2Fcc04%2Fcc3-04.sql;h=606bbdd6ed393e7bc76a3e9e5ffe80878fd19772;hp=7f01806926ba11d0f3f79f4130f0cb4e099c5287;hb=aee1f77ca1957086ed876b49e1b5e4f744eef2f2;hpb=1f60fb5390460b3db78b28cadc8790cce5da267c

diff --git a/sql/cc04/cc3-04.sql b/sql/cc04/cc3-04.sql
index 7f01806..606bbdd 100644
--- a/sql/cc04/cc3-04.sql
+++ b/sql/cc04/cc3-04.sql
@@ -1,47 +1,47 @@
 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 3',
-    (SELECT country FROM countries WHERE name='Norway'),
+    (SELECT country FROM countries WHERE countryname='Norway'),
     'Askim',
     '2004-05-23',
-    (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 rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ted Kristian' AS nick WHERE 'Ted Kristian' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    0,
@@ -49,7 +49,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4475);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    1,
@@ -57,7 +57,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5340);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    2,
@@ -66,13 +66,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7032);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pål Andre' AS nick WHERE 'Pål Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    0,
@@ -80,7 +80,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4760);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    1,
@@ -88,7 +88,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5946);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    2,
@@ -97,13 +97,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5875);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -111,7 +111,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5734);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -119,7 +119,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7095);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
@@ -128,13 +128,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8047);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -142,7 +142,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6356);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -150,7 +150,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7560);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -159,13 +159,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7720);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -173,7 +173,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6480);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -181,7 +181,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7646);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -189,33 +189,33 @@ 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jim Andre' AS nick WHERE 'Jim Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    0,
@@ -223,7 +223,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5809);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    1,
@@ -231,7 +231,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5338);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    2,
@@ -240,13 +240,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6198);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Andre' AS nick WHERE 'Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    0,
@@ -254,7 +254,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4264);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    1,
@@ -262,7 +262,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3773);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    2,
@@ -271,13 +271,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5277);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    0,
@@ -285,7 +285,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5388);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1,
@@ -293,7 +293,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5249);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    2,
@@ -302,13 +302,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7228);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -316,7 +316,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6226);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -324,7 +324,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6708);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -333,13 +333,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6445);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -347,7 +347,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7353);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -355,7 +355,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7214);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -363,33 +363,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6791);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('5, 6, 7, 8'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    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 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Glukko' AS nick WHERE 'Glukko' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    0,
@@ -397,7 +397,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4346);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    1,
@@ -405,7 +405,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3531);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    2,
@@ -414,13 +414,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5270);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ole-Christian' AS nick WHERE 'Ole-Christian' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ole-Christian'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ole-Christian'),
    0,
@@ -428,7 +428,7 @@ 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ole-Christian'),
    1,
@@ -437,13 +437,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    0);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zyc' AS nick WHERE 'Zyc' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    0,
@@ -451,7 +451,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4898);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    1,
@@ -459,7 +459,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3333);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    2,
@@ -468,13 +468,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5149);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -482,7 +482,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5189);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -490,7 +490,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4391);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -499,13 +499,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7298);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -513,7 +513,7 @@ 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -521,7 +521,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8510);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -529,33 +529,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8504);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Look to the sky'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (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 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Th0rny' AS nick WHERE 'Th0rny' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    0,
@@ -563,7 +563,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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    1,
@@ -571,7 +571,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6214);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    2,
@@ -580,13 +580,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8348);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -594,7 +594,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5618);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -602,7 +602,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6326);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -611,13 +611,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8278);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    0,
@@ -625,7 +625,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4525);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    1,
@@ -633,7 +633,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6008);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    2,
@@ -642,13 +642,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7040);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    0,
@@ -656,7 +656,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5716);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    1,
@@ -664,7 +664,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6169);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    2,
@@ -673,13 +673,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7682);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -687,7 +687,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6023);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -695,7 +695,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6628);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -703,33 +703,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8179);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (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 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Eruanna' AS nick WHERE 'Eruanna' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    0,
@@ -737,7 +737,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5410);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    1,
@@ -745,7 +745,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4383);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    2,
@@ -754,13 +754,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6040);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Advena'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Advena'),
    0,
@@ -768,7 +768,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6729);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Advena'),
    1,
@@ -776,7 +776,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7069);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Advena'),
    2,
@@ -785,13 +785,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7624);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tassen' AS nick WHERE 'Tassen' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tassen'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tassen'),
    0,
@@ -799,7 +799,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6911);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tassen'),
    1,
@@ -807,7 +807,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6693);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tassen'),
    2,
@@ -816,13 +816,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7298);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -830,7 +830,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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -838,7 +838,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7357);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -847,13 +847,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7321);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Olemann'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -861,7 +861,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7471);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -869,7 +869,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7919);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -878,13 +878,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8043);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -892,7 +892,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8546);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -900,7 +900,7 @@ 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -908,33 +908,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7740);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('The Reflex'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bonzo' AS nick WHERE 'Bonzo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -942,7 +942,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4564);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -950,7 +950,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6212);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    2,
@@ -959,13 +959,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7211);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gollum' AS nick WHERE 'Gollum' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Gollum'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Gollum'),
    0,
@@ -973,7 +973,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3139);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Gollum'),
    1,
@@ -981,7 +981,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5655);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Gollum'),
    2,
@@ -990,13 +990,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6369);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hugo'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hugo'),
    0,
@@ -1004,7 +1004,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6888);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hugo'),
    1,
@@ -1012,7 +1012,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8521);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hugo'),
    2,
@@ -1021,13 +1021,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7439);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Auran'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Auran'),
    0,
@@ -1035,7 +1035,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3300);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Auran'),
    1,
@@ -1043,7 +1043,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3813);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Auran'),
    2,
@@ -1052,13 +1052,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    4377);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -1066,7 +1066,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5696);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -1074,7 +1074,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7569);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -1083,13 +1083,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7703);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -1097,7 +1097,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5989);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -1105,7 +1105,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7689);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -1114,37 +1114,37 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8064);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Love This Feelin\''))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('I Want You To Want Me'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -1152,7 +1152,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5825);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -1160,7 +1160,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4790);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -1169,13 +1169,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7961);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -1183,7 +1183,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6533);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -1191,7 +1191,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5504);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
@@ -1200,13 +1200,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7989);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1214,7 +1214,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7101);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1222,7 +1222,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5725);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -1231,13 +1231,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8713);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Th0rny' AS nick WHERE 'Th0rny' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    0,
@@ -1245,7 +1245,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6377);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    1,
@@ -1253,7 +1253,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4994);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    2,
@@ -1262,13 +1262,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8140);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1276,7 +1276,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7140);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1284,7 +1284,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5515);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -1293,13 +1293,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8310);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1307,7 +1307,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6447);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1315,7 +1315,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5518);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1323,33 +1323,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8271);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Ecstasy'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=2;
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    0,
@@ -1357,7 +1357,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4394);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1,
@@ -1365,7 +1365,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4295);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    2,
@@ -1374,13 +1374,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6188);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -1388,7 +1388,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5898);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -1396,7 +1396,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5857);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -1405,13 +1405,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8053);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -1419,7 +1419,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5873);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -1427,7 +1427,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5881);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -1436,13 +1436,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8283);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Stream'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -1450,7 +1450,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5820);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -1458,7 +1458,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6437);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -1467,13 +1467,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8232);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1481,7 +1481,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6509);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1489,7 +1489,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6858);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -1498,13 +1498,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8420);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Hugo'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Hugo'),
    0,
@@ -1512,7 +1512,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6424);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Hugo'),
    1,
@@ -1520,7 +1520,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6499);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Hugo'),
    2,
@@ -1528,33 +1528,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8601);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Stomp'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zyc' AS nick WHERE 'Zyc' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    0,
@@ -1562,7 +1562,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3711);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    1,
@@ -1570,7 +1570,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3767);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    2,
@@ -1579,13 +1579,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    0);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -1593,7 +1593,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8621);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -1601,7 +1601,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5773);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -1610,13 +1610,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6811);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1624,7 +1624,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8853);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1632,7 +1632,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5898);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -1641,13 +1641,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8750);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -1655,7 +1655,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6836);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -1663,7 +1663,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5513);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -1672,13 +1672,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7941);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1686,7 +1686,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8490);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1694,7 +1694,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6341);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1703,13 +1703,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8630);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1717,7 +1717,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8781);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1725,7 +1725,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6211);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -1734,32 +1734,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8384);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 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 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -1767,7 +1767,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6565);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -1776,13 +1776,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7765);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1790,7 +1790,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6520);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1799,13 +1799,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8489);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1813,7 +1813,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7553);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1822,13 +1822,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8621);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1836,7 +1836,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7015);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1845,13 +1845,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8627);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    0,
@@ -1859,7 +1859,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7258);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    1,
@@ -1868,13 +1868,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8228);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1882,7 +1882,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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1891,13 +1891,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8453);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1905,7 +1905,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7605);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1914,13 +1914,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8374);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    8
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1928,7 +1928,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7185);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1937,13 +1937,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8475);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    9
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1951,7 +1951,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6892);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1960,32 +1960,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8468);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('era (nostalmix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=4;
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1993,7 +1993,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7528);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2002,13 +2002,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8273);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    0,
@@ -2016,7 +2016,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7376);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    1,
@@ -2025,13 +2025,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2039,7 +2039,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7371);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2048,13 +2048,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8723);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2062,7 +2062,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7282);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2071,13 +2071,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8778);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2085,7 +2085,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7352);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2094,13 +2094,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8808);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2108,7 +2108,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7606);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2117,13 +2117,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8748);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2131,7 +2131,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7572);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2140,32 +2140,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8555);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=5;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    0,
@@ -2173,7 +2173,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7573);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    1,
@@ -2182,13 +2182,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8539);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2196,7 +2196,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7586);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2205,13 +2205,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8349);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2219,7 +2219,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7742);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2228,13 +2228,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8914);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2242,7 +2242,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7692);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2251,13 +2251,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8612);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2265,7 +2265,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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2274,32 +2274,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8782);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=6;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    0,
@@ -2307,7 +2307,7 @@ 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    1,
@@ -2316,13 +2316,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8635);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2330,7 +2330,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6094);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2339,13 +2339,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8264);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2353,7 +2353,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6623);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2362,13 +2362,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8828);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2376,7 +2376,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6455);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2385,32 +2385,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8728);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7, 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 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=7;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    0,
@@ -2418,7 +2418,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8273);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    1,
@@ -2427,13 +2427,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8169);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2441,7 +2441,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8420);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2450,13 +2450,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8678);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7, 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2464,7 +2464,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8604);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2473,34 +2473,34 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8794);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    8,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    8, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    8, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('I Want You To Want Me'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    8, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2508,7 +2508,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5640);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2517,13 +2517,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8906);
 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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    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 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2531,7 +2531,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5750);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,