From b09b16dc293c9f571675dec58221e5c9c5965330 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 13 Dec 2013 01:06:12 +0000 Subject: [PATCH] Bug 11391: drop default value on suggestions.suggesteddate column The 'default 0' clause got translated as an invalid constant default of '0000-00-00' when DBIx::Schema is used to deploy the suggestions table into a Pg database. This patch drops the default. To test: [1] Apply the patch and run the SQL specified in the database updated. [2] Verify that the suggestions table no longer has an explicit default value for the suggesteddate column. [3] Verify that prove -v t/db_dependent/Suggestions.t passes. [4] Verify that installer/data/mysql/kohastructure.sql runs cleanly in an empty database. [5] Verify that there are no visible regressions of the purchase suggestions functionality. Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack Having a default of 0 on a date seems like a mad thing to do anyway, so good to get rid of it Signed-off-by: Jonathan Druart --- installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 3c5d9b0..c995c43 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2147,7 +2147,7 @@ DROP TABLE IF EXISTS `suggestions`; CREATE TABLE `suggestions` ( -- purchase suggestions `suggestionid` int(8) NOT NULL auto_increment, -- unique identifier assigned automatically by Koha `suggestedby` int(11) NOT NULL default 0, -- borrowernumber for the person making the suggestion, foreign key linking to the borrowers table - `suggesteddate` date NOT NULL default 0, -- date the suggestion was submitted + `suggesteddate` date NOT NULL, -- date the suggestion was submitted `managedby` int(11) default NULL, -- borrowernumber for the librarian managing the suggestion, foreign key linking to the borrowers table `manageddate` date default NULL, -- date the suggestion was updated acceptedby INT(11) default NULL, -- borrowernumber for the librarian who accepted the suggestion, foreign key linking to the borrowers table diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 78074f3..ae9dc45 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7853,6 +7853,15 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = "3.15.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + ALTER TABLE suggestions MODIFY suggesteddate DATE NOT NULL + }); + print "Upgrade to $DBversion done (Bug 11391) - drop default value on suggestions.suggesteddate column)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) -- 1.7.10.4