Bug 22155: DBRev 18.12.00.011

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/Koha.pm b/Koha.pm
index 8f09601..e5b1a0d 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 = "18.12.00.010";
+$VERSION = "18.12.00.011";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_22155.perl b/installer/data/mysql/atomicupdate/bug_22155.perl
deleted file mode 100644 (file)
index 2b90205..0000000
--- a/installer/data/mysql/atomicupdate/bug_22155.perl
+++ /dev/null
@@ -1,20 +0,0 @@
-$DBversion = 'XXX';
-if( CheckVersion( $DBversion ) ) {
-
-    if ( column_exists( 'biblio_metadata', 'marcflavour' ) ) {
-        $dbh->do(q{
-            ALTER TABLE biblio_metadata
-                CHANGE COLUMN marcflavour `schema` VARCHAR(16)
-        });
-    }
-
-    if ( column_exists( 'deletedbiblio_metadata', 'marcflavour' ) ) {
-        $dbh->do(q{
-            ALTER TABLE deletedbiblio_metadata
-                CHANGE COLUMN marcflavour `schema` VARCHAR(16)
-        });
-    }
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 22155 - biblio_metadata.marcflavour should be renamed 'schema')\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 028b30d..329f208 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -17292,6 +17292,24 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 22061 - Add a /public namespace that can be switched on/off)\n";
 }
 
+$DBversion = '18.12.00.011';
+if( CheckVersion( $DBversion ) ) {
+    if ( column_exists( 'biblio_metadata', 'marcflavour' ) ) {
+        $dbh->do(q{
+            ALTER TABLE biblio_metadata
+                CHANGE COLUMN marcflavour `schema` VARCHAR(16)
+        });
+    }
+    if ( column_exists( 'deletedbiblio_metadata', 'marcflavour' ) ) {
+        $dbh->do(q{
+            ALTER TABLE deletedbiblio_metadata
+                CHANGE COLUMN marcflavour `schema` VARCHAR(16)
+        });
+    }
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 22155 - biblio_metadata.marcflavour should be renamed 'schema')\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.