Update the parser scripts to handle tournament rankings, and fix a typo in the SQL...

[ccbs] / sql / cc04 / cc7-04.sql

diff --git a/sql/cc04/cc7-04.sql b/sql/cc04/cc7-04.sql
index 7ab0b3d5e0b145282b056b4cdee04ed85552738b..dab5a73bf8f1ad9c4062413e2a8f6619cb72f2cb 100644 (file)
--- a/sql/cc04/cc7-04.sql
+++ b/sql/cc04/cc7-04.sql
@@ -1,47 +1,182 @@
 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 7',
-    (SELECT country FROM countries WHERE name='Norway'),
-    'Tønsberg - Sjøsenteret bowling',
+    (SELECT country FROM countries WHERE countryname='Norway'),
+    'Tønsberg - Sjøsenteret bowling',
     '2004-11-21',
-    (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 tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   1, 'Haggar', 100);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   2, 'Snute', 0);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   3, 'Nameless', 81);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   4, 'Snofox', 73);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   5, 'Bonzo', 66);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   6, 'Oliyzia', 60);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   7, 'RiChY', 0);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   8, 'OJK', 0);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   9, 'Pingo', 48);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   10, 'Gogo', 46);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   11, 'T|na', 0);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   12, 'Olemann', 44);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   13, 'Duckling', 43);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   14, 'Andeplane', 42);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   15, 'Ylini', 41);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   16, 'Daniil', 0);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   17, 'Mync', 39);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   18, 'Smiph', 38);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   19, 'Felz', 37);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   20, 'Alexxz', 36);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   21, 'v|per', 35);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   22, 'Dritago', 34);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   23, 'SLC', 33);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   24, 'Athena', 32);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   25, 'Pfxp', 31);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   26, 'Matsi', 30);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   27, 'Zeila', 29);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   28, 'Electron', 28);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   29, 'Pyro', 27);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   30, 'Volstad', 26);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   31, 'Zackie', 25);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   32, 'Matti', 24);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   33, 'Eruanna', 23);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   34, 'Indy', 22);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   35, 'Crienexzy', 21);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   36, 'Hyper', 20);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   37, 'Benny', 19);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   38, 'Marilla', 18);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   39, 'uSimen', 17);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   40, 'JonAnders', 16);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   41, 'Bush', 15);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   42, 'Voffen', 14);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   43, 'Annkakri', 13);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   44, 'Glock', 12);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
+   45, 'Tove', 11);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Let the Beat Hit \'em!'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 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 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Crienexzy' AS nick WHERE 'Crienexzy' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Crienexzy'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Crienexzy'),
    0,
@@ -49,7 +184,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5584);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Crienexzy'),
    1,
@@ -57,7 +192,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4702);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Crienexzy'),
    2,
@@ -66,13 +201,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6464);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tove' AS nick WHERE 'Tove' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tove'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tove'),
    0,
@@ -80,7 +215,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4854);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tove'),
    1,
@@ -88,7 +223,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4742);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tove'),
    2,
@@ -97,13 +232,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5960);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'JonAnders' AS nick WHERE 'JonAnders' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='JonAnders'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='JonAnders'),
    0,
@@ -111,7 +246,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5596);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='JonAnders'),
    1,
@@ -119,7 +254,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3874);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='JonAnders'),
    2,
@@ -128,13 +263,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6468);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Andeplane' AS nick WHERE 'Andeplane' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
    0,
@@ -142,7 +277,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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
    1,
@@ -150,7 +285,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4778);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
    2,
@@ -159,13 +294,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8366);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Matsi'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Matsi'),
    0,
@@ -173,7 +308,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5523);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Matsi'),
    1,
@@ -181,7 +316,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5217);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Matsi'),
    2,
@@ -190,13 +325,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7826);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -204,7 +339,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6511);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -212,7 +347,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5597);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -221,13 +356,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7861);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -235,7 +370,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6435);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -243,7 +378,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5090);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -251,33 +386,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8182);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova Primeval'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'uSimen' AS nick WHERE 'uSimen' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='uSimen'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='uSimen'),
    0,
@@ -285,7 +420,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5520);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='uSimen'),
    1,
@@ -293,7 +428,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6691);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='uSimen'),
    2,
@@ -302,13 +437,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5919);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pfxp' AS nick WHERE 'Pfxp' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pfxp'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pfxp'),
    0,
@@ -316,7 +451,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5958);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pfxp'),
    1,
@@ -324,7 +459,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7853);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pfxp'),
    2,
@@ -333,13 +468,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7595);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Glock' AS nick WHERE 'Glock' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glock'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glock'),
    0,
@@ -347,7 +482,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4185);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glock'),
    1,
