Change all instances of "name" to something more sane, to get easy natural joins.

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index 1a55afb..5773f13 100644 (file)
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -26,14 +26,14 @@ while (<>) {
                $mix =~ s/Euromix/EuroMix/;
 
                print "INSERT INTO tournaments \n";
-               print "  (season, name, country, location, \"date\", machine, scoringsystem) VALUES (\n";
-               print "    (SELECT season FROM seasons WHERE name='$season'),\n";
+               print "  (season, tournamentname, country, location, \"date\", machine, scoringsystem) VALUES (\n";
+               print "    (SELECT season FROM seasons WHERE seasonname='$season'),\n";
                print "    '$name',\n";
-               print "    (SELECT country FROM countries WHERE name='$country'),\n";
+               print "    (SELECT country FROM countries WHERE countryname='$country'),\n";
                print "    '$location',\n";
                printf "    '%s',\n", Date::Manip::UnixDate($date, '%Y-%m-%d');
-               print "    (SELECT machine FROM machines WHERE name='$mix'),\n";
-               print "    (SELECT scoringsystem FROM scoringsystems WHERE name='$system')\n";
+               print "    (SELECT machine FROM machines WHERE machinename='$mix'),\n";
+               print "    (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='$system')\n";
                print ");\n";
        }
        
@@ -45,7 +45,7 @@ while (<>) {
                printf "INSERT INTO players SELECT nextval('players_player_seq') AS player, '%s' AS nick WHERE '%s' NOT IN ( SELECT nick FROM players );\n", $player, $player;
                
                printf "INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (\n";
-               print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
+               print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
                print "   $round, $group,\n";
                print "   (SELECT player FROM players WHERE nick='$player'),\n";
                print "   $position\n";
@@ -60,7 +60,7 @@ while (<>) {
                # random songs
                while (s/<td \s* class=dtdm> (\d+) <\/td>//x) {
                        printf "INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (\n";
-                       print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
+                       print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
                        print "   $round, $group,\n";
                        print "   (SELECT player FROM players WHERE nick='$player'),\n";
                        print "   $i,\n";
@@ -77,7 +77,7 @@ while (<>) {
                        $song =~ s/'/\\'/g;
                
                        printf "INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (\n";
-                       print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
+                       print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
                        print "   $round, $group,\n";
                        print "   (SELECT player FROM players WHERE nick='$player'),\n";
                        print "   $i,\n";
@@ -94,7 +94,7 @@ while (<>) {
 
                print "INSERT INTO rounds (tournament, round, randomsongs, chosensongs) \n";
                print "  VALUES (\n";
-               print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
+               print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
                print "   $round,\n";
                print "   0, 0);\n";  # Don't worry, we'll fix it later :-P
        }
@@ -108,7 +108,7 @@ while (<>) {
                $position = 1;
 
                print "INSERT INTO groups (tournament, round, parallel) VALUES (\n";
-               print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
+               print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
                print "   $round, $group);\n";
 
                # Find the random songs, if any
@@ -121,7 +121,7 @@ while (<>) {
                        push @rsongs, $song;
 
                        print "INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (\n";
-                       print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
+                       print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
                        print "   $round, $group,\n";
                        print "   (SELECT song FROM songs WHERE lower(title)=lower('$song'))\n";
                        print ");\n";
@@ -129,14 +129,14 @@ while (<>) {
 
                # Correct the random songs in the table
                printf "UPDATE rounds SET randomsongs=%u WHERE \n", scalar @rsongs;
-               print "  tournament=(SELECT tournament FROM tournaments WHERE name='$name') AND \n";
+               print "  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='$name') AND \n";
                print "  round=$round;\n";
        }
 
        # Header for chosen song (evil)
        if (/<th \s* class=dthp \s* colspan=2>&nbsp<\/th>/x) {
                printf "UPDATE rounds SET chosensongs=1 WHERE \n";
-               print "  tournament=(SELECT tournament FROM tournaments WHERE name='$name') AND \n";
+               print "  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='$name') AND \n";
                print "  round=$round;\n";
        }
 

diff --git a/sql/basic-data.sql b/sql/basic-data.sql
index ca0f93c..d627b1c 100644 (file)
--- a/sql/basic-data.sql
+++ b/sql/basic-data.sql
@@ -1,9 +1,9 @@
 -- vim:set tw=0:
-INSERT INTO machines (name) VALUES ('Dancing Stage EuroMix 2');
-INSERT INTO scoringsystems (name) VALUES ('10K Machine score');
-INSERT INTO countries (name) VALUES ('Europe');
-INSERT INTO countries (name) VALUES ('Norway');
-INSERT INTO seasons (name) VALUES ('European Cup');
-INSERT INTO seasons (name) VALUES ('Challenge Cup 2004');
-INSERT INTO seasons (name) VALUES ('Challenge Cup 2005');
+INSERT INTO machines (machinename) VALUES ('Dancing Stage EuroMix 2');
+INSERT INTO scoringsystems (scoringsystemname) VALUES ('10K Machine score');
+INSERT INTO countries (countryname) VALUES ('Europe');
+INSERT INTO countries (countryname) VALUES ('Norway');
+INSERT INTO seasons (seasonname) VALUES ('European Cup');
+INSERT INTO seasons (seasonname) VALUES ('Challenge Cup 2004');
+INSERT INTO seasons (seasonname) VALUES ('Challenge Cup 2005');
 

diff --git a/sql/cc04/cc1-04.sql b/sql/cc04/cc1-04.sql
index 5a1d89e..d7fd99b 100644 (file)
--- a/sql/cc04/cc1-04.sql
+++ b/sql/cc04/cc1-04.sql
@@ -1,47 +1,47 @@
 begin;
 INSERT INTO tournaments 
-  (season, name, country, location, "date", machine, scoringsystem) VALUES (
-    (SELECT season FROM seasons WHERE name='Challenge Cup 2004'),
+  (season, tournamentname, country, location, "date", machine, scoringsystem) VALUES (
+    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004'),
     'Challenge Cup 1 - 2004',
-    (SELECT country FROM countries WHERE name='Norway'),
+    (SELECT country FROM countries WHERE countryname='Norway'),
     'Oslo Bowling',
     '2004-03-07',
-    (SELECT machine FROM machines WHERE name='Dancing Stage EuroMix 2'),
-    (SELECT scoringsystem FROM scoringsystems WHERE name='10K Machine score')
+    (SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),
+    (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='10K Machine score')
 );
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Candy'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -49,7 +49,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7505);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -57,7 +57,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7204);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -66,13 +66,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7952);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -80,7 +80,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5104);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -88,7 +88,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6302);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -97,13 +97,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6940);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -111,7 +111,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7279);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -119,7 +119,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7205);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
@@ -128,13 +128,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7649);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Slusk' AS nick WHERE 'Slusk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    0,
@@ -142,7 +142,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5544);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    1,
@@ -150,7 +150,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6465);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    2,
@@ -159,13 +159,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7619);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -173,7 +173,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6968);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -181,7 +181,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8480);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    2,
@@ -189,33 +189,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7702);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('www.blonde girl (MOMO Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Let Them Move'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Golddragon' AS nick WHERE 'Golddragon' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    0,
@@ -223,7 +223,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5536);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    1,
@@ -231,7 +231,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5202);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    2,
@@ -240,13 +240,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6905);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jallaman' AS nick WHERE 'Jallaman' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    0,
@@ -254,7 +254,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5390);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    1,
@@ -262,7 +262,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4746);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2,
@@ -271,13 +271,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8151);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -285,7 +285,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6849);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -293,7 +293,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6513);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -302,13 +302,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8242);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Matsi' AS nick WHERE 'Matsi' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    0,
@@ -316,7 +316,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5675);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    1,
@@ -324,7 +324,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4952);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    2,
@@ -333,13 +333,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7354);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -347,7 +347,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6720);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -355,7 +355,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6243);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -363,33 +363,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8513);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Nori Nori Nori'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'tombot' AS nick WHERE 'tombot' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    0,
@@ -397,7 +397,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4876);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    1,
@@ -405,7 +405,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6868);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    2,
@@ -414,13 +414,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6622);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ink' AS nick WHERE 'Ink' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    0,
@@ -428,7 +428,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4458);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    1,
@@ -436,7 +436,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4053);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    2,
@@ -445,13 +445,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5636);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -459,7 +459,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5985);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -467,7 +467,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7459);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -476,13 +476,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7837);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Spinnvill' AS nick WHERE 'Spinnvill' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    0,
@@ -490,7 +490,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6173);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    1,
@@ -498,7 +498,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 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    2,
@@ -507,13 +507,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8031);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Telc' AS nick WHERE 'Telc' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    0,
@@ -521,7 +521,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5563);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    1,
@@ -529,7 +529,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7290);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    2,
@@ -538,13 +538,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7467);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -552,7 +552,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6545);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -560,7 +560,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8636);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -568,33 +568,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7666);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -602,7 +602,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5235);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -610,7 +610,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5049);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -619,13 +619,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7172);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Auran' AS nick WHERE 'Auran' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    0,
@@ -633,7 +633,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4330);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    1,
@@ -641,7 +641,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3698);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    2,
@@ -650,13 +650,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    4459);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Advena' AS nick WHERE 'Advena' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    0,
@@ -664,7 +664,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5233);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    1,
@@ -672,7 +672,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5076);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    2,
@@ -681,13 +681,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7787);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -695,7 +695,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7143);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -703,7 +703,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7727);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -712,13 +712,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7700);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -726,7 +726,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4862);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -734,7 +734,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6848);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -743,13 +743,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6668);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -757,7 +757,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8288);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -765,7 +765,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8252);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -773,33 +773,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7566);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('DXY!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'x3mnrj' AS nick WHERE 'x3mnrj' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    0,
@@ -807,7 +807,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6004);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    1,
@@ -815,7 +815,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5699);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    2,
@@ -824,13 +824,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6712);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Octu' AS nick WHERE 'Octu' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    0,
@@ -838,7 +838,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5789);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    1,
@@ -846,7 +846,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 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    2,
@@ -855,13 +855,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6321);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Electus' AS nick WHERE 'Electus' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    0,
@@ -869,7 +869,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6256);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    1,
@@ -877,7 +877,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6376);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    2,
@@ -886,13 +886,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7992);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Purity' AS nick WHERE 'Purity' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    0,
@@ -900,7 +900,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6498);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    1,
@@ -908,7 +908,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6584);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    2,
@@ -917,13 +917,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8079);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick WHERE 'Havok' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    0,
@@ -931,7 +931,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6482);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    1,
@@ -939,7 +939,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5994);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    2,
@@ -948,13 +948,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7576);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    0,
@@ -962,7 +962,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6130);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    1,
@@ -970,7 +970,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5705);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    2,
@@ -978,33 +978,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7935);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('Memories'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dexter' AS nick WHERE 'Dexter' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    0,
@@ -1012,7 +1012,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6276);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    1,
@@ -1020,7 +1020,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7296);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    2,
@@ -1029,13 +1029,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8433);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -1043,7 +1043,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6171);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -1051,7 +1051,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6554);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -1060,13 +1060,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7315);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tha Dragon' AS nick WHERE 'Tha Dragon' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    0,
@@ -1074,7 +1074,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5269);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    1,
@@ -1082,7 +1082,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5511);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    2,
@@ -1091,13 +1091,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7357);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1105,7 +1105,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6425);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1113,7 +1113,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8002);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1122,13 +1122,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8452);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1136,7 +1136,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6501);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1144,7 +1144,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8519);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1153,13 +1153,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8529);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -1167,7 +1167,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6503);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -1175,7 +1175,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7729);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -1184,37 +1184,37 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8248);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova Primeval'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -1222,7 +1222,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5962);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -1230,7 +1230,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5704);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -1239,13 +1239,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8098);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -1253,7 +1253,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7436);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -1261,7 +1261,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6489);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -1270,13 +1270,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8489);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1284,7 +1284,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7619);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -1292,7 +1292,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6603);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -1301,13 +1301,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8445);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1315,7 +1315,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8436);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1323,7 +1323,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6567);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -1332,13 +1332,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8425);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Purity' AS nick WHERE 'Purity' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    0,
@@ -1346,7 +1346,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7441);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    1,
@@ -1354,7 +1354,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6068);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    2,
@@ -1363,13 +1363,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8424);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1377,7 +1377,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8253);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1385,7 +1385,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6456);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -1393,33 +1393,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8595);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('My Summer Love'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Living in America'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick WHERE 'Havok' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    0,
@@ -1427,7 +1427,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6396);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    1,
@@ -1435,7 +1435,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    0);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    2,
@@ -1444,13 +1444,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    3161);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jallaman' AS nick WHERE 'Jallaman' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    0,
@@ -1458,7 +1458,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6943);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    1,
@@ -1466,7 +1466,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4881);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2,
@@ -1475,13 +1475,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    0);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1489,7 +1489,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7235);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1497,7 +1497,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6126);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -1506,13 +1506,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8160);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1520,7 +1520,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6370);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1528,7 +1528,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5386);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1537,13 +1537,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8107);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1551,7 +1551,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7691);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1559,7 +1559,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6540);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -1568,13 +1568,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8190);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1582,7 +1582,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7777);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1590,7 +1590,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6359);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1598,33 +1598,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7800);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Caribbean Queen'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -1632,7 +1632,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5974);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -1640,7 +1640,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7951);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
@@ -1649,13 +1649,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8229);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -1663,7 +1663,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5953);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -1671,7 +1671,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7738);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -1680,13 +1680,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7874);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Electus' AS nick WHERE 'Electus' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    0,
@@ -1694,7 +1694,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5444);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    1,
@@ -1702,7 +1702,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7090);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    2,
@@ -1711,13 +1711,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7249);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Spinnvill' AS nick WHERE 'Spinnvill' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    0,
@@ -1725,7 +1725,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5540);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    1,
@@ -1733,7 +1733,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6936);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    2,
@@ -1742,13 +1742,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7821);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1756,7 +1756,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6206);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1764,7 +1764,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8084);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -1773,13 +1773,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7733);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -1787,7 +1787,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5836);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -1795,7 +1795,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8046);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    2,
@@ -1804,32 +1804,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8508);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=3;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1837,7 +1837,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8251);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1846,13 +1846,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8380);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1860,7 +1860,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7881);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1869,13 +1869,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8316);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1883,7 +1883,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8295);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -1892,13 +1892,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8678);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1906,7 +1906,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8092);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1915,13 +1915,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8680);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -1929,7 +1929,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7806);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -1938,13 +1938,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7815);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1952,7 +1952,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8414);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1961,13 +1961,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8180);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1975,7 +1975,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8406);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1984,13 +1984,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8260);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    8
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1998,7 +1998,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8441);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2007,13 +2007,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8539);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    9
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -2021,7 +2021,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8489);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -2030,32 +2030,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8381);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Never Gonna Make (Factory Team Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=4;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2063,7 +2063,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6595);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2072,13 +2072,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8588);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2086,7 +2086,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6301);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2095,13 +2095,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8706);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2109,7 +2109,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6654);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2118,13 +2118,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8693);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2132,7 +2132,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6596);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2141,13 +2141,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7821);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -2155,7 +2155,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6766);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -2164,13 +2164,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8379);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2178,7 +2178,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6433);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2187,13 +2187,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8563);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2201,7 +2201,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6803);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2210,32 +2210,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8351);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Memories'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=5;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2243,7 +2243,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7245);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2252,13 +2252,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8452);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -2266,7 +2266,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6701);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -2275,13 +2275,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8960);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2289,7 +2289,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7521);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2298,13 +2298,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8615);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2312,7 +2312,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7227);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2321,13 +2321,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8541);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2335,7 +2335,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6819);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2344,32 +2344,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8853);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Groove 2001'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=6;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2377,7 +2377,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6663);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2386,13 +2386,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8637);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2400,7 +2400,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6662);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2409,13 +2409,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8044);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2423,7 +2423,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6810);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2432,13 +2432,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8506);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2446,7 +2446,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6759);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2455,32 +2455,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8544);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=7;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2488,7 +2488,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8391);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2497,13 +2497,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8130);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2511,7 +2511,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    9537);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2520,13 +2520,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8352);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2534,7 +2534,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    9032);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2543,32 +2543,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8623);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Never Let You Down'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=8;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
   round=8;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2576,7 +2576,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6678);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2585,13 +2585,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8781);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2599,7 +2599,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6827);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,

