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

(-)a/installer/data/mysql/kohastructure.sql (-1 / +2 lines)
Lines 3049-3055 CREATE TABLE `aqorders_items` ( -- information on items entered in the acquisiti Link Here
3049
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this order item was last touched
3049
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this order item was last touched
3050
  PRIMARY KEY  (`itemnumber`),
3050
  PRIMARY KEY  (`itemnumber`),
3051
  KEY `ordernumber` (`ordernumber`),
3051
  KEY `ordernumber` (`ordernumber`),
3052
  CONSTRAINT aqorders_items_ibfk_1 FOREIGN KEY (ordernumber) REFERENCES aqorders (ordernumber) ON DELETE CASCADE ON UPDATE CASCADE
3052
  CONSTRAINT aqorders_items_ibfk_1 FOREIGN KEY (ordernumber) REFERENCES aqorders (ordernumber) ON DELETE CASCADE ON UPDATE CASCADE,
3053
  CONSTRAINT `aqorders_items_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE
3053
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3054
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3054
3055
3055
3056
(-)a/installer/data/mysql/updatedatabase.pl (+15 lines)
Lines 8613-8618 if ( CheckVersion($DBversion) ) { Link Here
8613
    SetVersion($DBversion);
8613
    SetVersion($DBversion);
8614
}
8614
}
8615
8615
8616
$DBversion = '3.17.00.XXX';
8617
if ( CheckVersion($DBversion) ) {
8618
    $dbh->do(q|
8619
        DELETE aqorders_items.*
8620
        FROM aqorders_items
8621
        LEFT JOIN items ON items.itemnumber=aqorders_items.itemnumber
8622
        WHERE items.itemnumber IS NULL
8623
    |);
8624
    $dbh->do(q|
8625
        ALTER TABLE aqorders_items ADD FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE
8626
    |);
8627
    print "Upgrade to $DBversion done (Bug 12555 - Add a foreign key on aqorders_items.itemnumber)\n";
8628
    SetVersion($DBversion);
8629
}
8630
8616
=head1 FUNCTIONS
8631
=head1 FUNCTIONS
8617
8632
8618
=head2 TableExists($table)
8633
=head2 TableExists($table)
(-)a/t/db_dependent/Acquisition/CancelReceipt.t (-1 / +1 lines)
Lines 69-74 CancelReceipt($ordernumber); Link Here
69
my $order = GetOrder( $ordernumber );
69
my $order = GetOrder( $ordernumber );
70
is(scalar GetItemnumbersFromOrder($order->{ordernumber}), 0, "Create items on receiving: 0 item exist after cancelling a receipt");
70
is(scalar GetItemnumbersFromOrder($order->{ordernumber}), 0, "Create items on receiving: 0 item exist after cancelling a receipt");
71
71
72
$itemnumber = AddItem({}, $biblionumber);
72
t::lib::Mocks::mock_preference('AcqCreateItem', 'ordering');
73
t::lib::Mocks::mock_preference('AcqCreateItem', 'ordering');
73
( undef, $ordernumber ) = C4::Acquisition::NewOrder(
74
( undef, $ordernumber ) = C4::Acquisition::NewOrder(
74
    {
75
    {
75
- 

Return to bug 12555