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

(-)a/Koha.pm (-1 / +1 lines)
Lines 29-35 use vars qw{ $VERSION }; Link Here
29
# - #4 : the developer version. The 4th number is the database subversion.
29
# - #4 : the developer version. The 4th number is the database subversion.
30
#        used by developers when the database changes. updatedatabase take care of the changes itself
30
#        used by developers when the database changes. updatedatabase take care of the changes itself
31
#        and is automatically called by Auth.pm when needed.
31
#        and is automatically called by Auth.pm when needed.
32
$VERSION = "20.12.00.005";
32
$VERSION = "20.12.00.006";
33
33
34
sub version {
34
sub version {
35
    return $VERSION;
35
    return $VERSION;
(-)a/installer/data/mysql/updatedatabase.pl (-2 / +34 lines)
Lines 47-52 use MARC::File::XML ( BinaryEncoding => 'utf8' ); Link Here
47
use File::Path qw[remove_tree]; # perl core module
47
use File::Path qw[remove_tree]; # perl core module
48
use File::Slurp;
48
use File::Slurp;
49
49
50
use Try::Tiny;
51
50
# FIXME - The user might be installing a new database, so can't rely
52
# FIXME - The user might be installing a new database, so can't rely
51
# on /etc/koha.conf anyway.
53
# on /etc/koha.conf anyway.
52
54
Lines 23451-23458 if( CheckVersion( $DBversion ) ) { Link Here
23451
23453
23452
$DBversion = '20.12.00.005';
23454
$DBversion = '20.12.00.005';
23453
if( CheckVersion( $DBversion ) ) {
23455
if( CheckVersion( $DBversion ) ) {
23454
    $dbh->do(q{UPDATE systempreferences set variable="OPACLanguages" WHERE variable="opaclanguages"});
23456
    execute_entry(
23455
    NewVersion( $DBversion, 27491, "Rename system preference 'opaclanguages' to 'OPACLanguages'");
23457
        $DBversion, 27491, "Rename system preference 'opaclanguages' to 'OPACLanguages'",
23458
        sub {
23459
            $dbh->do(
23460
                q{UPDATE systempreferences set variable="OPACLanguages" WHERE variable="opaclanguages"}
23461
            );
23462
        }
23463
    );
23464
}
23465
23466
$DBversion = '20.12.00.006';
23467
if( CheckVersion( $DBversion ) ) {
23468
    execute_entry( $DBversion, 12345, "Testing failure",
23469
        sub {
23470
            $dbh->do(
23471
                q{ALTER TABLE foo}
23472
            );
23473
        }
23474
    );
23475
}
23476
23477
23478
sub execute_entry {
23479
    my ( $DBversion, $bug_number, $description, $sub ) = @_;
23480
23481
    try {
23482
        Koha::Database->schema->txn_do($sub);
23483
    } catch {
23484
        die sprintf "Something wrong happened during %s (%s):\n%s", $DBversion, $description, $_;
23485
    };
23486
23487
    NewVersion( $DBversion, $bug_number, $description );
23456
}
23488
}
23457
23489
23458
# SEE bug 13068
23490
# SEE bug 13068
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-2 / +1 lines)
Lines 249-255 Link Here
249
                [% IF ( updatestructure ) %]
249
                [% IF ( updatestructure ) %]
250
                    <h2>Updating database structure</h2>
250
                    <h2>Updating database structure</h2>
251
                    [% IF ( has_update_succeeds ) %]
251
                    [% IF ( has_update_succeeds ) %]
252
                        <p>Update report :</p>
252
                        <p>Update report:</p>
253
                        <ul>
253
                        <ul>
254
                            [% FOREACH l IN update_report %]
254
                            [% FOREACH l IN update_report %]
255
                                [% SET line = l.line %]
255
                                [% SET line = l.line %]
256
- 

Return to bug 25078