Index: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 18783)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 18786)
@@ -566,9 +566,4 @@
 INSERT INTO mtb_class VALUES ('1', '規格無し',0);
 INSERT INTO mtb_class VALUES ('2', '規格有り',1);
-INSERT INTO mtb_srank VALUES ('1', '1',0);
-INSERT INTO mtb_srank VALUES ('2', '2',1);
-INSERT INTO mtb_srank VALUES ('3', '3',2);
-INSERT INTO mtb_srank VALUES ('4', '4',3);
-INSERT INTO mtb_srank VALUES ('5', '5',4);
 INSERT INTO mtb_status VALUES ('1', 'NEW',0);
 INSERT INTO mtb_status VALUES ('2', '残りわずか',1);
Index: branches/version-2_5-dev/html/install/sql/column_comment.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/column_comment.sql	(revision 18777)
+++ branches/version-2_5-dev/html/install/sql/column_comment.sql	(revision 18786)
@@ -555,51 +555,8 @@
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_member','create_date','作成日');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_member','login_date','ログイン日');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question','question_id','質問ID');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question','question_name','質問名');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question','question','質問内容');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question','create_date','作成日時');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question','del_flg ','0:既定、1:削除');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','result_id','結果ID');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question_id','質問ID');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question_date','質問日');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question_name','質問名');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','name01','回答者名');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','name02','回答者名');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','kana01','回答者名');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','kana02','回答者名');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','zip01','郵便番号1');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','zip02','郵便番号2');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','pref','都道府県');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','addr01','住所1');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','addr02','住所2');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','tel01','電話番号1');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','tel02','電話番号2');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','tel03','電話番号3');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','mail01','メールアドレス');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question01','回答内容');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question02','回答内容');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question03','回答内容');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question04','回答内容');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question05','回答内容');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question06','回答内容');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','create_date','作成日時');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','del_flg ','0:既定、1:削除');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_bat_relate_products','product_id','この商品ID');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_bat_relate_products','relate_product_id','こんな商品ID');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_bat_relate_products','customer_id','顧客ID');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_bat_relate_products','create_date','集計日時');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','campaign_id','キャンペーンID');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','campaign_name','キャンペーン名');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','campaign_point_rate','キャンペーンポイント');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','campaign_point_type','キャンペーンタイプ');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','start_date','キャンペーン開始期間');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','end_date','キャンペーン終了期間');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','search_condition','検索条件');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','del_flg','0:既定　1:削除');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','create_date','作成日時');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','update_date','更新日時');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign_detail','campaign_id','キャンペーンID');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign_detail','product_id','キャンペーン名');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign_detail','campaign_point_rate','キャンペーンポイント');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_pagelayout','page_id','ページID 0はプレビュー用データ');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_pagelayout','page_name','ページ名称');
Index: branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 18778)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 18786)
@@ -228,35 +228,4 @@
 ) TYPE=InnoDB;
 
-CREATE TABLE dtb_mailmaga_template (
-    template_id int auto_increment NOT NULL,
-    subject text,
-    charge_image text,
-    mail_method int,
-    header text,
-    body text,
-    main_title text,
-    main_comment text,
-    main_product_id int,
-    sub_title text,
-    sub_comment text,
-    sub_product_id01 int,
-    sub_product_id02 int,
-    sub_product_id03 int,
-    sub_product_id04 int,
-    sub_product_id05 int,
-    sub_product_id06 int,
-    sub_product_id07 int,
-    sub_product_id08 int,
-    sub_product_id09 int,
-    sub_product_id10 int,
-    sub_product_id11 int,
-    sub_product_id12 int,
-    del_flg smallint NOT NULL DEFAULT 0,
-    creator_id int NOT NULL,
-    create_date datetime NOT NULL,
-    update_date datetime,
-    PRIMARY KEY (template_id)
-) TYPE=InnoDB;
-
 CREATE TABLE dtb_send_history (
     send_id int auto_increment NOT NULL,
@@ -595,14 +564,4 @@
 
 CREATE INDEX dtb_customer_mobile_phone_id_key ON dtb_customer (mobile_phone_id(64));
-
-CREATE TABLE dtb_customer_mail_temp (
-    email varchar(50) NOT NULL UNIQUE,
-    mail_flag smallint,
-    temp_id varchar(50) NOT NULL,
-    end_flag smallint,
-    update_date datetime NOT NULL,
-    create_data datetime NOT NULL,
-    PRIMARY KEY (temp_id)
-) TYPE=InnoDB;
 
 CREATE TABLE dtb_order (
@@ -685,5 +644,4 @@
     memo09 text,
     memo10 text,
-    campaign_id int,
     PRIMARY KEY (order_id)
 ) TYPE=InnoDB;
@@ -829,42 +787,4 @@
 ) TYPE=InnoDB;
 
