Followup database update ca0b6596eaf

diff --git a/installer/data/mysql/atomicupdate/0004-Add_Some_Missing_fields_to_suggestions.pl b/installer/data/mysql/atomicupdate/0004-Add_Some_Missing_fields_to_suggestions.pl
index 8eed19b..8e3edad 100644 (file)
--- a/installer/data/mysql/atomicupdate/0004-Add_Some_Missing_fields_to_suggestions.pl
+++ b/installer/data/mysql/atomicupdate/0004-Add_Some_Missing_fields_to_suggestions.pl
@@ -9,15 +9,12 @@ ALTER table suggestions
     ADD branchcode VARCHAR(10) default NULL,
     ADD acceptedby INT(11) default NULL,
     ADD acceptedon date default NULL,
-    ADD suggestedby INT(11) default NULL,
     ADD suggestedon date default NULL,
-    ADD managedby INT(11) default NULL,
     ADD managedon date default NULL,
     ADD rejectedby INT(11) default NULL,
     ADD rejectedon date default NULL,
     ADD collectiontitle text default NULL,
     ADD itemtype VARCHAR(30) default NULL,
-    ADD biblionumber INT(11) default NULL,
     ADD sort1 VARCHAR(80) default NULL,
     ADD sort2 VARCHAR(80) default NULL
     ;

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index dd170bb..ba85b04 100644 (file)
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1739,6 +1739,10 @@ CREATE TABLE `suggestions` (
   `suggesteddate` date NOT NULL default 0,
   `managedby` int(11) default NULL,
   `manageddate` date default NULL,
+   acceptedby INT(11) default NULL,
+   accepteddate date default NULL,
+   rejectedby INT(11) default NULL,
+   rejecteddate date default NULL,
   `STATUS` varchar(10) NOT NULL default '',
   `note` mediumtext,
   `author` varchar(80) default NULL,
@@ -1753,6 +1757,10 @@ CREATE TABLE `suggestions` (
   `mailoverseeing` smallint(1) default 0,
   `biblionumber` int(11) default NULL,
   `reason` text,
+   budgetid INT(11),
+   branchcode VARCHAR(10) default NULL,
+   collectiontitle text default NULL,
+   itemtype VARCHAR(30) default NULL,
   PRIMARY KEY  (`suggestionid`),
   KEY `suggestedby` (`suggestedby`),
   KEY `managedby` (`managedby`)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 14fee61..08e2627 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2771,31 +2771,8 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
        print "Upgrade done (Adding finedays renewalsallowed, and reservesallowed fields in issuingrules table)\n";
 }
 
-$DBversion = "3.01.00.069";
-if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
-       $dbh->do(<<SUGGESTIONS);
-       ALTER table suggestions 
-               ADD budgetid INT(11),
-               ADD branchcode VARCHAR(10) default NULL,
-               ADD acceptedby INT(11) default NULL,
-               ADD acceptedon date default NULL,
-               ADD suggestedby INT(11) default NULL,
-               ADD suggestedon date default NULL,
-               ADD managedby INT(11) default NULL,
-               ADD managedon date default NULL,
-               ADD rejectedby INT(11) default NULL,
-               ADD rejectedon date default NULL,
-               ADD collectiontitle text default NULL,
-               ADD itemtype VARCHAR(30) default NULL,
-               ADD biblionumber INT(11) default NULL,
-               ADD sort1 VARCHAR(80) default NULL,
-               ADD sort2 VARCHAR(80) default NULL
-               ;
-SUGGESTIONS
-       print "Add some fields to suggestions";
-}
 
-$DBversion = "3.01.00.070";
+$DBversion = "3.01.00.069";
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
        $dbh->do("INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('EnableOpacSearchHistory', '1', '', 'Enable or disable opac search history', 'YesNo')");
 
@@ -2816,13 +2793,13 @@ SEARCHHIST
        print "Upgrade done (added OPAC search history preference and table)\n";
 }
 
-$DBversion = "3.01.00.071";
+$DBversion = "3.01.00.070";
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
        $dbh->do("ALTER TABLE authorised_values ADD COLUMN `lib_opac` VARCHAR(80) default NULL AFTER `lib`");
        print "Upgrade done (Added a lib_opac field in authorised_values table)\n";
 }
 
-$DBversion = "3.01.00.072";
+$DBversion = "3.01.00.071";
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
        $dbh->do("ALTER TABLE `subscription` ADD `enddate` date default NULL");
        $dbh->do("ALTER TABLE subscriptionhistory CHANGE enddate histenddate DATE default NULL");
@@ -3140,24 +3117,18 @@ $DBversion = "3.01.00.114";
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     $dbh->do(<<SUGGESTIONS);
 ALTER table suggestions 
-       ADD budgetid INT(11),
-       ADD branchcode VARCHAR(10) default NULL,
-       ADD acceptedby INT(11) default NULL,
-       ADD acceptedon date default NULL,
-       ADD suggestedby INT(11) default NULL,
-       ADD suggestedon date default NULL,
-       ADD managedby INT(11) default NULL,
-       ADD managedon date default NULL,
-       ADD rejectedby INT(11) default NULL,
-       ADD rejectedon date default NULL,
-       ADD collectiontitle text default NULL,
-       ADD itemtype VARCHAR(30) default NULL,
-       ADD biblionumber INT(11) default NULL,
-       ADD sort1 VARCHAR(80) default NULL,
-       ADD sort2 VARCHAR(80) default NULL
-       ;
+    ADD budgetid INT(11),
+    ADD branchcode VARCHAR(10) default NULL,
+    ADD acceptedby INT(11) default NULL,
+    ADD accepteddate date default NULL,
+    ADD suggesteddate date default NULL,
+    ADD manageddate date default NULL,
+    ADD rejectedby INT(11) default NULL,
+    ADD rejecteddate date default NULL,
+    ADD collectiontitle text default NULL,
+    ADD itemtype VARCHAR(30) default NULL,
+    ;
 SUGGESTIONS
-
     print "Upgrade to $DBversion done Suggestions";
     SetVersion ($DBversion);
 }