@@ -, +, @@ Database definition file, checked into cvs to make keeping database current easier --- installer/data/mysql/atomicupdate/bug_18173.perl | 13 +++++++++++++ installer/data/mysql/kohastructure.sql | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_18173.perl --- a/installer/data/mysql/atomicupdate/bug_18173.perl +++ a/installer/data/mysql/atomicupdate/bug_18173.perl @@ -0,0 +1,13 @@ +$DBversion = 'XXX'; +if( CheckVersion( $DBversion ) ) { + if ( column_exists( 'issues', 'return' ) ) { + $dbh->do(q|ALTER TABLE issues DROP column `return`|); + } + + if ( column_exists( 'old_issues', 'return' ) ) { + $dbh->do(q|ALTER TABLE old_issues DROP column `return`|); + } + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 18173 - Remove issues.return DB field)\n"; +} --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -1741,7 +1741,6 @@ CREATE TABLE `issues` ( -- information related to check outs or issues `branchcode` varchar(10) default NULL, -- foreign key, linking to the branches table for the location the item was checked out `returndate` datetime default NULL, -- date the item was returned, will be NULL until moved to old_issues `lastreneweddate` datetime default NULL, -- date the item was last renewed - `return` varchar(4) default NULL, `renewals` tinyint(4) default NULL, -- lists the number of times the item was renewed `auto_renew` BOOLEAN default FALSE, -- automatic renewal `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched @@ -1770,7 +1769,6 @@ CREATE TABLE `old_issues` ( -- lists items that were checked out and have been r `branchcode` varchar(10) default NULL, -- foreign key, linking to the branches table for the location the item was checked out `returndate` datetime default NULL, -- date the item was returned `lastreneweddate` datetime default NULL, -- date the item was last renewed - `return` varchar(4) default NULL, `renewals` tinyint(4) default NULL, -- lists the number of times the item was renewed `auto_renew` BOOLEAN default FALSE, -- automatic renewal `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched --