From b8c51bff2421528d8d01a011816b3c4e34f7a3fe Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 19 Oct 2015 12:48:36 -0300 Subject: [PATCH] Bug 13636: DBRev 3.21.00.036 Signed-off-by: Tomas Cohen Arazi --- Koha.pm | 2 +- .../mysql/atomicupdate/bug_10363_av_package.sql | 16 ---------------- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 17 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_10363_av_package.sql diff --git a/Koha.pm b/Koha.pm index 44cc69f19d..df43c933c0 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 = "3.21.00.035"; +$VERSION = "3.21.00.036"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_10363_av_package.sql b/installer/data/mysql/atomicupdate/bug_10363_av_package.sql deleted file mode 100644 index 18445d9579..0000000000 --- a/installer/data/mysql/atomicupdate/bug_10363_av_package.sql +++ /dev/null @@ -1,16 +0,0 @@ -ALTER TABLE authorised_values_branches - CHANGE av_id av_id INT( 11 ) NOT NULL, - CHANGE branchcode branchcode VARCHAR( 10 ) NOT NULL; - -/* -$DBversion = "3.21.00.XXX"; -if ( CheckVersion($DBversion) ) { - $dbh->do(q{ - ALTER TABLE authorised_values_branches - CHANGE av_id av_id INT( 11 ) NOT NULL, - CHANGE branchcode branchcode VARCHAR( 10 ) NOT NULL - }); - print "Upgrade to $DBversion done (Bug 10363: There is no package for authorised values)\n"; - SetVersion($DBversion); -} -*/ diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index a6753fc4bd..e6135cdd31 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -11095,6 +11095,17 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = "3.21.00.036"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + ALTER TABLE authorised_values_branches + CHANGE av_id av_id INT( 11 ) NOT NULL, + CHANGE branchcode branchcode VARCHAR( 10 ) NOT NULL + }); + print "Upgrade to $DBversion done (Bug 10363: There is no package for authorised values)\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.20.1