From 03e6ecd31cf11de283cc78a89d713d0714c5a294 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 8 Jan 2019 14:01:45 +0000 Subject: [PATCH] Bug 22030: DBRev 18.11.01.001 Signed-off-by: Nick Clemens (cherry picked from commit 70abd7698f02a7da791490607f43df9f781390d2) Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- ..._22030_add_OverDriveUsername_system_preference.perl | 9 --------- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_22030_add_OverDriveUsername_system_preference.perl diff --git a/Koha.pm b/Koha.pm index 052b805392..446ed3bc22 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 = "18.11.01.000"; +$VERSION = "18.11.01.001"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_22030_add_OverDriveUsername_system_preference.perl b/installer/data/mysql/atomicupdate/bug_22030_add_OverDriveUsername_system_preference.perl deleted file mode 100644 index 73047781ac..0000000000 --- a/installer/data/mysql/atomicupdate/bug_22030_add_OverDriveUsername_system_preference.perl +++ /dev/null @@ -1,9 +0,0 @@ -$DBversion = 'XXX'; -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES - ('OverDriveUsername','cardnumber','cardnumber|userid','Which patron information should be passed as OverDrive username','Choice') - }); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug XXXXX - description)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 1ac303df1e..c6db47455a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -17205,6 +17205,16 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = '18.11.01.001'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES + ('OverDriveUsername','cardnumber','cardnumber|userid','Which patron information should be passed as OverDrive username','Choice') + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 22030: Add OverDriveUsername syspref)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1