From 0caed05779b886229d2a02c168bdb38453c67bb4 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 17 Aug 2016 18:03:50 +0000 Subject: [PATCH] Bug 16829 - DBRev 16.06.00.014 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- .../bug_16829_action_logs_interface.sql | 14 -------------- installer/data/mysql/updatedatabase.pl | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_16829_action_logs_interface.sql diff --git a/Koha.pm b/Koha.pm index a7869556b4..e5dae38f56 100644 --- 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.06.00.013"; +$VERSION = "16.06.00.014"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_16829_action_logs_interface.sql b/installer/data/mysql/atomicupdate/bug_16829_action_logs_interface.sql deleted file mode 100644 index 9591824d0b..0000000000 --- a/installer/data/mysql/atomicupdate/bug_16829_action_logs_interface.sql +++ /dev/null @@ -1,14 +0,0 @@ -ALTER TABLE `action_logs` ADD COLUMN `interface` VARCHAR(30) DEFAULT NULL AFTER `info`; -ALTER TABLE `action_logs` ADD KEY `interface` (`interface`); - --- $DBversion = "16.06.00.XXX"; --- if ( CheckVersion($DBversion) ) { --- $dbh->do(q{ --- ALTER TABLE `action_logs` ADD COLUMN `interface` VARCHAR(30) DEFAULT NULL AFTER `info`; --- }); --- $dbh->do({ --- ALTER TABLE `action_logs` ADD KEY `interface` (`interface`); --- }); --- print "Upgrade to $DBversion done (Bug 16829: action_logs should have an 'interface' column)\n"; --- SetVersion($DBversion); --- } diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index e67335f76b..e526b22136 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -12807,6 +12807,20 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "16.06.00.014"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + ALTER TABLE `action_logs` ADD COLUMN `interface` VARCHAR(30) DEFAULT NULL AFTER `info`; + }); + + $dbh->do(q{ + ALTER TABLE `action_logs` ADD KEY `interface` (`interface`); + }); + + print "Upgrade to $DBversion done (Bug 16829: action_logs should have an 'interface' column)\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. -- 2.39.5