Bug 17960 - DBRev 16.12.00.007

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/Koha.pm b/Koha.pm
index 8e399d6..3d91ec1 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 = "16.12.00.006";
+$VERSION = "16.12.00.007";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_17960.perl b/installer/data/mysql/atomicupdate/bug_17960.perl
deleted file mode 100644 (file)
index 003787d..0000000
--- a/installer/data/mysql/atomicupdate/bug_17960.perl
+++ /dev/null
@@ -1,18 +0,0 @@
-$DBversion = 'XXX';
-if( CheckVersion( $DBversion ) ) {
-
-    if ( column_exists('opac_news', 'new' ) ) {
-        $dbh->do(q|ALTER TABLE opac_news CHANGE COLUMN new content text NOT NULL|);
-    }
-
-    my ( $used_in_templates ) = $dbh->selectrow_array(q|
-        SELECT COUNT(*) FROM letter WHERE content LIKE "%<<opac_news.new>>%";
-    |);
-    if ( $used_in_templates ) {
-        print "WARNING - It seems that you are using the opac_news.new column in your notice templates\n";
-        print "Since it has now been renamed with opac_news.content, you should update them.\n";
-    }
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 17960 - Rename opac_news with opac_news.content)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 0fdbded..5423e07 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -13861,6 +13861,25 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "16.12.00.007";
+if( CheckVersion( $DBversion ) ) {
+
+    if ( column_exists('opac_news', 'new' ) ) {
+        $dbh->do(q|ALTER TABLE opac_news CHANGE COLUMN new content text NOT NULL|);
+    }
+
+    my ( $used_in_templates ) = $dbh->selectrow_array(q|
+        SELECT COUNT(*) FROM letter WHERE content LIKE "%<<opac_news.new>>%";
+    |);
+    if ( $used_in_templates ) {
+        print "WARNING - It seems that you are using the opac_news.new column in your notice templates\n";
+        print "Since it has now been renamed with opac_news.content, you should update them.\n";
+    }
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 17960 - Rename opac_news with opac_news.content)\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.