-CREATE TABLE dtb_question (
-    question_id int auto_increment NOT NULL,
-    question_name text,
-    question text,
-    create_date datetime NOT NULL,
-    del_flg smallint NOT NULL DEFAULT 0,
-    PRIMARY KEY (question_id)
-) TYPE=InnoDB;
-
-CREATE TABLE dtb_question_result (
-    result_id int auto_increment NOT NULL,
-    question_id int NOT NULL,
-    question_date datetime,
-    question_name text,
-    name01 text,
-    name02 text,
-    kana01 text,
-    kana02 text,
-    zip01 text,
-    zip02 text,
-    pref smallint,
-    addr01 text,
-    addr02 text,
-    tel01 text,
-    tel02 text,
-    tel03 text,
-    mail01 text,
-    question01 text,
-    question02 text,
-    question03 text,
-    question04 text,
-    question05 text,
-    question06 text,
-    create_date datetime NOT NULL,
-    del_flg smallint NOT NULL DEFAULT 0,
-    PRIMARY KEY (result_id)
-) TYPE=InnoDB;
-
 CREATE TABLE dtb_bat_relate_products (
     product_id int,
@@ -872,30 +792,4 @@
     customer_id int,
     create_date datetime
-) TYPE=InnoDB;
-
-CREATE TABLE dtb_campaign (
-    campaign_id int auto_increment NOT NULL,
-    campaign_name text,
-    campaign_point_rate numeric NOT NULL,
-    campaign_point_type smallint,
-    start_date datetime NOT NULL,
-    end_date datetime NOT NULL,
-    directory_name text NOT NULL,
-    limit_count int NOT NULL DEFAULT 0,
-    total_count int NOT NULL DEFAULT 0,
-    orverlapping_flg smallint NOT NULL DEFAULT 0,
-    cart_flg smallint NOT NULL DEFAULT 0,
-    deliv_free_flg smallint NOT NULL DEFAULT 0,
-    search_condition text,
-    del_flg smallint NOT NULL DEFAULT 0,
-    create_date datetime NOT NULL,
-    update_date datetime NOT NULL,
-    PRIMARY KEY (campaign_id)
-) TYPE=InnoDB;
-
-CREATE TABLE dtb_campaign_detail (
-    campaign_id int NOT NULL,
-    product_id int NOT NULL,
-    campaign_point_rate numeric NOT NULL
 ) TYPE=InnoDB;
 
@@ -962,23 +856,4 @@
 ) TYPE=InnoDB;
 
-CREATE TABLE dtb_user_regist (
-    user_id int auto_increment NOT NULL,
-    org_name text,
-    post_name text,
-    name01 text,
-    name02 text,
-    kana01 text,
-    kana02 text,
-    email text NOT NULL,
-    url text,
-    note text,
-    secret_key varchar(50) NOT NULL UNIQUE,
-    status smallint NOT NULL,
-    del_flg smallint DEFAULT 0,
-    create_date datetime NOT NULL,
-    update_date datetime NOT NULL,
-    PRIMARY KEY (user_id)
-) TYPE=InnoDB;
-
 CREATE TABLE dtb_templates
 (
@@ -1059,11 +934,4 @@
 ) TYPE=InnoDB;
 
