addCreateTableSql() is now more encapsulated

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

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index 59da20bc1d63b55f27a4eb52881b273777f6379c..cf297dd85b65f8c71f7ce76ad714fc8b67272da3 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -53,7 +53,7 @@ switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
                // SQL commands to run (surfbar URLs)
                addDropTableSql('surfbar_urls');
-               addCreateTableSql('surfbar_urls', "(
+               addCreateTableSql('surfbar_urls', "
 `url_id` BIGINT(20) UNSIGNED  NOT NULL AUTO_INCREMENT,
 `url_userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `url` VARCHAR(255) NOT NULL DEFAULT '',
@@ -69,36 +69,36 @@ switch (getExtensionMode()) {
 `url_fixed_reload` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`url_id`),
 UNIQUE KEY `userid_url` (`url_userid`,`url`),
-INDEX `status_userid` (`url_status`,`url_userid`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar URLs'");
+INDEX `status_userid` (`url_status`,`url_userid`)",
+                       'Surfbar URLs');
 
                // Reload locks
                addDropTableSql('surfbar_locks');
-               addCreateTableSql('surfbar_locks', "(
+               addCreateTableSql('surfbar_locks', "
 `locks_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `locks_userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `locks_url_id` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `locks_last_surfed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`locks_id`),
 UNIQUE KEY `userid_url` (`locks_userid`,`locks_url_id`),
-INDEX (`locks_url_id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar reload locks'");
+INDEX (`locks_url_id`)",
+                       'Surfbar reload locks');
 
                // Surfbar salts
                addDropTableSql('surfbar_salts');
-               addCreateTableSql('surfbar_salts', "(
+               addCreateTableSql('surfbar_salts', "
 `salts_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `salts_userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `salts_url_id` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `salts_last_salt` VARCHAR(255) NOT NULL DEFAULT '',
 PRIMARY KEY (`salts_id`),
 UNIQUE KEY `salts_userid_url` (`salts_userid`,`salts_url_id`),
-INDEX (`salts_url_id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar last used salts'");
+INDEX (`salts_url_id`)",
+                       'Surfbar last used salts');
 
                // Statistics
                addDropTableSql('surfbar_stats');
-               addCreateTableSql('surfbar_stats', "(
+               addCreateTableSql('surfbar_stats', "
 `stats_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `stats_userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `stats_url_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -106,19 +106,19 @@ INDEX (`salts_url_id`)
 `stats_last_surfed` TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`stats_id`),
 UNIQUE KEY `userid_url` (`stats_userid`,`stats_url_id`),
-INDEX (`stats_url_id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar Statistics'");
+INDEX (`stats_url_id`)",
+                       'Surfbar Statistics');
 
                // Member actions pending on status
                addDropTableSql('surfbar_actions');
-               addCreateTableSql('surfbar_actions', "(
+               addCreateTableSql('surfbar_actions', "
 `actions_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `actions_status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED','DEPLETED') NULL DEFAULT NULL,
 `actions_action` ENUM('EDIT','DELETE','PAUSE','UNPAUSE','FRAMETEST','RETREAT','RESUBMIT','BOOKNOW') NULL DEFAULT NULL,
 `actions_new_status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED','DEPLETED') NULL DEFAULT NULL,
 PRIMARY KEY (`actions_id`),
-UNIQUE KEY `status_action` (`actions_status`,`actions_action`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar Member Actions'");
+UNIQUE KEY `status_action` (`actions_status`,`actions_action`)",
+                       'Surfbar Member Actions');
 
                // Member actions
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('PENDING','RETREAT','DELETED')");