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

diff --git a/sql/cc04/cc2-04.sql b/sql/cc04/cc2-04.sql
index e50ba53..61dea24 100644
--- 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,