diff --git a/sql/cc04/cc2-04.sql b/sql/cc04/cc2-04.sql
index e50ba53..61dea24 100644 (file)
--- a/sql/cc04/cc2-04.sql
+++ b/sql/cc04/cc2-04.sql
@@ -1,47 +1,47 @@
 begin;
 INSERT INTO tournaments 
-  (season, name, country, location, "date", machine, scoringsystem) VALUES (
-    (SELECT season FROM seasons WHERE name='Challenge Cup 2004'),
+  (season, tournamentname, country, location, "date", machine, scoringsystem) VALUES (
+    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004'),
     'Challenge Cup 2',
-    (SELECT country FROM countries WHERE name='Norway'),
+    (SELECT country FROM countries WHERE countryname='Norway'),
     'Kino 1 Sandvika',
     '2004-04-25',
-    (SELECT machine FROM machines WHERE name='Dancing Stage EuroMix 2'),
-    (SELECT scoringsystem FROM scoringsystems WHERE name='10K Machine score')
+    (SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),
+    (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='10K Machine score')
 );
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Memories'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('era (nostalmix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bush' AS nick WHERE 'Bush' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    0,
@@ -49,7 +49,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4327);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    1,
@@ -57,7 +57,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4251);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    2,
@@ -66,13 +66,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5910);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -80,7 +80,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5476);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -88,7 +88,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6242);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -97,13 +97,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7977);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -111,7 +111,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6224);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -119,7 +119,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6659);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -128,13 +128,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7572);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -142,7 +142,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6530);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -150,7 +150,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6702);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -159,13 +159,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7631);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -173,7 +173,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7561);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -181,7 +181,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7616);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -189,33 +189,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6839);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Vanity Angel'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dabi' AS nick WHERE 'Dabi' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    0,
@@ -223,7 +223,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3973);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1,
@@ -231,7 +231,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3845);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    2,
@@ -240,13 +240,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6484);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -254,7 +254,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7827);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -262,7 +262,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6329);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -271,13 +271,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8032);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -285,7 +285,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7830);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -293,7 +293,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6336);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -302,13 +302,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7544);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -316,7 +316,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8058);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -324,7 +324,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7672);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -333,13 +333,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8167);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -347,7 +347,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8651);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -355,7 +355,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8426);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -363,33 +363,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8392);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('D2R'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Raazu' AS nick WHERE 'Raazu' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    0,
@@ -397,7 +397,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5012);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    1,
@@ -405,7 +405,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4014);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    2,
@@ -414,13 +414,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6940);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    0,
@@ -428,7 +428,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5541);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    1,
@@ -436,7 +436,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    0);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    2,
@@ -445,13 +445,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7524);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick WHERE 'Havok' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    0,
@@ -459,7 +459,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4355);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    1,
@@ -467,7 +467,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6284);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    2,
@@ -476,13 +476,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    4399);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -490,7 +490,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5953);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -498,7 +498,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8076);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -507,13 +507,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7735);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -521,7 +521,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6044);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -529,7 +529,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8303);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -538,32 +538,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8625);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Raazu' AS nick WHERE 'Raazu' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Raazu'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Raazu'),
    0,
