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

(-)a/installer/data/mysql/updatedatabase.pl (-20 / +24 lines)
Lines 7984-8011 if ( CheckVersion($DBversion) ) { Link Here
7984
    $dbh->{AutoCommit} = 0;
7984
    $dbh->{AutoCommit} = 0;
7985
    $dbh->{RaiseError} = 1;
7985
    $dbh->{RaiseError} = 1;
7986
7986
7987
    my $av_added = $dbh->do(q|
7987
    eval {
7988
        INSERT INTO authorised_values(category, authorised_value, lib, lib_opac)
7988
        $dbh->selectcol_arrayref(q|SELECT COUNT(*) FROM roadtype|);
7989
            SELECT 'ROADTYPE', roadtypeid, road_type, road_type
7989
    };
7990
            FROM roadtype;
7990
    unless ( $@ ) {
7991
    |);
7991
        warn "pas erreur";
7992
7992
        my $av_added = $dbh->do(q|
7993
    my $rt_deleted = $dbh->do(q|
7993
            INSERT INTO authorised_values(category, authorised_value, lib, lib_opac)
7994
        DELETE FROM roadtype
7994
                SELECT 'ROADTYPE', roadtypeid, road_type, road_type
7995
    |);
7995
                FROM roadtype;
7996
        |);
7996
7997
7997
    if ( $av_added == $rt_deleted or $rt_deleted eq "0E0" ) {
7998
        my $rt_deleted = $dbh->do(q|
7998
        $dbh->do(q|
7999
            DELETE FROM roadtype
7999
            DROP TABLE roadtype;
8000
        |);
8000
        |);
8001
        $dbh->commit;
8002
        print "Upgrade to $DBversion done (Bug 7372: Move road types from the roadtype table to the ROADTYPE authorised values)\n";
8003
        SetVersion($DBversion);
8004
    } else {
8005
        print "Upgrade to $DBversion failed (Bug 7372: Move road types from the roadtype table to the ROADTYPE authorised values.\nTransaction aborted because $@\n)";
8006
        $dbh->rollback;
8007
    }
8008
8001
8002
        if ( $av_added == $rt_deleted or $rt_deleted eq "0E0" ) {
8003
            $dbh->do(q|
8004
                DROP TABLE roadtype;
8005
            |);
8006
            $dbh->commit;
8007
            print "Upgrade to $DBversion done (Bug 7372: Move road types from the roadtype table to the ROADTYPE authorised values)\n";
8008
            SetVersion($DBversion);
8009
        } else {
8010
            print "Upgrade to $DBversion failed (Bug 7372: Move road types from the roadtype table to the ROADTYPE authorised values.\nTransaction aborted because $@\n)";
8011
            $dbh->rollback;
8012
        }
8013
    }
8009
    $dbh->{AutoCommit} = 1;
8014
    $dbh->{AutoCommit} = 1;
8010
    $dbh->{RaiseError} = 0;
8015
    $dbh->{RaiseError} = 0;
8011
}
8016
}
8012
- 

Return to bug 7372