SQLs fixed

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

diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php
index a7dc55aeb3458c860bb940257afcb3a73e0b16bd..729594731d6ac49312b262e90ca4964dd0810408 100644 (file)
--- a/inc/extensions/ext-country.php
+++ b/inc/extensions/ext-country.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -52,15 +52,15 @@ setExtensionAlwaysActive('Y');
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
                // SQL commands to run
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_countries`');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_countries` (
-id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-code CHAR(2) NOT NULL DEFAULT 'DE',
-descr VARCHAR(255) NOT NULL DEFAULT 'Deutschland',
-is_active ENUM('Y','N') NOT NULL DEFAULT 'N',
-KEY (code),
-PRIMARY KEY (id)
-) TYPE={?_TABLE_TYPE?}");
+               addDropTableSql('countries');
+               addCreateTableSql('countries', "(
+`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`code` CHAR(2) NOT NULL DEFAULT 'DE',
+`descr` VARCHAR(255) NOT NULL DEFAULT 'Deutschland',
+`is_active` ENUM('Y','N') NOT NULL DEFAULT 'N',
+KEY (`code`),
+PRIMARY KEY (`id`)
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Country codes and their full-length descriptions'");
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_countries` (code, descr, is_active) VALUES ('DE','Deutschland','Y')");
 
                // Admin menu
@@ -73,7 +73,7 @@ PRIMARY KEY (id)
 
        case 'remove': // Do stuff when removing extension
                // SQL commands to run
-               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_countries`');
+               addDropTableSql('countries');
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='country'");
                break;
 
@@ -115,7 +115,7 @@ PRIMARY KEY (id)
        case 'modify': // When the extension got modified
                break;
 
-       case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305.
+       case 'test': // For testing purposes
                break;
 
        case 'init': // Do stuff when extension is initialized