From f960d95dd65c84c90970ce4f5ccc9f5bc95513b6 Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Mon, 8 Jun 2015 16:01:40 +0200 Subject: [PATCH] Bug 9223 [Follow-up] change the way syspref SuggestionsUseValues is added: Use the new worflow (atomic update) --- .../atomicupdate/bug_9223-add_suggestionsusevalues_syspref.sql | 1 + installer/data/mysql/updatedatabase.pl | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_9223-add_suggestionsusevalues_syspref.sql diff --git a/installer/data/mysql/atomicupdate/bug_9223-add_suggestionsusevalues_syspref.sql b/installer/data/mysql/atomicupdate/bug_9223-add_suggestionsusevalues_syspref.sql new file mode 100644 index 0000000..9df9d42 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_9223-add_suggestionsusevalues_syspref.sql @@ -0,0 +1 @@ +INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('SuggestionsUseValues', 'itemtypes', 'Suggestions can be submitted using the following authorized values:','itemtypes|ccode|loc|none','Choice') \ No newline at end of file diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 0405368..34c2d74 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -10554,13 +10554,6 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } -$DBversion = "3.19.00.XXX"; -if ( CheckVersion($DBversion) ) { - $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SuggestionsUseValues', 'itemtypes', 'Suggestions can be submitted using the following authorized values:','itemtypes|ccode|loc|none','Choice')"); - print "Upgrade to $DBversion done (Bug 9223: Add SuggestionsUseValues syspref)\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. -- 1.7.10.4