@@ -571,7 +571,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7286);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Raazu'),
    1,
@@ -580,13 +580,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7657);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -594,7 +594,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7814);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -603,13 +603,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7986);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Olemann'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -617,7 +617,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7747);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -626,13 +626,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7721);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -640,7 +640,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8215);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -649,13 +649,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8053);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -663,7 +663,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8529);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -672,13 +672,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8570);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -686,7 +686,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8478);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -695,13 +695,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8174);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -709,7 +709,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8743);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -718,13 +718,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8447);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    8
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -732,7 +732,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8695);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -741,13 +741,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8440);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    9
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -755,7 +755,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8798);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    2, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -764,32 +764,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8500);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=3;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -797,7 +797,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7698);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -806,13 +806,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7874);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -820,7 +820,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8241);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -829,13 +829,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8574);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -843,7 +843,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8139);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -852,13 +852,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8403);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -866,7 +866,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8661);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -875,13 +875,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8456);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -889,7 +889,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8272);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -898,13 +898,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8353);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -912,7 +912,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8783);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -921,13 +921,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8673);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -935,7 +935,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8633);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -944,32 +944,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8584);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('5, 6, 7, 8'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=4;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -977,7 +977,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5706);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -986,13 +986,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8583);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1000,7 +1000,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5726);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1009,13 +1009,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8056);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1023,7 +1023,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5553);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -1032,13 +1032,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8525);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1046,7 +1046,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5822);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1055,13 +1055,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8460);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1069,7 +1069,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5922);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1078,32 +1078,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8725);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('www.blonde girl (MOMO Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=5;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1111,7 +1111,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 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -1120,13 +1120,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8236);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1134,7 +1134,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6742);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1143,13 +1143,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8728);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1157,7 +1157,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6605);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1166,13 +1166,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8534);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1180,7 +1180,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6689);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1189,32 +1189,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8828);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=6;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1222,7 +1222,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7343);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1231,13 +1231,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8871);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1245,7 +1245,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7152);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1254,13 +1254,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8718);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1268,7 +1268,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6908);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1277,32 +1277,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    9276);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
   round=7;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1310,7 +1310,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8662);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1319,13 +1319,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8776);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1333,7 +1333,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8676);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,

