UnitedKnowledge/webgui_newsletter
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renaming mailing tables to better names.

Browse source
This commit is contained in:
Martin Kamerbeek 2010-06-03 12:10:07 +02:00
parent da2ea4d62b
commit a1d8ab6f70
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Mailing.pm
View file

@ -48,7 +48,7 @@ sub crud_definition {
my $definition = $class->SUPER::crud_definition( $session ); my $definition = $class->SUPER::crud_definition( $session );
$definition->{ tableName } = 'WGMailing'; $definition->{ tableName } = 'Mailing';
$definition->{ tableKey } = 'mailingId'; $definition->{ tableKey } = 'mailingId';
$definition->{ sequenceKey } = 'issueId'; $definition->{ sequenceKey } = 'issueId';
@ -143,7 +143,7 @@ sub getStatusLine {
my $db = $self->session->db; my $db = $self->session->db;
my $sth = $db->read( my $sth = $db->read(
'select status, isTest, count( status ) as cnt from WGMailing_queue where mailingId=? group by status,isTest', 'select status, isTest, count( status ) as cnt from Mailing_email where mailingId=? group by status,isTest',
[ [
$self->getId, $self->getId,
], ],

2
lib/WebGUI/Mailing/Bounce.pm
View file

@ -58,7 +58,7 @@ sub www_bounceReport {
my $self = shift; my $self = shift;
my $session = $self->session; my $session = $self->session;
my $i18n = WebGUI::International->new( $session, 'MailingManager' ); my $i18n = WebGUI::International->new( $session, 'MailingManager' );
my $sth = $session->db->read( 'select distinct sentTo from WGMailing_queue where sentTo is not null' ); my $sth = $session->db->read( 'select distinct sentTo from Mailing_email where sentTo is not null' );
my $output = '<table><tr><th>'.$i18n->get('email').'</th><th>'.$i18n->get('bounce score').'</th></tr>'; my $output = '<table><tr><th>'.$i18n->get('email').'</th><th>'.$i18n->get('bounce score').'</th></tr>';
while ( my ($email) = $sth->array ) { while ( my ($email) = $sth->array ) {

2
lib/WebGUI/Mailing/Email.pm
View file

@ -14,7 +14,7 @@ sub crud_definition {
my $definition = $class->SUPER::crud_definition( $session ); my $definition = $class->SUPER::crud_definition( $session );
$definition->{ tableName } = 'WGMailing_queue'; $definition->{ tableName } = 'Mailing_email';
$definition->{ tableKey } = 'mailId'; $definition->{ tableKey } = 'mailId';
$definition->{ sequenceKey } = 'mailingId'; $definition->{ sequenceKey } = 'mailingId';

13
sbin/install_newsletter.pl
View file

@ -34,7 +34,6 @@ renamespaceTemplates( $session );
finish($session); finish($session);
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
sub installMailableAspectTable { sub installMailableAspectTable {
my $session = shift; my $session = shift;
@ -152,8 +151,20 @@ sub addRecentColumnToNewsletterCollection {
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
sub installMailingTables { sub installMailingTables {
my $session = shift; my $session = shift;
my $db = $session->db;
print "\tInstalling Mailing table..."; print "\tInstalling Mailing table...";
# Remname tables from a previous (bad) name to a new (good) one.
# Must be done before the crudCreateOrUpdate calls to prevent creation of stale tables.
my @tables = $db->buildArray( 'show tables' );
if ( grep { $_ eq 'WGMailing' } @tables ) {
$db->write( 'rename table WGMailing to Mailing' );
}
if ( grep { $_ eq 'WGMailing_queue' } @tables ) {
$db->write( 'rename table WGMailing_queue to Mailing_email' );
}
# Create or update Mailing tables.
use WebGUI::Mailing; use WebGUI::Mailing;
use WebGUI::Mailing::Email; use WebGUI::Mailing::Email;