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

(-)a/installer/data/mysql/kohastructure.sql (-9 lines)
Lines 2576-2590 CREATE TABLE overduerules_transport_types( Link Here
2576
    `message_transport_type` VARCHAR(20) NOT NULL DEFAULT 'email',
2576
    `message_transport_type` VARCHAR(20) NOT NULL DEFAULT 'email',
2577
    `overduerules_id` INT(11) NOT NULL,
2577
    `overduerules_id` INT(11) NOT NULL,
2578
    PRIMARY KEY (id),
2578
    PRIMARY KEY (id),
2579
<<<<<<< HEAD
2580
    CONSTRAINT overduerules_fk FOREIGN KEY (overduerules_id) REFERENCES overduerules (overduerules_id) ON DELETE CASCADE ON UPDATE CASCADE,
2581
=======
2582
<<<<<<< HEAD
2583
    CONSTRAINT overduerules_fk FOREIGN KEY (branchcode, categorycode) REFERENCES overduerules (branchcode, categorycode) ON DELETE CASCADE ON UPDATE CASCADE,
2584
=======
2585
    CONSTRAINT overduerules_transport_types_fk FOREIGN KEY (overduerules_id) REFERENCES overduerules (overduerules_id) ON DELETE CASCADE ON UPDATE CASCADE,
2579
    CONSTRAINT overduerules_transport_types_fk FOREIGN KEY (overduerules_id) REFERENCES overduerules (overduerules_id) ON DELETE CASCADE ON UPDATE CASCADE,
2586
>>>>>>> 6be069d... Bug 12772 - Update Database (Based on Bug13624)
2587
>>>>>>> Bug 12772 - Update Database (Based on Bug13624)
2588
    CONSTRAINT mtt_fk FOREIGN KEY (message_transport_type) REFERENCES message_transport_types (message_transport_type) ON DELETE CASCADE ON UPDATE CASCADE
2580
    CONSTRAINT mtt_fk FOREIGN KEY (message_transport_type) REFERENCES message_transport_types (message_transport_type) ON DELETE CASCADE ON UPDATE CASCADE
2589
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
2581
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
2590
2582
2591
- 

Return to bug 12772