diff --git a/sql/cc04/cc3-04.sql b/sql/cc04/cc3-04.sql
index 7f01806..606bbdd 100644 (file)
--- a/sql/cc04/cc3-04.sql
+++ b/sql/cc04/cc3-04.sql
@@ -1,47 +1,47 @@
 begin;
 INSERT INTO tournaments 
-  (season, name, country, location, "date", machine, scoringsystem) VALUES (
-    (SELECT season FROM seasons WHERE name='Challenge Cup 2004'),
+  (season, tournamentname, country, location, "date", machine, scoringsystem) VALUES (
+    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004'),
     'Challenge Cup 3',
-    (SELECT country FROM countries WHERE name='Norway'),
+    (SELECT country FROM countries WHERE countryname='Norway'),
     'Askim',
     '2004-05-23',
-    (SELECT machine FROM machines WHERE name='Dancing Stage EuroMix 2'),
-    (SELECT scoringsystem FROM scoringsystems WHERE name='10K Machine score')
+    (SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),
+    (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='10K Machine score')
 );
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ted Kristian' AS nick WHERE 'Ted Kristian' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    0,
@@ -49,7 +49,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4475);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    1,
@@ -57,7 +57,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5340);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    2,
@@ -66,13 +66,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7032);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pål Andre' AS nick WHERE 'Pål Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    0,
@@ -80,7 +80,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4760);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    1,
@@ -88,7 +88,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5946);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    2,
@@ -97,13 +97,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5875);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -111,7 +111,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5734);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -119,7 +119,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7095);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
@@ -128,13 +128,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8047);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -142,7 +142,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6356);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -150,7 +150,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7560);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -159,13 +159,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7720);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -173,7 +173,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6480);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -181,7 +181,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7646);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -189,33 +189,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7702);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jim Andre' AS nick WHERE 'Jim Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    0,
@@ -223,7 +223,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5809);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    1,
@@ -231,7 +231,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5338);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    2,
@@ -240,13 +240,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6198);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Andre' AS nick WHERE 'Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    0,
@@ -254,7 +254,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4264);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    1,
@@ -262,7 +262,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3773);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    2,
@@ -271,13 +271,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5277);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dabi' AS nick WHERE 'Dabi' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    0,
@@ -285,7 +285,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5388);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1,
@@ -293,7 +293,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5249);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    2,
@@ -302,13 +302,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7228);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -316,7 +316,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6226);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -324,7 +324,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6708);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -333,13 +333,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6445);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -347,7 +347,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7353);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -355,7 +355,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7214);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -363,33 +363,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6791);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('5, 6, 7, 8'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Glukko' AS nick WHERE 'Glukko' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    0,
@@ -397,7 +397,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4346);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    1,
@@ -405,7 +405,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3531);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    2,
@@ -414,13 +414,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5270);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ole-Christian' AS nick WHERE 'Ole-Christian' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ole-Christian'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ole-Christian'),
    0,
