From a549ad00c8e08bafbf45c3e6c8b970ad210439c1 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Thu, 6 Mar 2014 17:18:49 -0500 Subject: [PATCH] Bug 8000 - Add a sentto_address column to message_queue The problem with message_queue is the inability to tell if the to_address was overriden at the time it was sent/attempted. This column will reflect what was attempted. MessageQueue.pm was generated by running the script installer/data/mysql/updatedatabase.pl and then git add'ing the resulting Koha/Schema/Result/MessageQueue.pm file. This was generated by running ./misc/devel/update_dbix_class_files.pl using appropriate -db_name=... -db_user=... -db_passwd=... parameters. This file is necessary for 3.16 and higher. --- Koha/Schema/Result/MessageQueue.pm | 11 +++++++++-- installer/data/mysql/kohastructure.sql | 1 + installer/data/mysql/updatedatabase.pl | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Koha/Schema/Result/MessageQueue.pm b/Koha/Schema/Result/MessageQueue.pm index 6612db5..6c98745 100644 --- a/Koha/Schema/Result/MessageQueue.pm +++ b/Koha/Schema/Result/MessageQueue.pm @@ -82,6 +82,11 @@ __PACKAGE__->table("message_queue"); data_type: 'mediumtext' is_nullable: 1 +=head2 sentto_address + + data_type: 'mediumtext' + is_nullable: 1 + =head2 from_address data_type: 'mediumtext' @@ -125,6 +130,8 @@ __PACKAGE__->add_columns( }, "to_address", { data_type => "mediumtext", is_nullable => 1 }, + "sentto_address", + { data_type => "mediumtext", is_nullable => 1 }, "from_address", { data_type => "mediumtext", is_nullable => 1 }, "content_type", @@ -169,8 +176,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YWxM2O2W/h34qqIOIpzOtw +# Created by DBIx::Class::Schema::Loader v0.07025 @ 2014-03-06 22:50:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fL7N2f/cS1ff4rsqQGHX9w # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 6ddba43..8014147 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2574,6 +2574,7 @@ CREATE TABLE `message_queue` ( `status` enum('sent','pending','failed','deleted') NOT NULL default 'pending', `time_queued` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, `to_address` mediumtext, + `sentto_address` mediumtext, `from_address` mediumtext, `content_type` text, KEY `message_id` (`message_id`), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 8ba9f17..e836780 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -9974,7 +9974,8 @@ if ( CheckVersion($DBversion) ) { $DBversion = "3.19.00.XXX"; if ( CheckVersion($DBversion) ) { $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SendAllEmailsTo','',NULL,'This email will replace the To address in every message sent by the system. This is meant to help testing and validation only.','Textarea')"); - print "Upgrade to $DBversion done (Bug 8000 - system preferences to override the destination of every email sent by the system.)\n"; + $dbh->do( qw{ ALTER TABLE message_queue ADD sentto_address mediumtext AFTER to_address } ); + print "Upgrade to $DBversion done (Bug 8000 - add method to override the destination of every email sent by the system.)\n"; SetVersion ($DBversion); } @@ -9992,7 +9993,6 @@ while ( my $file = readdir $dirh ) { my $rv = $installer->load_sql( $update_dir . $file ) ? 0 : 1; } - =head1 FUNCTIONS =head2 TableExists($table) -- 1.9.1