From 0f9dce409f6dba60cbb52ae682e70d8203e96ea1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 19 Sep 2017 11:46:51 -0300 Subject: [PATCH] Bug 10132: DBRev 17.05.00.007 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- .../bug10132_add_marcorgcode_to_library.perl | 10 ---------- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug10132_add_marcorgcode_to_library.perl diff --git a/Koha.pm b/Koha.pm index fc07b125db..120b13a378 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 = "17.06.00.006"; +$VERSION = "17.06.00.007"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug10132_add_marcorgcode_to_library.perl b/installer/data/mysql/atomicupdate/bug10132_add_marcorgcode_to_library.perl deleted file mode 100644 index d781f71c1f..0000000000 --- a/installer/data/mysql/atomicupdate/bug10132_add_marcorgcode_to_library.perl +++ /dev/null @@ -1,10 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - if( !column_exists( 'branches', 'marcorgcode' ) ) { - $dbh->do( "ALTER TABLE branches ADD COLUMN marcorgcode VARCHAR(16) default NULL AFTER geolocation" ); - } - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 10132 - MARCOrgCode on branch level)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 698eb325bf..4a3b773283 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -14627,6 +14627,16 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 18811 - Visibility settings inconsistent between framework and authority editor)\n"; } +$DBversion = '17.06.00.007'; +if( CheckVersion( $DBversion ) ) { + if( !column_exists( 'branches', 'marcorgcode' ) ) { + $dbh->do( "ALTER TABLE branches ADD COLUMN marcorgcode VARCHAR(16) default NULL AFTER geolocation" ); + } + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 10132 - MARCOrgCode on branch level (branches.marcorgcode))\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. -- 2.39.5