@@ -355,7 +490,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6679);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glock'),
    2,
@@ -364,13 +499,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6267);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Eruanna'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Eruanna'),
    0,
@@ -378,7 +513,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4341);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Eruanna'),
    1,
@@ -386,7 +521,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7410);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Eruanna'),
    2,
@@ -395,13 +530,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7395);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'v|per' AS nick WHERE 'v|per' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='v|per'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='v|per'),
    0,
@@ -409,7 +544,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6649);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='v|per'),
    1,
@@ -417,7 +552,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7443);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='v|per'),
    2,
@@ -426,13 +561,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7410);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Daniil'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -440,7 +575,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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -448,7 +583,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8431);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -457,13 +592,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6831);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -471,7 +606,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8724);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -479,7 +614,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8731);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -487,33 +622,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6959);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Spin the disc'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Living in America'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Benny' AS nick WHERE 'Benny' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Benny'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Benny'),
    0,
@@ -521,7 +656,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6069);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Benny'),
    1,
@@ -529,7 +664,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5138);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Benny'),
    2,
@@ -538,13 +673,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8091);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Volstad' AS nick WHERE 'Volstad' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Volstad'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Volstad'),
    0,
@@ -552,7 +687,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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Volstad'),
    1,
@@ -560,7 +695,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5502);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Volstad'),
    2,
@@ -569,13 +704,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7588);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Annkakri' AS nick WHERE 'Annkakri' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Annkakri'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Annkakri'),
    0,
@@ -583,7 +718,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4418);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Annkakri'),
    1,
@@ -591,7 +726,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4148);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Annkakri'),
    2,
@@ -600,13 +735,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6373);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Athena' AS nick WHERE 'Athena' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Athena'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Athena'),
    0,
@@ -614,7 +749,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6783);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Athena'),
    1,
@@ -622,7 +757,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5119);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Athena'),
    2,
@@ -631,13 +766,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7869);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Felz' AS nick WHERE 'Felz' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    0,
@@ -645,7 +780,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7297);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    1,
@@ -653,7 +788,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6030);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    2,
@@ -662,13 +797,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7391);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -676,7 +811,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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -684,7 +819,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6230);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -693,13 +828,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7479);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -707,7 +842,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7854);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -715,7 +850,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6684);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -723,33 +858,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7493);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('The Reflex'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Voffen' AS nick WHERE 'Voffen' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Voffen'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Voffen'),
    0,
@@ -757,7 +892,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3516);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Voffen'),
    1,
@@ -765,7 +900,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3154);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Voffen'),
    2,
@@ -774,13 +909,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    3880);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zackie' AS nick WHERE 'Zackie' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Zackie'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Zackie'),
    0,
@@ -788,7 +923,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6260);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Zackie'),
    1,
@@ -796,7 +931,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4965);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Zackie'),
    2,
@@ -805,13 +940,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7501);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zeila' AS nick WHERE 'Zeila' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Zeila'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Zeila'),
    0,
@@ -819,7 +954,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6582);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Zeila'),
    1,
@@ -827,7 +962,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6357);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Zeila'),
    2,
@@ -836,13 +971,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7466);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Alexxz' AS nick WHERE 'Alexxz' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Alexxz'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Alexxz'),
    0,
@@ -850,7 +985,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7079);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Alexxz'),
    1,
@@ -858,7 +993,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6790);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Alexxz'),
    2,
@@ -867,13 +1002,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7418);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -881,7 +1016,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7219);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -889,7 +1024,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6300);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -898,13 +1033,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8442);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -912,7 +1047,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7680);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -920,7 +1055,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6996);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -928,33 +1063,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8415);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('The Vibe is Right'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Stomp'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'SLC' AS nick WHERE 'SLC' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='SLC'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='SLC'),
    0,
@@ -962,7 +1097,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5267);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='SLC'),
    1,
@@ -970,7 +1105,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5382);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='SLC'),
    2,
@@ -979,13 +1114,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8059);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Matti' AS nick WHERE 'Matti' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Matti'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Matti'),
    0,
@@ -993,7 +1128,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5707);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Matti'),
    1,
@@ -1001,7 +1136,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4999);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Matti'),
    2,
@@ -1010,13 +1145,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7415);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hyper' AS nick WHERE 'Hyper' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Hyper'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Hyper'),
    0,
@@ -1024,7 +1159,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4604);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Hyper'),
    1,
@@ -1032,7 +1167,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4909);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Hyper'),
    2,
@@ -1041,13 +1176,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8154);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mync' AS nick WHERE 'Mync' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Mync'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Mync'),
    0,
@@ -1055,7 +1190,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5602);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Mync'),
    1,
@@ -1063,7 +1198,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5644);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Mync'),
    2,