@@ -428,7 +428,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    0);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ole-Christian'),
    1,
@@ -437,13 +437,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    0);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zyc' AS nick WHERE 'Zyc' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    0,
@@ -451,7 +451,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4898);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    1,
@@ -459,7 +459,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3333);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    2,
@@ -468,13 +468,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5149);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -482,7 +482,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5189);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -490,7 +490,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4391);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -499,13 +499,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7298);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -513,7 +513,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5822);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -521,7 +521,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8510);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -529,33 +529,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8504);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Look to the sky'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Th0rny' AS nick WHERE 'Th0rny' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    0,
@@ -563,7 +563,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5789);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    1,
@@ -571,7 +571,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6214);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    2,
@@ -580,13 +580,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8348);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -594,7 +594,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5618);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -602,7 +602,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6326);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -611,13 +611,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8278);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Matsi' AS nick WHERE 'Matsi' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    0,
@@ -625,7 +625,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4525);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    1,
@@ -633,7 +633,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6008);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    2,
@@ -642,13 +642,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7040);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    0,
@@ -656,7 +656,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5716);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    1,
@@ -664,7 +664,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6169);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    2,
@@ -673,13 +673,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7682);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -687,7 +687,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6023);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -695,7 +695,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6628);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -703,33 +703,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8179);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Eruanna' AS nick WHERE 'Eruanna' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    0,
@@ -737,7 +737,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5410);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    1,
@@ -745,7 +745,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4383);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    2,
@@ -754,13 +754,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6040);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Advena' AS nick WHERE 'Advena' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Advena'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Advena'),
    0,