-CREATE TABLE mtb_srank (
-    id smallint,
-    name text,
-    rank smallint NOT NULL DEFAULT 0,
-    PRIMARY KEY (id)
-) TYPE=InnoDB;
-
 CREATE TABLE mtb_status (
     id smallint,
Index: branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 18777)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 18786)
@@ -228,35 +228,4 @@
 );
 
-CREATE TABLE dtb_mailmaga_template (
-    template_id serial NOT NULL,
-    subject text,
-    charge_image text,
-    mail_method int,
-    header text,
-    body text,
-    main_title text,
-    main_comment text,
-    main_product_id int,
-    sub_title text,
-    sub_comment text,
-    sub_product_id01 int,
-    sub_product_id02 int,
-    sub_product_id03 int,
-    sub_product_id04 int,
-    sub_product_id05 int,
-    sub_product_id06 int,
-    sub_product_id07 int,
-    sub_product_id08 int,
-    sub_product_id09 int,
-    sub_product_id10 int,
-    sub_product_id11 int,
-    sub_product_id12 int,
-    del_flg smallint NOT NULL DEFAULT 0,
-    creator_id int NOT NULL,
-    create_date timestamp NOT NULL DEFAULT now(),
-    update_date timestamp,
-    PRIMARY KEY (template_id)
-);
-
 CREATE TABLE dtb_send_history (
     send_id serial NOT NULL,
@@ -596,14 +565,4 @@
 
 CREATE INDEX dtb_customer_mobile_phone_id_key ON dtb_customer (mobile_phone_id);
-
-CREATE TABLE dtb_customer_mail_temp (
-    email text NOT NULL UNIQUE,
-    mail_flag smallint,
-    temp_id text NOT NULL,
-    end_flag smallint,
-    update_date timestamp NOT NULL DEFAULT Now(),
-    create_data timestamp NOT NULL DEFAULT Now(),
-    PRIMARY KEY (temp_id)
-);
 
 CREATE TABLE dtb_order (
@@ -686,5 +645,4 @@
     memo09 text,
     memo10 text,
-    campaign_id int,
     PRIMARY KEY (order_id)
 );
@@ -830,42 +788,4 @@
 );
 
-CREATE TABLE dtb_question (
-    question_id serial NOT NULL,
-    question_name text,
-    question text,
-    create_date timestamp NOT NULL DEFAULT now(),
-    del_flg smallint NOT NULL DEFAULT 0,
-    PRIMARY KEY (question_id)
-);
-
-CREATE TABLE dtb_question_result (
-    result_id serial NOT NULL,
-    question_id int NOT NULL,
-    question_date timestamp,
-    question_name text,
-    name01 text,
-    name02 text,
-    kana01 text,
-    kana02 text,
-    zip01 text,
-    zip02 text,
-    pref smallint,
-    addr01 text,
-    addr02 text,
-    tel01 text,
-    tel02 text,
-    tel03 text,
-    mail01 text,
-    question01 text,
-    question02 text,
-    question03 text,
-    question04 text,
-    question05 text,
-    question06 text,
-    create_date timestamp NOT NULL DEFAULT now(),
-    del_flg smallint NOT NULL DEFAULT 0,
-    PRIMARY KEY (result_id)
-);
-
 CREATE TABLE dtb_bat_relate_products (
     product_id int,
@@ -873,30 +793,4 @@
     customer_id int,
     create_date timestamp DEFAULT now()
-);
-
-CREATE TABLE dtb_campaign (
-    campaign_id serial NOT NULL,
-    campaign_name text,
-    campaign_point_rate numeric NOT NULL,
-    campaign_point_type smallint,
-    start_date timestamp NOT NULL,
-    end_date timestamp NOT NULL,
-    directory_name text NOT NULL,
-    limit_count int NOT NULL DEFAULT 0,
-    total_count int NOT NULL DEFAULT 0,
-    orverlapping_flg smallint NOT NULL DEFAULT 0,
-    cart_flg smallint NOT NULL DEFAULT 0,
-    deliv_free_flg smallint NOT NULL DEFAULT 0,
-    search_condition text,
-    del_flg smallint NOT NULL DEFAULT 0,
-    create_date timestamp NOT NULL,
-    update_date timestamp NOT NULL DEFAULT now(),
-    PRIMARY KEY (campaign_id)
-);
-
-CREATE TABLE dtb_campaign_detail (
-    campaign_id int NOT NULL,
-    product_id int NOT NULL,
-    campaign_point_rate numeric NOT NULL
 );
 
