Bug 14820: DBRev 3.21.00.031

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/Koha.pm b/Koha.pm
index 1787ccb..76a53b1 100644 (file)
--- 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 = "3.21.00.030";
+$VERSION = "3.21.00.031";
 
 sub version {
     return $VERSION;

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 (file)
index 43a1d08..0000000
--- 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 8de3441..2e87d6e 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -10945,6 +10945,18 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.21.00.031";
+if ( CheckVersion($DBversion) ) {
+    $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 "Upgrade to $DBversion 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.