@@ -1072,13 +1207,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8002);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -1086,7 +1221,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5867);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -1094,7 +1229,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5728);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -1103,13 +1238,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8126);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Haggar'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1117,7 +1252,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6375);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1125,7 +1260,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6569);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 5,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -1133,33 +1268,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8548);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('Jam Jam Reggae (AM Swing Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('www.blonde girl (MOMO Mix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dritago' AS nick WHERE 'Dritago' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dritago'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dritago'),
    0,
@@ -1167,7 +1302,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7445);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dritago'),
    1,
@@ -1175,7 +1310,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6566);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dritago'),
    2,
@@ -1184,13 +1319,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8257);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pyro' AS nick WHERE 'Pyro' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Pyro'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Pyro'),
    0,
@@ -1198,7 +1333,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7026);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Pyro'),
    1,
@@ -1206,7 +1341,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5519);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Pyro'),
    2,
@@ -1215,13 +1350,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7792);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Marilla' AS nick WHERE 'Marilla' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
    0,
@@ -1229,7 +1364,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6970);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
    1,
@@ -1237,7 +1372,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5783);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
    2,
@@ -1246,13 +1381,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7532);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pingo' AS nick WHERE 'Pingo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Pingo'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Pingo'),
    0,
@@ -1260,7 +1395,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7202);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Pingo'),
    1,
@@ -1268,7 +1403,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6666);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Pingo'),
    2,
@@ -1277,13 +1412,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8740);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -1291,7 +1426,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7537);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -1299,7 +1434,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6450);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    2,
@@ -1308,13 +1443,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8608);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='OJK'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1322,7 +1457,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7612);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1330,7 +1465,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6822);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 6,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -1338,33 +1473,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8570);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT song FROM songs WHERE lower(title)=lower('Rain of Sorrow'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Indy' AS nick WHERE 'Indy' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Indy'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Indy'),
    0,
@@ -1372,7 +1507,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4984);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Indy'),
    1,
@@ -1380,7 +1515,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4764);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Indy'),
    2,
@@ -1389,13 +1524,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7395);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Electron' AS nick WHERE 'Electron' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Electron'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Electron'),
    0,
@@ -1403,7 +1538,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6998);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Electron'),
    1,
@@ -1411,7 +1546,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6599);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Electron'),
    2,
@@ -1420,13 +1555,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7401);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bush' AS nick WHERE 'Bush' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Bush'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Bush'),
    0,
@@ -1434,7 +1569,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5022);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Bush'),
    1,
@@ -1442,7 +1577,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3527);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Bush'),
    2,
@@ -1451,13 +1586,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5434);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gogo' AS nick WHERE 'Gogo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Gogo'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Gogo'),
    0,
@@ -1465,7 +1600,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8367);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Gogo'),
    1,
@@ -1473,7 +1608,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7439);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Gogo'),
    2,
@@ -1482,13 +1617,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7768);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -1496,7 +1631,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7428);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -1504,7 +1639,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6726);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -1513,13 +1648,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8047);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1527,7 +1662,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8429);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1535,7 +1670,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8532);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    1, 7,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -1544,37 +1679,37 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8675);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Test My Best'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Love You Like A Fool'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'v|per' AS nick WHERE 'v|per' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='v|per'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='v|per'),
    0,
@@ -1582,7 +1717,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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='v|per'),
    1,
@@ -1590,7 +1725,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5609);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='v|per'),
    2,
@@ -1599,13 +1734,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6936);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mync' AS nick WHERE 'Mync' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
    0,
@@ -1613,7 +1748,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6179);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
    1,
@@ -1621,7 +1756,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6075);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
    2,
@@ -1630,13 +1765,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8508);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Duckling'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -1644,7 +1779,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6417);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -1652,7 +1787,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6355);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -1661,13 +1796,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8581);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1675,7 +1810,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6640);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1683,7 +1818,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6515);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1692,13 +1827,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8359);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pingo' AS nick WHERE 'Pingo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Pingo'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Pingo'),
    0,
@@ -1706,7 +1841,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6630);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Pingo'),
    1,
@@ -1714,7 +1849,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6243);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Pingo'),
    2,
@@ -1723,13 +1858,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8738);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1737,7 +1872,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6730);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1745,7 +1880,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6719);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -1754,13 +1889,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8805);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1768,7 +1903,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6697);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1776,7 +1911,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6758);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -1784,33 +1919,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8297);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('The Centre of the Heart (Stonebridge Club Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Trip Machine (Luv Mix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Alexxz' AS nick WHERE 'Alexxz' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
    0,
@@ -1818,7 +1953,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6175);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
    1,
@@ -1826,7 +1961,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6752);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
    2,
