View | Details | Raw Unified | Return to bug 11309
Collapse All | Expand All

(-)a/installer/data/mysql/updatedatabase.pl (-11 / +12 lines)
Lines 7472-7482 if ( CheckVersion($DBversion) ) { Link Here
7472
    |);
7472
    |);
7473
    my $check_numberpatterns_sth = $dbh->prepare(qq|
7473
    my $check_numberpatterns_sth = $dbh->prepare(qq|
7474
        SELECT * FROM subscription_numberpatterns
7474
        SELECT * FROM subscription_numberpatterns
7475
        WHERE add1 = ? AND add2 = ? AND add3 = ?
7475
        WHERE (add1 = ? OR (add1 IS NULL AND ? IS NULL)) AND (add2 = ? OR (add2 IS NULL AND ? IS NULL)) 
7476
          AND every1 = ? AND every2 = ? AND every3 = ?
7476
        AND (add3 = ? OR (add3 IS NULL AND ? IS NULL)) AND (every1 = ? OR (every1 IS NULL AND ? IS NULL)) 
7477
          AND whenmorethan1 = ? AND whenmorethan2 = ? AND whenmorethan3 = ?
7477
        AND (every2 = ? OR (every2 IS NULL AND ? IS NULL)) AND (every3 = ? OR (every3 IS NULL AND ? IS NULL))
7478
          AND setto1 = ? AND setto2 = ? AND setto3 = ?
7478
        AND (whenmorethan1 = ? OR (whenmorethan1 IS NULL AND ? IS NULL)) AND (whenmorethan2 = ? OR (whenmorethan2 IS NULL AND ? IS NULL)) 
7479
          AND numberingmethod = ?
7479
        AND (whenmorethan3 = ? OR (whenmorethan3 IS NULL AND ? IS NULL)) AND (setto1 = ? OR (setto1 IS NULL AND ? IS NULL)) 
7480
        AND (setto2 = ? OR (setto2 IS NULL AND ? IS NULL)) AND (setto3 = ? OR (setto3 IS NULL AND ? IS NULL))
7481
        AND (numberingmethod = ? OR (numberingmethod IS NULL AND ? IS NULL))
7480
        LIMIT 1
7482
        LIMIT 1
7481
    |);
7483
    |);
7482
    my $update_subscription_sth = $dbh->prepare(qq|
7484
    my $update_subscription_sth = $dbh->prepare(qq|
Lines 7489-7499 if ( CheckVersion($DBversion) ) { Link Here
7489
    my $i = 1;
7491
    my $i = 1;
7490
    while(my $sub = $sth->fetchrow_hashref) {
7492
    while(my $sub = $sth->fetchrow_hashref) {
7491
        $check_numberpatterns_sth->execute(
7493
        $check_numberpatterns_sth->execute(
7492
            $sub->{add1}, $sub->{add2}, $sub->{add3},
7494
            $sub->{add1}, $sub->{add1}, $sub->{add2}, $sub->{add2}, $sub->{add3}, $sub->{add3},
7493
            $sub->{every1}, $sub->{every2}, $sub->{every3},
7495
            $sub->{every1}, $sub->{every1}, $sub->{every2}, $sub->{every2}, $sub->{every3}, $sub->{every3},
7494
            $sub->{whenmorethan1}, $sub->{whenmorethan2}, $sub->{whenmorethan3},
7496
            $sub->{whenmorethan1}, $sub->{whenmorethan1}, $sub->{whenmorethan2}, $sub->{whenmorethan2}, 
7495
            $sub->{setto1}, $sub->{setto2}, $sub->{setto3},
7497
            $sub->{whenmorethan3}, $sub->{whenmorethan3}, $sub->{setto1}, $sub->{setto1}, $sub->{setto2}, 
7496
            $sub->{numberingmethod}
7498
            $sub->{setto2}, $sub->{setto3}, $sub->{setto3}, $sub->{numberingmethod}, $sub->{numberingmethod}
7497
        );
7499
        );
7498
        my $p = $check_numberpatterns_sth->fetchrow_hashref;
7500
        my $p = $check_numberpatterns_sth->fetchrow_hashref;
7499
        if (defined $p) {
7501
        if (defined $p) {
7500
- 

Return to bug 11309