Bug 9809: DBRev 3.21.00.19

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

diff --git a/Koha.pm b/Koha.pm
index e4a317f..58604d0 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.018";
+$VERSION = "3.21.00.019";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_9809-drop_table_reserveconstraints.sql b/installer/data/mysql/atomicupdate/bug_9809-drop_table_reserveconstraints.sql
deleted file mode 100644 (file)
index 7d00f0d..0000000
--- a/installer/data/mysql/atomicupdate/bug_9809-drop_table_reserveconstraints.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DROP TABLE IF EXISTS reserveconstraints;
-
-ALTER TABLE reserves DROP constrainttype;
-
-ALTER TABLE old_reserves DROP constrainttype;

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 10809a1..3317c3c 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -10761,6 +10761,21 @@ if ( CheckVersion($DBversion) ) {
     SetVersion ($DBversion);
 }
 
+$DBversion = "3.21.00.019";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(q{
+        ALTER TABLE reserves DROP constrainttype
+    });
+    $dbh->do(q{
+        ALTER TABLE old_reserves DROP constrainttype
+    });
+    $dbh->do(q{
+        DROP TABLE IF EXISTS reserveconstraints
+    });
+    print "Upgrade to $DBversion done (Bug 9809: Get rid of reserveconstraints)\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.