@@ -963,23 +857,4 @@
 );
 
-CREATE TABLE dtb_user_regist (
-    user_id serial NOT NULL,
-    org_name text,
-    post_name text,
-    name01 text,
-    name02 text,
-    kana01 text,
-    kana02 text,
-    email text NOT NULL,
-    url text,
-    note text,
-    secret_key text NOT NULL UNIQUE,
-    status smallint NOT NULL,
-    del_flg smallint DEFAULT 0,
-    create_date timestamp NOT NULL,
-    update_date timestamp NOT NULL DEFAULT now(),
-    PRIMARY KEY (user_id)
-);
-
 create table dtb_templates (
     template_code text NOT NULL,
@@ -1057,11 +932,4 @@
 );
 
-CREATE TABLE mtb_srank (
-    id smallint,
-    name text,
-    rank smallint NOT NULL DEFAULT 0,
-    PRIMARY KEY (id)
-);
-
 CREATE TABLE mtb_status (
     id smallint,
Index: branches/version-2_5-dev/html/install/sql/table_comment.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/table_comment.sql	(revision 18235)
+++ branches/version-2_5-dev/html/install/sql/table_comment.sql	(revision 18786)
@@ -33,9 +33,5 @@
 INSERT INTO dtb_table_comment(table_name,description) values ('mtb_pref','都道府県ﾏｽﾀ');
 INSERT INTO dtb_table_comment(table_name,description) values ('dtb_member','管理者');
-INSERT INTO dtb_table_comment(table_name,description) values ('dtb_question','質問');
-INSERT INTO dtb_table_comment(table_name,description) values ('dtb_question_result','質問結果');
 INSERT INTO dtb_table_comment(table_name,description) values ('dtb_bat_relate_products','こんな商品も買っています');
-INSERT INTO dtb_table_comment(table_name,description) values ('dtb_campaign','キャンペーン');
-INSERT INTO dtb_table_comment(table_name,description) values ('dtb_campaign_detail','キャンペーン詳細');
 INSERT INTO dtb_table_comment(table_name,description) values ('dtb_pagelayout','ページレイアウト');
 INSERT INTO dtb_table_comment(table_name,description) values ('dtb_bloc','ブロック');
Index: branches/version-2_5-dev/html/install/sql/add/dtb_campaign_order_pgsql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/add/dtb_campaign_order_pgsql.sql	(revision 15079)
+++ 	(revision )
@@ -1,43 +1,0 @@
-CREATE TABLE dtb_campaign_order (
-    campaign_order_id serial NOT NULL,
-    order_id int4 DEFAULT 0,
-    campaign_id int4 NOT NULL,
-    customer_id int4 NOT NULL,
-    message text,
-    order_name01 text,
-    order_name02 text,
-    order_kana01 text,
-    order_kana02 text,
-    order_email text,
-    order_tel01 text,
-    order_tel02 text,
-    order_tel03 text,
-    order_fax01 text,
-    order_fax02 text,
-    order_fax03 text,
-    order_zip01 text,
-    order_zip02 text,
-    order_pref text,
-    order_addr01 text,
-    order_addr02 text,
-    order_sex int2,
-    order_birth timestamp,
-    order_job int4,
-    deliv_name01 text,
-    deliv_name02 text,
-    deliv_kana01 text,
-    deliv_kana02 text,
-    deliv_tel01 text,
-    deliv_tel02 text,
-    deliv_tel03 text,
-    deliv_fax01 text,
-    deliv_fax02 text,
-    deliv_fax03 text,
-    deliv_zip01 text,
-    deliv_zip02 text,
-    deliv_pref text,
-    deliv_addr01 text,
-    deliv_addr02 text,
-    payment_total numeric,
-    create_date timestamp NOT NULL DEFAULT now()
-);
Index: branches/version-2_5-dev/html/install/sql/add/dtb_campaign_order_mysql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/add/dtb_campaign_order_mysql.sql	(revision 15079)
+++ 	(revision )
@@ -1,43 +1,0 @@
-CREATE TABLE dtb_campaign_order (
-    campaign_order_id int auto_increment primary key NOT NULL,
-    order_id int DEFAULT 0,
-    campaign_id int NOT NULL,
-    customer_id int NOT NULL,
-    message text,
-    order_name01 text,
-    order_name02 text,
-    order_kana01 text,
-    order_kana02 text,
-    order_email text,
-    order_tel01 text,
-    order_tel02 text,
-    order_tel03 text,
-    order_fax01 text,
-    order_fax02 text,
-    order_fax03 text,
-    order_zip01 text,
-    order_zip02 text,
-    order_pref text,
-    order_addr01 text,
-    order_addr02 text,
-    order_sex smallint,
-    order_birth datetime,
-    order_job int,
-    deliv_name01 text,
-    deliv_name02 text,
-    deliv_kana01 text,
-    deliv_kana02 text,
-    deliv_tel01 text,
-    deliv_tel02 text,
-    deliv_tel03 text,
-    deliv_fax01 text,
-    deliv_fax02 text,
-    deliv_fax03 text,
-    deliv_zip01 text,
-    deliv_zip02 text,
-    deliv_pref text,
-    deliv_addr01 text,
-    deliv_addr02 text,
-    payment_total numeric,
-    create_date datetime NOT NULL
-) TYPE=InnoDB ;
Index: branches/version-2_5-dev/html/install/sql/drop_table.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/drop_table.sql	(revision 18777)
+++ branches/version-2_5-dev/html/install/sql/drop_table.sql	(revision 18786)
@@ -9,5 +9,4 @@
 DROP TABLE dtb_payment;
 DROP TABLE dtb_mailtemplate;
-DROP TABLE dtb_mailmaga_template;
 DROP TABLE dtb_send_history;
 DROP TABLE dtb_send_customer;
@@ -29,6 +28,4 @@
 DROP TABLE dtb_mail_history;
 DROP TABLE dtb_customer;
-DROP TABLE dtb_customer_mail;
-DROP TABLE dtb_customer_mail_temp;
 DROP TABLE dtb_order;
 DROP TABLE dtb_order_temp;
@@ -37,9 +34,5 @@
 DROP TABLE mtb_pref;
 DROP TABLE dtb_member;
-DROP TABLE dtb_question;
-DROP TABLE dtb_question_result;
 DROP TABLE dtb_bat_relate_products;
-DROP TABLE dtb_campaign;
-DROP TABLE dtb_campaign_detail;
 DROP TABLE dtb_pagelayout;
 DROP TABLE dtb_bloc;
@@ -47,5 +40,4 @@
 DROP TABLE dtb_csv;
 DROP TABLE dtb_csv_sql;
-DROP TABLE dtb_user_regist;
 DROP TABLE dtb_templates;
 DROP TABLE dtb_table_comment;
@@ -59,5 +51,4 @@
 DROP TABLE mtb_status_image;
 DROP TABLE mtb_status;
-DROP TABLE mtb_srank;
 DROP TABLE mtb_site_control_track_back;
 DROP TABLE mtb_site_control_affiliate;