Attachment #112046 for bug #24412

View | Details | Raw Unified | Return to bug 24412
Collapse All | Expand All




$DBversion = 'XXX';  # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
    # you can use $dbh here like:
    $dbh->do(q{
ALTER TABLE reserves ADD COLUMN desk_id INT(11) DEFAULT NULL AFTER branchcode,
  ADD KEY desk_id (`desk_id`),
  ADD CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`desk_id`) REFERENCES `desks` (`desk_id`) ON DELETE CASCADE ON UPDATE CASCADE ;
             });
    $dbh->do(q{
ALTER TABLE old_reserves ADD COLUMN desk_id INT(11) DEFAULT NULL AFTER branchcode,
  ADD KEY `old_desk_id` (`desk_id`);
             });

    SetVersion( $DBversion );
    print "Upgrade to $DBversion done (Bug XXXXX - Attach waiting reserve to desk)\n";
}




  `reservedate` date default NULL, -- the date the hold was placed
  `biblionumber` int(11) NOT NULL default 0, -- foreign key from the biblio table defining which bib record this hold is on
  `branchcode` varchar(10) default NULL, -- foreign key from the branches table defining which branch the patron wishes to pick this hold up at
  `desk_id` int(11) default NULL, -- foreign key from the desks table defining which desk the patron should pick this hold up at
  `notificationdate` date default NULL, -- currently unused
  `reminderdate` date default NULL, -- currently unused
  `cancellationdate` date default NULL, -- the date this hold was cancelled

  KEY `biblionumber` (`biblionumber`),
  KEY `itemnumber` (`itemnumber`),
  KEY `branchcode` (`branchcode`),
  KEY `desk_id` (`desk_id`),
  KEY `itemtype` (`itemtype`),
  CONSTRAINT `reserves_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`desk_id`) REFERENCES `desks` (`desk_id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

--

  `reservedate` date default NULL, -- the date the hold was places
  `biblionumber` int(11) default NULL, -- foreign key from the biblio table defining which bib record this hold is on
  `branchcode` varchar(10) default NULL, -- foreign key from the branches table defining which branch the patron wishes to pick this hold up at
  `desk_id` int(11) default NULL, -- foreign key from the desks table defining which desk the patron should pick this hold up at
  `notificationdate` date default NULL, -- currently unused
  `reminderdate` date default NULL, -- currently unused
  `cancellationdate` date default NULL, -- the date this hold was cancelled
- 

Return to bug 24412

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_24412_Attach_waiting_reserve_to_desk.perl (+16 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if( CheckVersion( $DBversion ) ) {
	3	# you can use $dbh here like:
	4	$dbh->do(q{
	5	ALTER TABLE reserves ADD COLUMN desk_id INT(11) DEFAULT NULL AFTER branchcode,
	6	ADD KEY desk_id (`desk_id`),
	7	ADD CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`desk_id`) REFERENCES `desks` (`desk_id`) ON DELETE CASCADE ON UPDATE CASCADE ;
	8	});
	9	$dbh->do(q{
	10	ALTER TABLE old_reserves ADD COLUMN desk_id INT(11) DEFAULT NULL AFTER branchcode,
	11	ADD KEY `old_desk_id` (`desk_id`);
	12	});
	13
	14	SetVersion( $DBversion );
	15	print "Upgrade to $DBversion done (Bug XXXXX - Attach waiting reserve to desk)\n";
	16	}

Lines 1761-1766 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here

(-)a/installer/data/mysql/kohastructure.sql (-2 / +5 lines)
1761	`reservedate` date default NULL, -- the date the hold was placed	1761	`reservedate` date default NULL, -- the date the hold was placed
1762	`biblionumber` int(11) NOT NULL default 0, -- foreign key from the biblio table defining which bib record this hold is on	1762	`biblionumber` int(11) NOT NULL default 0, -- foreign key from the biblio table defining which bib record this hold is on
1763	`branchcode` varchar(10) default NULL, -- foreign key from the branches table defining which branch the patron wishes to pick this hold up at	1763	`branchcode` varchar(10) default NULL, -- foreign key from the branches table defining which branch the patron wishes to pick this hold up at
		1764	`desk_id` int(11) default NULL, -- foreign key from the desks table defining which desk the patron should pick this hold up at
1764	`notificationdate` date default NULL, -- currently unused	1765	`notificationdate` date default NULL, -- currently unused
1765	`reminderdate` date default NULL, -- currently unused	1766	`reminderdate` date default NULL, -- currently unused
1766	`cancellationdate` date default NULL, -- the date this hold was cancelled	1767	`cancellationdate` date default NULL, -- the date this hold was cancelled
Lines 1784-1795 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1784	KEY `biblionumber` (`biblionumber`),	1785	KEY `biblionumber` (`biblionumber`),
1785	KEY `itemnumber` (`itemnumber`),	1786	KEY `itemnumber` (`itemnumber`),
1786	KEY `branchcode` (`branchcode`),	1787	KEY `branchcode` (`branchcode`),
		1788	KEY `desk_id` (`desk_id`),
1787	KEY `itemtype` (`itemtype`),	1789	KEY `itemtype` (`itemtype`),
1788	CONSTRAINT `reserves_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE,	1790	CONSTRAINT `reserves_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1789	CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,	1791	CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1790	CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,	1792	CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1791	CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,	1793	CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1792	CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE	1794	CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
		1795	CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`desk_id`) REFERENCES `desks` (`desk_id`) ON DELETE CASCADE ON UPDATE CASCADE
1793	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;	1796	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1794		1797
1795	--	1798	--
Lines 1803-1808 CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b Link Here
1803	`reservedate` date default NULL, -- the date the hold was places	1806	`reservedate` date default NULL, -- the date the hold was places
1804	`biblionumber` int(11) default NULL, -- foreign key from the biblio table defining which bib record this hold is on	1807	`biblionumber` int(11) default NULL, -- foreign key from the biblio table defining which bib record this hold is on
1805	`branchcode` varchar(10) default NULL, -- foreign key from the branches table defining which branch the patron wishes to pick this hold up at	1808	`branchcode` varchar(10) default NULL, -- foreign key from the branches table defining which branch the patron wishes to pick this hold up at
		1809	`desk_id` int(11) default NULL, -- foreign key from the desks table defining which desk the patron should pick this hold up at
1806	`notificationdate` date default NULL, -- currently unused	1810	`notificationdate` date default NULL, -- currently unused
1807	`reminderdate` date default NULL, -- currently unused	1811	`reminderdate` date default NULL, -- currently unused
1808	`cancellationdate` date default NULL, -- the date this hold was cancelled	1812	`cancellationdate` date default NULL, -- the date this hold was cancelled
1809	-