From 6bc08252b4753b31cd73558bf492c03294a83592 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 2 Oct 2015 14:30:14 -0300 Subject: [PATCH] Bug 14820: DBRev 3.18.11.001 Signed-off-by: Tomas Cohen Arazi (cherry picked from commit b8f0a595344d28d85383007138715d7db131f136) Signed-off-by: Chris Cormack Signed-off-by: Liz Rea Conflicts: Koha.pm (3.18 does not have) installer/data/mysql/updatedatabase.pl (routine version updates) --- ...fs_SMSSendUsername_and_SMSSendPassword.sql | 3 -- installer/data/mysql/updatedatabase.pl | 29 +++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_14820_add_prefs_SMSSendUsername_and_SMSSendPassword.sql diff --git a/installer/data/mysql/atomicupdate/bug_14820_add_prefs_SMSSendUsername_and_SMSSendPassword.sql b/installer/data/mysql/atomicupdate/bug_14820_add_prefs_SMSSendUsername_and_SMSSendPassword.sql deleted file mode 100644 index 43a1d08aa7..0000000000 --- a/installer/data/mysql/atomicupdate/bug_14820_add_prefs_SMSSendUsername_and_SMSSendPassword.sql +++ /dev/null @@ -1,3 +0,0 @@ -INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES -('SMSSendPassword', '', '', 'Password used to send SMS messages', 'free'), -('SMSSendUsername', '', '', 'Username/Login used to send SMS messages', 'free'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index bff553eabd..52bde77afd 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -9916,6 +9916,35 @@ if ( CheckVersion($DBversion) ) { print "Done (3.18.11 release)\n"; } +$DBversion = "3.18.11.001"; +if ( CheckVersion($DBversion) ) { + print "Upgrade to $DBversion\n"; + $dbh->do(q{ + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) + VALUES + ('SMSSendPassword', '', '', 'Password used to send SMS messages', 'free'), + ('SMSSendUsername', '', '', 'Username/Login used to send SMS messages', 'free') + }); + print "Done (Bug 14820: SMSSendUsername and SMSSendPassword are not listed in the system preferences)\n"; + SetVersion($DBversion); +} + +# 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 + 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$/ ) { + do $update_dir . $file; + } +} =head1 FUNCTIONS -- 2.39.5