@@ -1835,13 +1970,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7730);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -1849,7 +1984,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5951);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -1857,7 +1992,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6669);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -1866,13 +2001,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8209);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -1880,7 +2015,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6003);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -1888,7 +2023,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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -1897,13 +2032,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8111);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gogo' AS nick WHERE 'Gogo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Gogo'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Gogo'),
    0,
@@ -1911,7 +2046,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6792);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Gogo'),
    1,
@@ -1919,7 +2054,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6897);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Gogo'),
    2,
@@ -1928,13 +2063,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8678);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1942,7 +2077,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6704);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1950,7 +2085,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8140);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -1959,13 +2094,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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1973,7 +2108,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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1981,7 +2116,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7779);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1990,13 +2125,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8648);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2004,7 +2139,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6606);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2012,7 +2147,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8683);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -2020,33 +2155,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8596);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 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 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Felz' AS nick WHERE 'Felz' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    0,
@@ -2054,7 +2189,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7472);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    1,
@@ -2062,7 +2197,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6843);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    2,
@@ -2071,13 +2206,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8098);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Andeplane' AS nick WHERE 'Andeplane' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Andeplane'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Andeplane'),
    0,
@@ -2085,7 +2220,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8100);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Andeplane'),
    1,
@@ -2093,7 +2228,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6651);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Andeplane'),
    2,
@@ -2102,13 +2237,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8529);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Bonzo'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -2116,7 +2251,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8294);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -2124,7 +2259,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8144);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Bonzo'),
    2,
@@ -2133,13 +2268,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8673);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Daniil'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -2147,7 +2282,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7415);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -2155,7 +2290,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6458);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -2164,13 +2299,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8566);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -2178,7 +2313,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7732);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -2186,7 +2321,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7534);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -2195,13 +2330,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8077);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2209,7 +2344,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8004);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2217,7 +2352,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8351);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -2226,13 +2361,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8672);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2240,7 +2375,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8352);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2248,7 +2383,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8506);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -2257,32 +2392,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8743);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('The Centre of the Heart (Stonebridge Club Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=3;
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2290,7 +2425,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6592);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2299,13 +2434,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8710);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2313,7 +2448,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6798);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2322,13 +2457,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8698);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pingo' AS nick WHERE 'Pingo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Pingo'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Pingo'),
    0,
@@ -2336,7 +2471,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6281);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Pingo'),
    1,
@@ -2345,13 +2480,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8210);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2359,7 +2494,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6681);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2368,13 +2503,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8551);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2382,7 +2517,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6873);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2391,13 +2526,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8553);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Bonzo'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -2405,7 +2540,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6497);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -2414,13 +2549,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    9102);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2428,7 +2563,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6778);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2437,13 +2572,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8795);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    8
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2451,7 +2586,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6637);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2460,13 +2595,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8631);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2474,7 +2609,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6667);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2483,32 +2618,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8909);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Aaron\'s Party (Come Get It)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=4;
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2516,7 +2651,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7190);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2525,13 +2660,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8806);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2539,7 +2674,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6818);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2548,13 +2683,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8630);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2562,7 +2697,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7492);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2571,13 +2706,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8462);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2585,7 +2720,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7135);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2594,13 +2729,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8913);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2608,7 +2743,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7539);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2617,13 +2752,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8869);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2631,7 +2766,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7486);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2640,13 +2775,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8824);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Bonzo'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -2654,7 +2789,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7116);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    4, 0,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -2663,32 +2798,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8847);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Remember You'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=5;
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -2696,7 +2831,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4624);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -2705,13 +2840,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8607);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2719,7 +2854,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4707);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2728,13 +2863,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8978);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2742,7 +2877,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4620);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2751,13 +2886,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8696);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2765,7 +2900,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4811);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2774,13 +2909,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8846);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2788,7 +2923,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4891);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2797,32 +2932,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8798);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=6;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2830,7 +2965,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8290);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2839,13 +2974,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8658);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2853,7 +2988,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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2862,13 +2997,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8760);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2876,7 +3011,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8421);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2885,13 +3020,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8744);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2899,7 +3034,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8756);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2908,32 +3043,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8772);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    7, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('www.blonde girl (MOMO Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=7;
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    7, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    7, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2941,7 +3076,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6705);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    7, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2950,13 +3085,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8859);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    7, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    7, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2964,7 +3099,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6855);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    7, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2973,13 +3108,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8787);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2987,7 +3122,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6863);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2996,34 +3131,34 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8954);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    8,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    8, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    8, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    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 7') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7') AND 
   round=8;
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    8, 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    8, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -3031,7 +3166,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7821);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    8, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -3040,13 +3175,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    9608);
 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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    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 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -3054,7 +3189,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7845);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 7'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 7'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,