addCreateTableSql() is now more encapsulated

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

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index cdc9e787564d9fd952b791b7e511048fe3fb9456..5adb509dfaf73d88f2dd21bf2c95144ea0779a89 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -374,30 +374,30 @@ IN (
                        case '0.3.2': // SQL queries for v0.3.2
                                // Connection table between the menu system and the "logical area system"
                                addDropTableSql('admin_menu_las');
-                               addCreateTableSql('admin_menu_las', "(
+                               addCreateTableSql('admin_menu_las', "
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `la_id` VARCHAR(255) NOT NULL DEFAULT '',
 `la_action` VARCHAR(255) NOT NULL DEFAULT '',
 `la_what` VARCHAR(255) NOT NULL DEFAULT '',
+PRIMARY KEY (`id`),
 INDEX (`la_id`),
 INDEX (`la_action`),
-INDEX (`la_what`),
-PRIMARY KEY (`id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Menu system -> LAS'");
+INDEX (`la_what`)",
+                                       'Menu system -> LAS');
 
                                // All "logical areas" together
                                addDropTableSql('admin_menu_las_data');
-                               addCreateTableSql('admin_menu_las_data', "(
+                               addCreateTableSql('admin_menu_las_data', "
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `la_id` VARCHAR(255) NOT NULL DEFAULT '',
 `la_title` VARCHAR(255) NOT NULL DEFAULT '',
 `la_posx` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `la_posy` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+PRIMARY KEY (`id`),
 UNIQUE KEY (`la_id`),
 INDEX (`la_posx`),
-INDEX (`la_posy`),
-PRIMARY KEY (`id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'LAS position and title data'");
+INDEX (`la_posy`)",
+                                       'LAS position and title data');
 
                                // Which menu do you like?
                                addConfigAddSql('admin_menu', "ENUM('NEW','OLD') NOT NULL DEFAULT 'OLD'");
@@ -415,14 +415,14 @@ PRIMARY KEY (`id`)
 
                                // The statistics table
                                addDropTableSql('admin_las_stats');
-                               addCreateTableSql('admin_las_stats', "(
+                               addCreateTableSql('admin_las_stats', "
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `admin_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `type` ENUM('la','action','what') NOT NULL DEFAULT 'what',
 `clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-INDEX (`admin_id`),
-PRIMARY KEY (`id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'LAS click data'");
+PRIMARY KEY (`id`),
+INDEX (`admin_id`)",
+                                       'LAS click data');
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Admin-abhängig werden nun Klicks im Admin-Menü gezählt, die zur automatischen Anpassung des Menüs in den logischen Bereichen diennen. Dieses "intelligente Unbauen" können Sie auch ganz abschalten.");
@@ -623,15 +623,17 @@ PRIMARY KEY (`id`)
 
                        case '0.5.9': // SQL queries for v0.5.9
                                // Table 'filters' is vital because many functionality depends on it, so don't remove it
-                               addCreateTableSql('filters', "(
+                               addCreateTableSql('filters', "
 `filter_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `filter_name` VARCHAR(50) NOT NULL DEFAULT '',
 `filter_function` VARCHAR(100) NOT NULL DEFAULT '',
 `filter_active` ENUM('N','Y') NOT NULL DEFAULT 'Y',
 `filter_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-UNIQUE `name_function` (`filter_name` , `filter_function`),
-PRIMARY KEY (`filter_id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Filter system'");
+PRIMARY KEY (`filter_id`),
+UNIQUE `name_function` (`filter_name` , `filter_function`)",
+                                       'Filter system');
+
+                               // Admin menu
                                addAdminMenuSql('setup','list_filter','Filter-Management', 'Zeigt alle im System registrierten Filter an und lässt diese de- bzw. wieder aktivieren.', 17);
 
                                // Update notes (these will be set as task text!)
@@ -723,13 +725,13 @@ PRIMARY KEY (`filter_id`)
                        case '0.7.0': // SQL queries for 0.7.0
                                // Table definition
                                addDropTableSql('dns_cache');
-                               addCreateTableSql('dns_cache', "(
+                               addCreateTableSql('dns_cache', "
 `hostname` VARCHAR(255) NOT NULL,
 `ip` VARCHAR(15) NOT NULL,
 `added` DATETIME NOT NULL,
 PRIMARY KEY (`hostname`),
-INDEX (`ip`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Cache for DNS requests'");
+INDEX (`ip`)",
+                                       'Cache for DNS requests');
 
                                // Configuration
                                addConfigAddSql('dns_cache_timeout', 'BIGINT(20) NOT NULL DEFAULT ' . (60*60*24));
@@ -811,15 +813,15 @@ INDEX (`ip`)
                        case '0.8.0': // SQL queries for v0.8.0
                                // Points account data
                                addDropTableSql('points_data');
-                               addCreateTableSql('points_data', "(
+                               addCreateTableSql('points_data', "
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `ext_name` VARCHAR(255) NOT NULL DEFAULT '',
 `column_name` VARCHAR(255) NOT NULL DEFAULT 'points',
 `locked_mode` ENUM('LOCKED','UNLOCKED') NOT NULL DEFAULT 'LOCKED',
 `payment_method` ENUM('DIRECT','REF') NOT NULL DEFAULT 'REF',
 PRIMARY KEY(`id`),
-INDEX (`ext_name`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Points account data'");
+INDEX (`ext_name`)",
+                                       'Points account data');
 
                                // Admin menu
                                addAdminMenuSql('setup','list_point_accounts','Guthabenkonten...','Veralten Sie hier bequem Einstellungen zu den Guthabenkonten.',5);