@@ -768,7 +768,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6729);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Advena'),
    1,
@@ -776,7 +776,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7069);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Advena'),
    2,
@@ -785,13 +785,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7624);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tassen' AS nick WHERE 'Tassen' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tassen'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tassen'),
    0,
@@ -799,7 +799,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6911);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tassen'),
    1,
@@ -807,7 +807,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6693);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tassen'),
    2,
@@ -816,13 +816,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7298);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -830,7 +830,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8252);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -838,7 +838,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7357);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -847,13 +847,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7321);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Olemann'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -861,7 +861,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7471);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -869,7 +869,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7919);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -878,13 +878,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8043);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -892,7 +892,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8546);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -900,7 +900,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7881);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -908,33 +908,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7740);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('The Reflex'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bonzo' AS nick WHERE 'Bonzo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -942,7 +942,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4564);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -950,7 +950,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6212);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Bonzo'),
    2,
@@ -959,13 +959,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7211);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gollum' AS nick WHERE 'Gollum' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Gollum'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Gollum'),
    0,
@@ -973,7 +973,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3139);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Gollum'),
    1,
@@ -981,7 +981,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5655);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Gollum'),
    2,
@@ -990,13 +990,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6369);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hugo'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hugo'),
    0,
@@ -1004,7 +1004,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6888);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hugo'),
    1,
