From e0e46ea7c2ec26666b2dd2ab5d6e8845b64afd49 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 22 Dec 2017 11:11:23 +0000 Subject: [PATCH] Increment version for 17.11.01 release Signed-off-by: Nick Clemens --- Koha.pm | 2 +- installer/data/mysql/updatedatabase.pl | 46 +++++++++++++++----------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Koha.pm b/Koha.pm index bebaf0cc42..5630f74f99 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "17.11.00.001"; +$VERSION = "17.11.01.000"; sub version { return $VERSION; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f37d3ad076..e7ba25e07c 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -15044,26 +15044,6 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Koha 17.11)\n"; } -# DEVELOPER PROCESS, search for anything to execute in the db_update directory -# SEE bug 13068 -# if there is anything in the atomicupdate, read and execute it. - -my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; -opendir( my $dirh, $update_dir ); -foreach my $file ( sort readdir $dirh ) { - next if $file !~ /\.(sql|perl)$/; #skip other files - next if $file eq 'skeleton.perl'; # skip the skeleton file - print "DEV atomic update: $file\n"; - if ( $file =~ /\.sql$/ ) { - my $installer = C4::Installer->new(); - my $rv = $installer->load_sql( $update_dir . $file ) ? 0 : 1; - } elsif ( $file =~ /\.perl$/ ) { - my $code = read_file( $update_dir . $file ); - eval $code; - say "Atomic update generated errors: $@" if $@; - } -} - $DBversion = '17.11.00.001'; if( CheckVersion( $DBversion ) ) { foreach my $table (qw(biblio_metadata deletedbiblio_metadata)) { @@ -15086,6 +15066,32 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 19724 - Add [deleted]biblio_metadata.timestamp)\n"; } +$DBversion = '17.11.01.000'; +if( CheckVersion( $DBversion ) ) { + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Koha 17.11)\n"; +} + +# DEVELOPER PROCESS, search for anything to execute in the db_update directory +# SEE bug 13068 +# if there is anything in the atomicupdate, read and execute it. + +my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; +opendir( my $dirh, $update_dir ); +foreach my $file ( sort readdir $dirh ) { + next if $file !~ /\.(sql|perl)$/; #skip other files + next if $file eq 'skeleton.perl'; # skip the skeleton file + print "DEV atomic update: $file\n"; + if ( $file =~ /\.sql$/ ) { + my $installer = C4::Installer->new(); + my $rv = $installer->load_sql( $update_dir . $file ) ? 0 : 1; + } elsif ( $file =~ /\.perl$/ ) { + my $code = read_file( $update_dir . $file ); + eval $code; + say "Atomic update generated errors: $@" if $@; + } +} + =head1 FUNCTIONS =head2 TableExists($table) -- 2.39.5