Bug 16402 - DBRev 3.23.00.063

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

diff --git a/Koha.pm b/Koha.pm
index 10e3ab3..29e124b 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.23.00.062";
+$VERSION = "3.23.00.063";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_16402.sql b/installer/data/mysql/atomicupdate/bug_16402.sql
deleted file mode 100644 (file)
index 44f13d1..0000000
--- a/installer/data/mysql/atomicupdate/bug_16402.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-ALTER TABLE letter MODIFY COLUMN branchcode varchar(10) NOT NULL DEFAULT '';
-ALTER TABLE permissions MODIFY COLUMN code varchar(64) NOT NULL DEFAULT '';
-
--- $DBversion = "3.23.00.XXX";
--- if(CheckVersion($DBversion)) {
---     $dbh->do(q{
---         ALTER TABLE letter MODIFY COLUMN branchcode varchar(10) NOT NULL DEFAULT ''
---     });
---     $dbh->do(q{
---         ALTER TABLE permissions MODIFY COLUMN code varchar(64) NOT NULL DEFAULT '';
---     });
---     print "Upgrade to $DBversion done (Bug 16402: Fix DB structure to work on MySQL 5.7)\n";
---     SetVersion($DBversion);
--- }

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 1cde4d6..f69a1d4 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -12576,6 +12576,18 @@ if ( CheckVersion($DBversion) ) {
 SetVersion($DBversion);
 }
 
+$DBversion = "3.23.00.063";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(q{
+        ALTER TABLE letter MODIFY COLUMN branchcode varchar(10) NOT NULL DEFAULT ''
+    });
+    $dbh->do(q{
+        ALTER TABLE permissions MODIFY COLUMN code varchar(64) NOT NULL DEFAULT '';
+    });
+    print "Upgrade to $DBversion done (Bug 16402: Fix DB structure to work on MySQL 5.7)\n";
+    SetVersion($DBversion);
+}
+
 
 # DEVELOPER PROCESS, search for anything to execute in the db_update directory
 # SEE bug 13068