Introduced wrapper function addCreateTableSql(), fixed parameter order:

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

diff --git a/inc/extensions/ext-forced.php b/inc/extensions/ext-forced.php
index a98fe19915a6766a350ebe4557fe54ec8b6e6f58..8313a04b948ff272e1362d1f531e01ef69f945f1 100644 (file)
--- a/inc/extensions/ext-forced.php
+++ b/inc/extensions/ext-forced.php
@@ -57,7 +57,7 @@ switch (getExtensionMode()) {
                // All required tables for this extension:
                // - Ads
                addDropTableSql('forced_ads');
                // All required tables for this extension:
                // - Ads
                addDropTableSql('forced_ads');

-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_forced_ads` (
+               addCreateTableSql('forced_ads', "(

 `forced_ads_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_ads_ad_url` VARCHAR( 255 ) NULL DEFAULT NULL ,
 `forced_ads_click_url` VARCHAR( 255 ) NOT NULL ,
 `forced_ads_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_ads_ad_url` VARCHAR( 255 ) NULL DEFAULT NULL ,
 `forced_ads_click_url` VARCHAR( 255 ) NOT NULL ,


@@ -74,7 +74,7 @@ PRIMARY KEY ( `forced_ads_id` )
 
                // - Campaigns
                addDropTableSql('forced_campaigns');
 
                // - Campaigns
                addDropTableSql('forced_campaigns');

-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_forced_campaigns` (
+               addCreateTableSql('forced_campaigns', "(

 `forced_campaign_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_campaign_created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ,
 `forced_campaign_status` ENUM( 'ACTIVE', 'PENDING', 'EXPIRED', 'LOCKED' ) NOT NULL DEFAULT 'PENDING',
 `forced_campaign_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_campaign_created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ,
 `forced_campaign_status` ENUM( 'ACTIVE', 'PENDING', 'EXPIRED', 'LOCKED' ) NOT NULL DEFAULT 'PENDING',


@@ -91,7 +91,7 @@ PRIMARY KEY ( `forced_campaign_id` )
 
                // - Campaigns <-> Ads
                addDropTableSql('forced_campaigns_ads');
 
                // - Campaigns <-> Ads
                addDropTableSql('forced_campaigns_ads');

-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_forced_campaigns_ads` (
+               addCreateTableSql('forced_campaigns_ads', "(

 `forced_campaign_ads_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_campaign_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_ads_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_campaign_ads_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_campaign_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_ads_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,


@@ -101,7 +101,7 @@ PRIMARY KEY ( `forced_campaign_ads_id` )
 
                // - Campaigns <-> User
                addDropTableSql('forced_campaigns_user');
 
                // - Campaigns <-> User
                addDropTableSql('forced_campaigns_user');

-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_forced_campaigns_user` (
+               addCreateTableSql('forced_campaigns_user', "(

 `forced_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_campaign_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_user_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_campaign_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_user_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,


@@ -113,7 +113,7 @@ PRIMARY KEY ( `forced_id` )
 
                // - Campaign costs
                addDropTableSql('forced_costs');
 
                // - Campaign costs
                addDropTableSql('forced_costs');

-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_forced_costs` (
+               addCreateTableSql('forced_costs', "(

 `forced_costs_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_costs_price_click` FLOAT( 20, 5 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_costs_payment_click` FLOAT( 20, 5 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_costs_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_costs_price_click` FLOAT( 20, 5 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_costs_payment_click` FLOAT( 20, 5 ) UNSIGNED NULL DEFAULT NULL ,


@@ -123,7 +123,7 @@ PRIMARY KEY ( `forced_costs_id` )
 
                // - Campaign Statistics
                addDropTableSql('forced_stats');
 
                // - Campaign Statistics
                addDropTableSql('forced_stats');

-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_forced_stats` (
+               addCreateTableSql('forced_stats', "(

 `forced_stats_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_stats_campaign_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_stats_user_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_stats_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT ,
 `forced_stats_campaign_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,
 `forced_stats_user_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL ,