DDR Europe tournament parser now by default sets all players to Norway. Syntax fixes...

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index 3f75c41ec2926a3728ba69161a180cfece04ae7e..7fce29ea233309a68161f55e363a8be832aadb0e 100644 (file)
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -1,4 +1,4 @@
-h#! /usr/bin/perl
+#! /usr/bin/perl
 use strict;
 use warnings;
 use Date::Manip;
@@ -27,7 +27,7 @@ while (<>) {
 
                print "INSERT INTO tournaments \n";
                print "  (season, tournamentname, country, location, \"date\", machine, scoringsystem) VALUES (\n";
-               print "    (SELECT season FROM seasons WHERE seasonname='$season'  AND season=( SELECT season FROM seasons WHERE seasonname='$season' ),\n";
+               print "    (SELECT season FROM seasons WHERE seasonname='$season' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
                print "    '$name',\n";
                print "    (SELECT country FROM countries WHERE countryname='$country'),\n";
                print "    '$location',\n";
@@ -74,7 +74,7 @@ while (<>) {
                        $song =~ s/'/\\'/g;
                
                        printf "INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (\n";
-                       print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'  AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
+                       print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
                        print "   $round, $group,\n";
                        print "   (SELECT player FROM players WHERE nick='$player'),\n";
                        print "   $i,\n";
@@ -146,7 +146,7 @@ while (<>) {
                $points = 'NULL' unless defined($points);
 
                # Woot, evil
-               printf "INSERT INTO players SELECT nextval('players_player_seq') AS player, '%s' AS nick WHERE '%s' NOT IN ( SELECT nick FROM players );\n", $nick, $nick;
+               printf "INSERT INTO players SELECT nextval('players_player_seq') AS player, '%s' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE '%s' NOT IN ( SELECT nick FROM players );\n", $nick, $nick;
                
                print "INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (\n";
                print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
@@ -165,7 +165,7 @@ while (<>) {
                $points = 'NULL' unless defined($points);
 
                # Woot, evil
-               printf "INSERT INTO players SELECT nextval('players_player_seq') AS player, '%s' AS nick WHERE '%s' NOT IN ( SELECT nick FROM players );\n", $nick, $nick;
+               printf "INSERT INTO players SELECT nextval('players_player_seq') AS player, '%s' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE '%s' NOT IN ( SELECT nick FROM players );\n", $nick, $nick;
                
                print "INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (\n";
                print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";

diff --git a/sql/cc04/cc1-04.sql b/sql/cc04/cc1-04.sql
index 94b715e4b20bbe15ae01b89b84d5d83ca66c3456..5d8cae30a1ab72e6e7b989ecf3a147a64ed0f2aa 100644 (file)
--- a/sql/cc04/cc1-04.sql
+++ b/sql/cc04/cc1-04.sql
@@ -1,7 +1,7 @@
 begin;
 INSERT INTO tournaments 
   (season, tournamentname, country, location, "date", machine, scoringsystem) VALUES (
-    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004'),
+    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
     'Challenge Cup 1 - 2004',
     (SELECT country FROM countries WHERE countryname='Norway'),
     'Oslo Bowling',
@@ -9,242 +9,242 @@ INSERT INTO tournaments
     (SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),
     (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='10K Machine score')
 );
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1,
    (SELECT player FROM players WHERE nick='Snute'),
    100);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2,
    (SELECT player FROM players WHERE nick='DufF'),
    90);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3,
    (SELECT player FROM players WHERE nick='OJK'),
    81);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    73);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5,
    (SELECT player FROM players WHERE nick='Tom'),
    66);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6,
    (SELECT player FROM players WHERE nick='Snofox'),
    60);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7,
    (SELECT player FROM players WHERE nick='RiChY'),
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8,
    (SELECT player FROM players WHERE nick='Haggar'),
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    9,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    48);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    10,
    (SELECT player FROM players WHERE nick='Daniil'),
    46);
-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 players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    11,
    (SELECT player FROM players WHERE nick='T|na'),
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    12,
    (SELECT player FROM players WHERE nick='Stream'),
    44);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Purity' AS nick WHERE 'Purity' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Purity' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Purity' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    13,
    (SELECT player FROM players WHERE nick='Purity'),
    43);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Spinnvill' AS nick WHERE 'Spinnvill' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Spinnvill' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Spinnvill' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    14,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    42);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jallaman' AS nick WHERE 'Jallaman' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jallaman' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Jallaman' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    15,
    (SELECT player FROM players WHERE nick='Jallaman'),
    41);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    16,
    (SELECT player FROM players WHERE nick='Smiph'),
    40);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Electus' AS nick WHERE 'Electus' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Electus' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Electus' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    17,
    (SELECT player FROM players WHERE nick='Electus'),
    39);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick WHERE 'Havok' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Havok' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    18,
    (SELECT player FROM players WHERE nick='Havok'),
    38);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dexter' AS nick WHERE 'Dexter' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dexter' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Dexter' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    19,
    (SELECT player FROM players WHERE nick='Dexter'),
    37);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    20,
    (SELECT player FROM players WHERE nick='Draconia'),
    36);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Advena' AS nick WHERE 'Advena' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Advena' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Advena' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    21,
    (SELECT player FROM players WHERE nick='Advena'),
    35);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Slusk' AS nick WHERE 'Slusk' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Slusk' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Slusk' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    22,
    (SELECT player FROM players WHERE nick='Slusk'),
    34);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Telc' AS nick WHERE 'Telc' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Telc' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Telc' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    23,
    (SELECT player FROM players WHERE nick='Telc'),
    33);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Matsi' AS nick WHERE 'Matsi' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Matsi' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Matsi' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    24,
    (SELECT player FROM players WHERE nick='Matsi'),
    32);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    25,
    (SELECT player FROM players WHERE nick='Olemann'),
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    26,
    (SELECT player FROM players WHERE nick='Duckling'),
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    27,
    (SELECT player FROM players WHERE nick='Ylini'),
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Golddragon' AS nick WHERE 'Golddragon' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Golddragon' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Golddragon' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    28,
    (SELECT player FROM players WHERE nick='Golddragon'),
    28);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'tombot' AS nick WHERE 'tombot' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'tombot' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'tombot' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    29,
    (SELECT player FROM players WHERE nick='tombot'),
    27);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'x3mnrj' AS nick WHERE 'x3mnrj' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'x3mnrj' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'x3mnrj' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    30,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    26);
-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 players SELECT nextval('players_player_seq') AS player, 'Tha Dragon' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Tha Dragon' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    31,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    25);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Octu' AS nick WHERE 'Octu' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Octu' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Octu' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    32,
    (SELECT player FROM players WHERE nick='Octu'),
    24);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ink' AS nick WHERE 'Ink' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ink' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Ink' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    33,
    (SELECT player FROM players WHERE nick='Ink'),
    23);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Auran' AS nick WHERE 'Auran' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Auran' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Auran' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    34,
    (SELECT player FROM players WHERE nick='Auran'),
    22);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Candy☆'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -252,7 +252,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7505);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -260,7 +260,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7204);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -268,13 +268,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7952);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -282,7 +282,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5104);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -290,7 +290,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6302);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -298,13 +298,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6940);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -312,7 +312,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7279);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -320,7 +320,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7205);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
@@ -328,13 +328,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7649);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    0,
@@ -342,7 +342,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5544);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    1,
@@ -350,7 +350,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6465);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    2,
@@ -358,13 +358,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7619);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -372,7 +372,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6968);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -380,7 +380,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8480);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    2,
@@ -388,32 +388,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7702);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('www.blonde girl (MOMO Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Let Them Move'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    0,
@@ -421,7 +421,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5536);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    1,
@@ -429,7 +429,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5202);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Golddragon'),
    2,
@@ -437,13 +437,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6905);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    0,
@@ -451,7 +451,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5390);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    1,
@@ -459,7 +459,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4746);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2,
@@ -467,13 +467,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8151);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -481,7 +481,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6849);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -489,7 +489,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6513);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -497,13 +497,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8242);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    0,
@@ -511,7 +511,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5675);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    1,
@@ -519,7 +519,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4952);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    2,
@@ -527,13 +527,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7354);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -541,7 +541,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6720);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -549,7 +549,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6243);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -557,32 +557,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8513);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Nori Nori Nori'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    0,
@@ -590,7 +590,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4876);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    1,
@@ -598,7 +598,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6868);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='tombot'),
    2,
@@ -606,13 +606,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6622);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    0,
@@ -620,7 +620,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4458);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    1,
@@ -628,7 +628,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4053);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Ink'),
    2,
@@ -636,13 +636,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    5636);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -650,7 +650,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5985);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -658,7 +658,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7459);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -666,13 +666,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7837);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    0,
@@ -680,7 +680,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6173);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    1,
@@ -688,7 +688,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7732);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    2,
@@ -696,13 +696,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8031);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    0,
@@ -710,7 +710,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5563);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    1,
@@ -718,7 +718,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7290);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Telc'),
    2,
@@ -726,13 +726,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7467);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -740,7 +740,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6545);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -748,7 +748,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8636);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -756,32 +756,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7666);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -789,7 +789,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5235);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -797,7 +797,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5049);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -805,13 +805,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7172);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    0,
@@ -819,7 +819,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4330);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    1,
@@ -827,7 +827,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3698);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Auran'),
    2,
@@ -835,13 +835,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    4459);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    0,
@@ -849,7 +849,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5233);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    1,
@@ -857,7 +857,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5076);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Advena'),
    2,
@@ -865,13 +865,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7787);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -879,7 +879,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7143);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -887,7 +887,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7727);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -895,13 +895,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7700);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -909,7 +909,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4862);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -917,7 +917,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6848);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -925,13 +925,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6668);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -939,7 +939,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8288);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -947,7 +947,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8252);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -955,32 +955,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7566);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('DXY!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    0,
@@ -988,7 +988,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6004);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    1,
@@ -996,7 +996,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5699);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='x3mnrj'),
    2,
@@ -1004,13 +1004,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6712);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    0,
@@ -1018,7 +1018,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5789);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    1,
@@ -1026,7 +1026,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4891);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Octu'),
    2,
@@ -1034,13 +1034,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6321);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    0,
@@ -1048,7 +1048,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6256);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    1,
@@ -1056,7 +1056,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6376);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Electus'),
    2,
@@ -1064,13 +1064,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7992);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    0,
@@ -1078,7 +1078,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6498);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    1,
@@ -1086,7 +1086,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6584);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Purity'),
    2,
@@ -1094,13 +1094,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8079);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    0,
@@ -1108,7 +1108,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6482);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    1,
@@ -1116,7 +1116,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5994);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Havok'),
    2,
@@ -1124,13 +1124,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7576);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    0,
@@ -1138,7 +1138,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6130);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    1,
@@ -1146,7 +1146,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5705);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Draconia'),
    2,
@@ -1154,32 +1154,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7935);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('Memories'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    0,
@@ -1187,7 +1187,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6276);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    1,
@@ -1195,7 +1195,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7296);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Dexter'),
    2,
@@ -1203,13 +1203,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8433);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -1217,7 +1217,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6171);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -1225,7 +1225,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6554);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -1233,13 +1233,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7315);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    0,
@@ -1247,7 +1247,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5269);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    1,
@@ -1255,7 +1255,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5511);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Tha Dragon'),
    2,
@@ -1263,13 +1263,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7357);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1277,7 +1277,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6425);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1285,7 +1285,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8002);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1293,13 +1293,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8452);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1307,7 +1307,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6501);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1315,7 +1315,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8519);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1323,13 +1323,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8529);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -1337,7 +1337,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6503);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -1345,7 +1345,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7729);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -1354,36 +1354,36 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8248);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova Primeval'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=2;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -1391,7 +1391,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5962);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -1399,7 +1399,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5704);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -1407,13 +1407,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8098);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -1421,7 +1421,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7436);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -1429,7 +1429,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6489);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -1437,13 +1437,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8489);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1451,7 +1451,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7619);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -1459,7 +1459,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6603);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -1467,13 +1467,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8445);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1481,7 +1481,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8436);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1489,7 +1489,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6567);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -1497,13 +1497,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8425);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    0,
@@ -1511,7 +1511,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7441);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    1,
@@ -1519,7 +1519,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6068);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='Purity'),
    2,
@@ -1527,13 +1527,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8424);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1541,7 +1541,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8253);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1549,7 +1549,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6456);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 1,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -1557,32 +1557,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8595);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('My Summer Love'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Living in America'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=2;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    0,
@@ -1590,7 +1590,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6396);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    1,
@@ -1598,7 +1598,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    0);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Havok'),
    2,
@@ -1606,13 +1606,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    3161);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    0,
@@ -1620,7 +1620,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6943);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    1,
@@ -1628,7 +1628,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4881);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Jallaman'),
    2,
@@ -1636,13 +1636,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    0);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1650,7 +1650,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7235);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1658,7 +1658,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6126);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -1666,13 +1666,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8160);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1680,7 +1680,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6370);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1688,7 +1688,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5386);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1696,13 +1696,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8107);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1710,7 +1710,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7691);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1718,7 +1718,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6540);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -1726,13 +1726,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8190);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1740,7 +1740,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7777);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1748,7 +1748,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6359);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1756,32 +1756,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7800);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Caribbean Queen'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=2;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -1789,7 +1789,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5974);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -1797,7 +1797,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7951);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
@@ -1805,13 +1805,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8229);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -1819,7 +1819,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5953);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -1827,7 +1827,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7738);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -1835,13 +1835,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7874);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    0,
@@ -1849,7 +1849,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5444);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    1,
@@ -1857,7 +1857,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7090);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Electus'),
    2,
@@ -1865,13 +1865,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7249);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    0,
@@ -1879,7 +1879,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5540);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    1,
@@ -1887,7 +1887,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6936);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Spinnvill'),
    2,
@@ -1895,13 +1895,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7821);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1909,7 +1909,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6206);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1917,7 +1917,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8084);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -1925,13 +1925,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7733);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -1939,7 +1939,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5836);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -1947,7 +1947,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8046);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 3,
    (SELECT player FROM players WHERE nick='Tom'),
    2,
@@ -1956,31 +1956,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8508);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=3;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1988,7 +1988,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8251);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1996,13 +1996,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8380);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2010,7 +2010,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7881);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2018,13 +2018,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8316);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2032,7 +2032,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8295);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2040,13 +2040,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8678);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2054,7 +2054,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8092);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2062,13 +2062,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8680);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -2076,7 +2076,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7806);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -2084,13 +2084,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7815);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2098,7 +2098,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8414);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2106,13 +2106,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8180);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2120,7 +2120,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8406);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2128,13 +2128,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8260);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    8
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2142,7 +2142,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8441);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2150,13 +2150,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8539);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    9
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -2164,7 +2164,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8489);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -2173,31 +2173,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8381);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Never Gonna Make (Factory Team Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=4;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2205,7 +2205,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6595);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2213,13 +2213,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8588);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2227,7 +2227,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6301);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2235,13 +2235,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8706);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2249,7 +2249,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6654);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2257,13 +2257,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8693);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2271,7 +2271,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6596);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2279,13 +2279,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7821);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -2293,7 +2293,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6766);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -2301,13 +2301,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8379);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2315,7 +2315,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6433);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2323,13 +2323,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8563);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2337,7 +2337,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6803);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2346,31 +2346,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8351);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Memories'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=5;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2378,7 +2378,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7245);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2386,13 +2386,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8452);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -2400,7 +2400,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6701);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -2408,13 +2408,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8960);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2422,7 +2422,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7521);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2430,13 +2430,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8615);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2444,7 +2444,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7227);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2452,13 +2452,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8541);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2466,7 +2466,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6819);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2475,31 +2475,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8853);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Groove 2001'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=6;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2507,7 +2507,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6663);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2515,13 +2515,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8637);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2529,7 +2529,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6662);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2537,13 +2537,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8044);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2551,7 +2551,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6810);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2559,13 +2559,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8506);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2573,7 +2573,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6759);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2582,31 +2582,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8544);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=7;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2614,7 +2614,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8391);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2622,13 +2622,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8130);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2636,7 +2636,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    9537);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2644,13 +2644,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8352);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2658,7 +2658,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    9032);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2667,31 +2667,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8623);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Never Let You Down'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=8;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=8;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2699,7 +2699,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6678);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2707,13 +2707,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8781);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2721,7 +2721,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6827);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,

diff --git a/sql/cc04/cc2-04.sql b/sql/cc04/cc2-04.sql
index d1585b55138fd1e47995edb8566e41fd7cae7c0d..f0511c5798df63b323c4ff80d9c22e3b86818e32 100644 (file)
--- a/sql/cc04/cc2-04.sql
+++ b/sql/cc04/cc2-04.sql
@@ -1,7 +1,7 @@
 begin;
 INSERT INTO tournaments 
   (season, tournamentname, country, location, "date", machine, scoringsystem) VALUES (
-    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004'),
+    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
     'Challenge Cup 2',
     (SELECT country FROM countries WHERE countryname='Norway'),
     'Kino 1 Sandvika',
@@ -9,128 +9,128 @@ INSERT INTO tournaments
     (SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),
     (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='10K Machine score')
 );
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1,
    (SELECT player FROM players WHERE nick='OJK'),
    100);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2,
    (SELECT player FROM players WHERE nick='Snute'),
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3,
    (SELECT player FROM players WHERE nick='DufF'),
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4,
    (SELECT player FROM players WHERE nick='Snofox'),
    73);
-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 players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5,
    (SELECT player FROM players WHERE nick='T|na'),
    66);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6,
    (SELECT player FROM players WHERE nick='RiChY'),
    60);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7,
    (SELECT player FROM players WHERE nick='Stream'),
    55);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8,
    (SELECT player FROM players WHERE nick='Olemann'),
    51);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Raazu' AS nick WHERE 'Raazu' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Raazu' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Raazu' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    9,
    (SELECT player FROM players WHERE nick='Raazu'),
    48);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    10,
    (SELECT player FROM players WHERE nick='Ylini'),
    46);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    11,
    (SELECT player FROM players WHERE nick='Smiph'),
    45);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick WHERE 'Havok' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Havok' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    12,
    (SELECT player FROM players WHERE nick='Havok'),
    44);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    13,
    (SELECT player FROM players WHERE nick='Draconia'),
    43);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dabi' AS nick WHERE 'Dabi' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dabi' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Dabi' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    14,
    (SELECT player FROM players WHERE nick='Dabi'),
    42);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bush' AS nick WHERE 'Bush' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bush' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Bush' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    15,
    (SELECT player FROM players WHERE nick='Bush'),
    41);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Memories'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('era (nostalmix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    0,
@@ -138,7 +138,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4327);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    1,
@@ -146,7 +146,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4251);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Bush'),
    2,
@@ -154,13 +154,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    5910);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -168,7 +168,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5476);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -176,7 +176,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6242);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -184,13 +184,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7977);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -198,7 +198,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6224);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -206,7 +206,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6659);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -214,13 +214,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7572);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -228,7 +228,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6530);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -236,7 +236,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6702);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -244,13 +244,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7631);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -258,7 +258,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7561);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -266,7 +266,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7616);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -274,32 +274,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6839);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Vanity Angel'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    0,
@@ -307,7 +307,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3973);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1,
@@ -315,7 +315,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3845);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    2,
@@ -323,13 +323,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6484);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -337,7 +337,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7827);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -345,7 +345,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6329);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -353,13 +353,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8032);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -367,7 +367,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7830);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -375,7 +375,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6336);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -383,13 +383,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7544);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -397,7 +397,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8058);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -405,7 +405,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7672);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -413,13 +413,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8167);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -427,7 +427,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8651);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -435,7 +435,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8426);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -443,32 +443,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8392);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('D2R'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    0,
@@ -476,7 +476,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5012);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    1,
@@ -484,7 +484,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4014);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Raazu'),
    2,
@@ -492,13 +492,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6940);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    0,
@@ -506,7 +506,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5541);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    1,
@@ -514,7 +514,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    0);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Draconia'),
    2,
@@ -522,13 +522,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7524);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    0,
@@ -536,7 +536,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4355);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    1,
@@ -544,7 +544,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6284);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    2,
@@ -552,13 +552,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    4399);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -566,7 +566,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5953);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -574,7 +574,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8076);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -582,13 +582,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7735);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -596,7 +596,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6044);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -604,7 +604,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8303);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -613,31 +613,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8625);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=2;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Raazu'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Raazu'),
    0,
@@ -645,7 +645,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7286);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Raazu'),
    1,
@@ -653,13 +653,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7657);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -667,7 +667,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7814);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -675,13 +675,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7986);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Olemann'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -689,7 +689,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7747);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -697,13 +697,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7721);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -711,7 +711,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8215);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -719,13 +719,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8053);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -733,7 +733,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8529);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -741,13 +741,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8570);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -755,7 +755,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8478);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -763,13 +763,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8174);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -777,7 +777,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8743);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -785,13 +785,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8447);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    8
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -799,7 +799,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8695);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -807,13 +807,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8440);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    9
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -821,7 +821,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8798);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -830,31 +830,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8500);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=3;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -862,7 +862,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7698);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -870,13 +870,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7874);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -884,7 +884,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8241);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -892,13 +892,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8574);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -906,7 +906,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8139);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -914,13 +914,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8403);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -928,7 +928,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8661);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -936,13 +936,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8456);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -950,7 +950,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8272);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -958,13 +958,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8353);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -972,7 +972,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8783);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -980,13 +980,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8673);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -994,7 +994,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8633);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1003,31 +1003,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8584);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('5, 6, 7, 8'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=4;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1035,7 +1035,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5706);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1043,13 +1043,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8583);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1057,7 +1057,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5726);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1065,13 +1065,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8056);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1079,7 +1079,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5553);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -1087,13 +1087,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8525);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1101,7 +1101,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5822);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1109,13 +1109,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8460);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1123,7 +1123,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5922);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1132,31 +1132,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8725);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('www.blonde girl (MOMO Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=5;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1164,7 +1164,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6450);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -1172,13 +1172,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8236);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1186,7 +1186,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6742);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1194,13 +1194,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8728);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1208,7 +1208,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6605);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1216,13 +1216,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8534);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1230,7 +1230,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6689);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1239,31 +1239,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8828);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=6;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1271,7 +1271,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7343);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1279,13 +1279,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8871);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1293,7 +1293,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7152);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1301,13 +1301,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8718);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1315,7 +1315,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6908);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1324,31 +1324,31 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    9276);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=7;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1356,7 +1356,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8662);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1364,13 +1364,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8776);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1378,7 +1378,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8676);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 2' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,

diff --git a/sql/cc04/cc3-04.sql b/sql/cc04/cc3-04.sql
index 33a23c624cdbcf6c549f79c269b4f33c0267cdba..9d8a78aacbe784be086f9b9e9bc3bcde56343349 100644 (file)
--- a/sql/cc04/cc3-04.sql
+++ b/sql/cc04/cc3-04.sql
@@ -1,7 +1,7 @@
 begin;
 INSERT INTO tournaments 
   (season, tournamentname, country, location, "date", machine, scoringsystem) VALUES (
-    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004'),
+    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
     'Challenge Cup 3',
     (SELECT country FROM countries WHERE countryname='Norway'),
     'Askim',
@@ -9,230 +9,230 @@ INSERT INTO tournaments
     (SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),
     (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='10K Machine score')
 );
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1,
    (SELECT player FROM players WHERE nick='Snute'),
    100);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    2,
    (SELECT player FROM players WHERE nick='DufF'),
    90);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hugo' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Hugo' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    3,
    (SELECT player FROM players WHERE nick='Hugo'),
    81);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    4,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    73);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    5,
    (SELECT player FROM players WHERE nick='RiChY'),
    66);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    6,
    (SELECT player FROM players WHERE nick='OJK'),
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    7,
    (SELECT player FROM players WHERE nick='Haggar'),
    0);
-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 players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    8,
    (SELECT player FROM players WHERE nick='T|na'),
    51);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    9,
    (SELECT player FROM players WHERE nick='Stream'),
    48);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    10,
    (SELECT player FROM players WHERE nick='Nameless'),
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    11,
    (SELECT player FROM players WHERE nick='Ylini'),
    45);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    12,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    44);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Th0rny' AS nick WHERE 'Th0rny' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Th0rny' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Th0rny' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    13,
    (SELECT player FROM players WHERE nick='Th0rny'),
    43);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    14,
    (SELECT player FROM players WHERE nick='Duckling'),
    42);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    15,
    (SELECT player FROM players WHERE nick='Olemann'),
    41);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    16,
    (SELECT player FROM players WHERE nick='Smiph'),
    40);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dabi' AS nick WHERE 'Dabi' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dabi' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Dabi' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    17,
    (SELECT player FROM players WHERE nick='Dabi'),
    39);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zyc' AS nick WHERE 'Zyc' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zyc' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Zyc' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    18,
    (SELECT player FROM players WHERE nick='Zyc'),
    38);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    19,
    (SELECT player FROM players WHERE nick='Draconia'),
    37);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Advena' AS nick WHERE 'Advena' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Advena' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Advena' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    20,
    (SELECT player FROM players WHERE nick='Advena'),
    36);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bonzo' AS nick WHERE 'Bonzo' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bonzo' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Bonzo' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    21,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ted Kristian' AS nick WHERE 'Ted Kristian' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ted Kristian' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Ted Kristian' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    22,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    34);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jim Andre' AS nick WHERE 'Jim Andre' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jim Andre' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Jim Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    23,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    33);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Glukko' AS nick WHERE 'Glukko' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Glukko' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Glukko' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    24,
    (SELECT player FROM players WHERE nick='Glukko'),
    32);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tassen' AS nick WHERE 'Tassen' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tassen' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Tassen' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    25,
    (SELECT player FROM players WHERE nick='Tassen'),
    31);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Matsi' AS nick WHERE 'Matsi' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Matsi' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Matsi' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    26,
    (SELECT player FROM players WHERE nick='Matsi'),
    30);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gollum' AS nick WHERE 'Gollum' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gollum' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Gollum' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    27,
    (SELECT player FROM players WHERE nick='Gollum'),
    29);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pål Andre' AS nick WHERE 'Pål Andre' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pål Andre' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Pål Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    28,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    28);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Andre' AS nick WHERE 'Andre' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Andre' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    29,
    (SELECT player FROM players WHERE nick='Andre'),
    27);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Eruanna' AS nick WHERE 'Eruanna' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Eruanna' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Eruanna' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    30,
    (SELECT player FROM players WHERE nick='Eruanna'),
    26);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Auran' AS nick WHERE 'Auran' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Auran' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Auran' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    31,
    (SELECT player FROM players WHERE nick='Auran'),
    25);
-INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ole-Christian' AS nick WHERE 'Ole-Christian' NOT IN ( SELECT nick FROM players );
+INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ole-Christian' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country WHERE 'Ole-Christian' NOT IN ( SELECT nick FROM players );
 INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    32,
    (SELECT player FROM players WHERE nick='Ole-Christian'),
    24);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    0,
@@ -240,7 +240,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4475);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    1,
@@ -248,7 +248,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5340);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    2,
@@ -256,13 +256,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7032);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    0,
@@ -270,7 +270,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4760);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    1,
@@ -278,7 +278,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5946);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    2,
@@ -286,13 +286,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    5875);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -300,7 +300,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5734);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -308,7 +308,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7095);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
@@ -316,13 +316,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8047);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -330,7 +330,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6356);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -338,7 +338,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7560);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -346,13 +346,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7720);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -360,7 +360,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6480);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -368,7 +368,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7646);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -376,32 +376,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7702);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    0,
@@ -409,7 +409,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5809);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    1,
@@ -417,7 +417,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5338);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    2,
@@ -425,13 +425,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6198);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    0,
@@ -439,7 +439,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4264);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    1,
@@ -447,7 +447,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3773);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Andre'),
    2,
@@ -455,13 +455,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    5277);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    0,
@@ -469,7 +469,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5388);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    1,
@@ -477,7 +477,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5249);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Dabi'),
    2,
@@ -485,13 +485,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7228);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -499,7 +499,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6226);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -507,7 +507,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6708);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -515,13 +515,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6445);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -529,7 +529,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7353);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -537,7 +537,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7214);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -545,32 +545,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6791);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('5, 6, 7, 8'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('So Deep (Perfect Sphere Mix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    0,
@@ -578,7 +578,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4346);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    1,
@@ -586,7 +586,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3531);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Glukko'),
    2,
@@ -594,13 +594,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    5270);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Ole-Christian'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Ole-Christian'),
    0,
@@ -608,7 +608,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    0);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Ole-Christian'),
    1,
@@ -616,13 +616,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    0);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    0,
@@ -630,7 +630,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4898);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    1,
@@ -638,7 +638,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3333);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Zyc'),
    2,
@@ -646,13 +646,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    5149);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -660,7 +660,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5189);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -668,7 +668,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4391);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -676,13 +676,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7298);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -690,7 +690,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5822);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -698,7 +698,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8510);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -706,32 +706,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8504);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Look to the sky'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    0,
@@ -739,7 +739,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5789);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    1,
@@ -747,7 +747,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6214);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Th0rny'),
    2,
@@ -755,13 +755,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8348);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -769,7 +769,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5618);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -777,7 +777,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6326);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -785,13 +785,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8278);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    0,
@@ -799,7 +799,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4525);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    1,
@@ -807,7 +807,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6008);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Matsi'),
    2,
@@ -815,13 +815,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7040);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    0,
@@ -829,7 +829,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5716);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    1,
@@ -837,7 +837,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6169);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    2,
@@ -845,13 +845,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7682);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -859,7 +859,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6023);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -867,7 +867,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6628);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -875,32 +875,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8179);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )) AND 
   round=1;
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    0,
@@ -908,7 +908,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5410);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    1,
@@ -916,7 +916,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4383);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Eruanna'),
    2,
@@ -924,13 +924,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    6040);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Advena'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Advena'),
    0,
@@ -938,7 +938,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6729);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3' AND season=( SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004' )),
    1, 5,
    (SELECT player FROM players WHERE nick='Advena'),
    1,
@@ -946,7 +946,7 @@ INSERT INTO scores (tournament, round, parallel, player,&n