I had the create table statements in the wrong order, so they would not apply
cleanly.
This is an update to database version 091, and does not take a new number.
---
installer/data/mysql/updatedatabase.pl | 48 ++++++++++++++++----------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index 1e75e9a..8fff5cd 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -1676,35 +1676,11 @@ if (C4::Context->preference("Version") <
TransformToNum($DBversion)) {
$DBversion = "3.00.00.091";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$dbh->do(<<'END_SQL');
-CREATE TABLE `message_queue` (
- `message_id` int(11) NOT NULL auto_increment,
- `borrowernumber` int(11) NOT NULL,
- `subject` text,
- `content` text,
- `message_transport_type` varchar(20) NOT NULL,
- `status` enum('sent','pending','failed','deleted') NOT NULL default
'pending',
- `time_queued` timestamp NOT NULL default CURRENT_TIMESTAMP on update
CURRENT_TIMESTAMP,
- KEY `message_id` (`message_id`),
- KEY `borrowernumber` (`borrowernumber`),
- KEY `message_transport_type` (`message_transport_type`),
- CONSTRAINT `messageq_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES
`borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE,
- CONSTRAINT `messageq_ibfk_2` FOREIGN KEY (`message_transport_type`)
REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE
RESTRICT ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8
-END_SQL
-
- $dbh->do(<<'END_SQL');
ALTER TABLE borrowers
ADD `smsalertnumber` varchar(50) default NULL
END_SQL
$dbh->do(<<'END_SQL');
-CREATE TABLE `message_transport_types` (
- `message_transport_type` varchar(20) NOT NULL,
- PRIMARY KEY (`message_transport_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-END_SQL
-
- $dbh->do(<<'END_SQL');
CREATE TABLE `message_attributes` (
`message_attribute_id` int(11) NOT NULL auto_increment,
`message_name` varchar(20) NOT NULL default '',
@@ -1715,6 +1691,13 @@ CREATE TABLE `message_attributes` (
END_SQL
$dbh->do(<<'END_SQL');
+CREATE TABLE `message_transport_types` (
+ `message_transport_type` varchar(20) NOT NULL,
+ PRIMARY KEY (`message_transport_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+END_SQL
+
+ $dbh->do(<<'END_SQL');
CREATE TABLE `message_transports` (
`message_attribute_id` int(11) NOT NULL,
`message_transport_type` varchar(20) NOT NULL,
@@ -1757,6 +1740,23 @@ CREATE TABLE `borrower_message_transport_preferences` (
END_SQL
$dbh->do(<<'END_SQL');
+CREATE TABLE `message_queue` (
+ `message_id` int(11) NOT NULL auto_increment,
+ `borrowernumber` int(11) NOT NULL,
+ `subject` text,
+ `content` text,
+ `message_transport_type` varchar(20) NOT NULL,
+ `status` enum('sent','pending','failed','deleted') NOT NULL default
'pending',
+ `time_queued` timestamp NOT NULL default CURRENT_TIMESTAMP on update
CURRENT_TIMESTAMP,
+ KEY `message_id` (`message_id`),
+ KEY `borrowernumber` (`borrowernumber`),
+ KEY `message_transport_type` (`message_transport_type`),
+ CONSTRAINT `messageq_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES
`borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `messageq_ibfk_2` FOREIGN KEY (`message_transport_type`)
REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE
RESTRICT ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+END_SQL
+
+ $dbh->do(<<'END_SQL');
INSERT INTO `systempreferences`
(variable,value,explanation,options,type)
VALUES
--
1.5.5.GIT
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
