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

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

diff --git a/sql/cc04/cc1-04.sql b/sql/cc04/cc1-04.sql
index 5a1d89ebe17c87750b91368d68c6ee7cb90f6119..d7fd99b4c2941ef139462f7720253010f2204a12 100644 (file)
--- a/sql/cc04/cc1-04.sql
+++ b/sql/cc04/cc1-04.sql
@@ -1,47 +1,47 @@
 begin;
 INSERT INTO tournaments 
 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',
     'Challenge Cup 1 - 2004',

-    (SELECT country FROM countries WHERE name='Norway'),
+    (SELECT country FROM countries WHERE countryname='Norway'),

     'Oslo Bowling',
     '2004-03-07',
     '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 (
 );
 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 (
    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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    '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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    '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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    '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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    '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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    '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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    '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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    '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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    '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,
    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 (
    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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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 (
    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 
    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 
   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 (
   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 (
    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,
    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 (
    '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,
    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 (
    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 (
    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,
    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 (
    '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,
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,