addCreateTableSql() is now more encapsulated

[mailer.git] / inc / extensions / ext-newsletter.php

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index a104ccfec79e4bdb589cb9fd5a45f79b4a426ed2..3a81974a5a72106ffe224b7726c3d8d79a69d385 100644 (file)
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -140,7 +140,7 @@ switch (getExtensionMode()) {
                                // Tables:
                                // - Main data table
                                addDropTableSql('newsletter_data');
-                               addCreateTableSql('newsletter_data', "(
+                               addCreateTableSql('newsletter_data', "
 `nl_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `nl_subject` VARCHAR(255) NOT NULL DEFAULT '{OPEN_CONFIG}nl_default_subject{CLOSE_CONFIG}',
 `nl_header_text` MEDIUMTEXT,
@@ -154,34 +154,34 @@ switch (getExtensionMode()) {
 `nl_recipients` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `nl_received` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `nl_total_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-PRIMARY KEY (`nl_id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'General newsletter data'");
+PRIMARY KEY (`nl_id`)",
+                                       'General newsletter data');
 
                                // - Topics data table
                                addDropTableSql('newsletter_topics');
-                               addCreateTableSql('newsletter_topics', "(
+                               addCreateTableSql('newsletter_topics', "
 `nl_topic_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `nl_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `nl_topic_title` VARCHAR(255) NOT NULL DEFAULT '',
 `nl_topic_text` MEDIUMTEXT,
 `nl_topic_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-INDEX `newsletter_id` (`nl_id`),
-PRIMARY KEY (`nl_topic_id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Newsletter topics'");
+PRIMARY KEY (`nl_topic_id`),
+INDEX `newsletter_id` (`nl_id`)",
+                                       'Newsletter topics');
 
                                // - Sponsor orders data table
                                addDropTableSql('newsletter_orders');
-                               addCreateTableSql('newsletter_orders', "(
+                               addCreateTableSql('newsletter_orders', "
 `nl_order_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `nl_sponsor_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `nl_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `nl_topic_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `nl_order_placed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 `nl_order_accepted` ENUM('Y','N') NOT NULL DEFAULT 'N',
+PRIMARY KEY (`nl_order_id`),
 UNIQUE KEY `sponsor_nl_topic` (`nl_sponsor_id`,`nl_id`,`nl_topic_id`),
-INDEX `topic` (`nl_topic_id`),
-PRIMARY KEY (`nl_order_id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Newsletter orders'");
+INDEX `topic` (`nl_topic_id`)",
+                                       'Newsletter orders');
 
                                // Configuration
                                addConfigAddSql('nl_expire', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT ' . (getOneDay() * 7));