@@ -1012,7 +1012,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8521);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hugo'),
    2,
@@ -1021,13 +1021,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7439);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Auran' AS nick WHERE 'Auran' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Auran'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Auran'),
    0,
@@ -1035,7 +1035,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3300);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Auran'),
    1,
@@ -1043,7 +1043,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3813);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Auran'),
    2,
@@ -1052,13 +1052,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    4377);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Smiph'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -1066,7 +1066,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5696);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -1074,7 +1074,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7569);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -1083,13 +1083,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7703);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -1097,7 +1097,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5989);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -1105,7 +1105,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7689);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -1114,37 +1114,37 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8064);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Love This Feelin\''))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('I Want You To Want Me'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -1152,7 +1152,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5825);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -1160,7 +1160,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4790);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -1169,13 +1169,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7961);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -1183,7 +1183,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6533);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -1191,7 +1191,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5504);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
@@ -1200,13 +1200,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7989);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1214,7 +1214,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7101);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1222,7 +1222,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5725);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -1231,13 +1231,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8713);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Th0rny' AS nick WHERE 'Th0rny' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    0,
@@ -1245,7 +1245,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6377);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    1,
@@ -1253,7 +1253,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4994);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    2,
@@ -1262,13 +1262,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8140);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1276,7 +1276,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7140);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1284,7 +1284,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5515);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -1293,13 +1293,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8310);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1307,7 +1307,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6447);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1315,7 +1315,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5518);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1323,33 +1323,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8271);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Ecstasy'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dabi' AS nick WHERE 'Dabi' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    0,
@@ -1357,7 +1357,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4394);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1,
@@ -1365,7 +1365,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4295);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    2,
@@ -1374,13 +1374,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6188);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -1388,7 +1388,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5898);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -1396,7 +1396,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5857);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -1405,13 +1405,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8053);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -1419,7 +1419,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5873);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -1427,7 +1427,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5881);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -1436,13 +1436,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8283);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Stream'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -1450,7 +1450,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5820);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -1458,7 +1458,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6437);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -1467,13 +1467,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8232);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1481,7 +1481,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6509);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1489,7 +1489,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6858);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -1498,13 +1498,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8420);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Hugo'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Hugo'),
    0,
@@ -1512,7 +1512,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6424);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Hugo'),
    1,
@@ -1520,7 +1520,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6499);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 2,
    (SELECT player FROM players WHERE nick='Hugo'),
    2,
@@ -1528,33 +1528,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8601);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Stomp'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zyc' AS nick WHERE 'Zyc' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    0,
@@ -1562,7 +1562,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3711);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    1,
@@ -1570,7 +1570,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3767);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    2,
@@ -1579,13 +1579,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    0);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -1593,7 +1593,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8621);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -1601,7 +1601,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5773);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -1610,13 +1610,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6811);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Haggar'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1624,7 +1624,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8853);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1632,7 +1632,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5898);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -1641,13 +1641,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8750);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -1655,7 +1655,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6836);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -1663,7 +1663,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5513);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -1672,13 +1672,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7941);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1686,7 +1686,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8490);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1694,7 +1694,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6341);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1703,13 +1703,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8630);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1717,7 +1717,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8781);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1725,7 +1725,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6211);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -1734,32 +1734,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8384);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Memories'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
   round=3;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -1767,7 +1767,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6565);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -1776,13 +1776,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7765);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1790,7 +1790,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6520);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1799,13 +1799,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8489);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1813,7 +1813,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7553);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1822,13 +1822,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8621);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1836,7 +1836,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7015);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1845,13 +1845,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8627);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
    3, 0,
    (SELECT player FROM players WHERE nick='Hugo'),
    0,
@@ -1859,7 +1859,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7258);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 3'),