From f0d8e0d6575e68a1ce4978cb09edd7273acb728e Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 24 Feb 2016 13:34:09 +0000 Subject: [PATCH] Bug 15891 [Followup] Signed-off-by: Kyle M Hall --- installer/data/mysql/updatedatabase.pl | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index eb0db8bb1b..5c52dae136 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -11788,9 +11788,9 @@ if ( CheckVersion($DBversion) ) { $DBversion = "3.23.00.023"; if ( CheckVersion($DBversion) ) { $dbh->do(q{ - INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) -VALUES('OpenLibrarySearch','0','If Yes Open Library search results will show in OPAC',NULL,'YesNo'); -}); + INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) + VALUES('OpenLibrarySearch','0','If Yes Open Library search results will show in OPAC',NULL,'YesNo'); + }); print "Upgrade to $DBversion done (Bug 6624 - Allow Koha to use the new read API from OpenLibrary)\n"; SetVersion($DBversion); @@ -11799,11 +11799,13 @@ VALUES('OpenLibrarySearch','0','If Yes Open Library search results will show in $DBversion = "3.23.00.024"; if ( CheckVersion($DBversion) ) { $dbh->do(q{ - ALTER TABLE deletedborrowers MODIFY COLUMN userid VARCHAR(75) DEFAULT NULL; -}); + ALTER TABLE deletedborrowers MODIFY COLUMN userid VARCHAR(75) DEFAULT NULL; + }); + $dbh->do(q{ - ALTER TABLE deletedborrowers MODIFY COLUMN password VARCHAR(60) DEFAULT NULL; -}); + ALTER TABLE deletedborrowers MODIFY COLUMN password VARCHAR(60) DEFAULT NULL; + }); + print "Upgrade to $DBversion done (Bug 15517 - Tables borrowers and deletedborrowers differ again)\n"; SetVersion($DBversion); } @@ -11811,8 +11813,8 @@ if ( CheckVersion($DBversion) ) { $DBversion = "3.23.00.025"; if ( CheckVersion($DBversion) ) { $dbh->do(q{ - DROP TABLE nozebra; -}); + DROP TABLE IF EXISTS nozebra; + }); print "Upgrade to $DBversion done (Bug 15526 - Drop nozebra database table)\n"; SetVersion($DBversion); @@ -11821,8 +11823,8 @@ if ( CheckVersion($DBversion) ) { $DBversion = "3.23.00.026"; if ( CheckVersion($DBversion) ) { $dbh->do(q{ - UPDATE systempreferences SET value = CONCAT_WS('|', IF(value='', NULL, value), "password") WHERE variable="PatronSelfRegistrationBorrowerUnwantedField" AND value NOT LIKE "%password%"; -}); + UPDATE systempreferences SET value = CONCAT_WS('|', IF(value='', NULL, value), "password") WHERE variable="PatronSelfRegistrationBorrowerUnwantedField" AND value NOT LIKE "%password%"; + }); print "Upgrade to $DBversion done (Bug 15343 - Allow patrons to choose their own password on self registration)\n"; SetVersion($DBversion); -- 2.39.5