Index: branches/version-2_5-dev/html/install/sql/drop_table.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/drop_table.sql (revision 19678)
+++ branches/version-2_5-dev/html/install/sql/drop_table.sql (revision 19706)
@@ -90,4 +90,5 @@
DROP TABLE dtb_customer_favorite_products;
DROP TABLE mtb_product_type;
+DROP TABLE mtb_device_type;
DROP TABLE dtb_module;
DROP TABLE dtb_session;
Index: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql (revision 19697)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql (revision 19706)
@@ -562,4 +562,9 @@
INSERT INTO mtb_product_type (id, name, rank) VALUES (1, '通常商品', 0);
INSERT INTO mtb_product_type (id, name, rank) VALUES (2, 'ダウンロード商品', 1);
+
+INSERT INTO mtb_device_type (id, name, rank) VALUES (1, 'モバイル', 0);
+INSERT INTO mtb_device_type (id, name, rank) VALUES (2, 'スマートフォン', 1);
+INSERT INTO mtb_device_type (id, name, rank) VALUES (10, 'PC', 2);
+INSERT INTO mtb_device_type (id, name, rank) VALUES (99, '管理画面', 3);
INSERT INTO mtb_job (id, name, rank) VALUES (1, '公務員', 0);
@@ -1116,8 +1121,12 @@
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PRODUCT_TYPE_NORMAL', '1', 900, '通常商品');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PRODUCT_TYPE_DOWNLOAD', '2', 901, 'ダウンロード商品');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SQL_QUERY_LOG_MODE', '1', 902, 'SQLログを取得するフラグ(1:表示, 0:非表示)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SQL_QUERY_LOG_MIN_EXEC_TIME', '2', 903, 'SQLログを取得する時間設定(設定値以上かかった場合に取得)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PAGE_DISPLAY_TIME_LOG_MODE', '1', 904, 'ページ表示時間のログを取得するフラグ(1:表示, 0:非表示)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PAGE_DISPLAY_TIME_LOG_MIN_EXEC_TIME', '2', 905, 'ページ表示時間のログを取得する時間設定(設定値以上かかった場合に取得)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SQL_QUERY_LOG_MODE', '1', 1000, 'SQLログを取得するフラグ(1:表示, 0:非表示)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SQL_QUERY_LOG_MIN_EXEC_TIME', '2', 1001, 'SQLログを取得する時間設定(設定値以上かかった場合に取得)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PAGE_DISPLAY_TIME_LOG_MODE', '1', 1002, 'ページ表示時間のログを取得するフラグ(1:表示, 0:非表示)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PAGE_DISPLAY_TIME_LOG_MIN_EXEC_TIME', '2', 1003, 'ページ表示時間のログを取得する時間設定(設定値以上かかった場合に取得)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DEVICE_TYPE_MOBILE', '1', 1100, '端末種別: モバイル');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DEVICE_TYPE_SMARTPHONE', '2', 1101, '端末種別: スマートフォン');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DEVICE_TYPE_PC', '10', 1102, '端末種別: PC');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DEVICE_TYPE_ADMIN', '99', 1103, '端末種別: 管理画面');
INSERT INTO dtb_index_list (table_name, column_name, recommend_flg, recommend_comment) VALUES ('dtb_customer', 'email_mobile', 0, '会員数増加時のログイン処理速度を向上させたいときに試してみてください');
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 19686)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql (revision 19706)
@@ -623,15 +623,10 @@
status smallint,
create_date datetime NOT NULL,
- loan_result text,
- credit_result text,
- credit_msg text,
update_date datetime,
commit_date datetime,
+ payment_date datetime,
+ device_type_id int,
del_flg smallint NOT NULL DEFAULT 0,
deliv_date text,
- conveni_data text,
- cell01 text,
- cell02 text,
- cell03 text,
memo01 text,
memo02 text,
@@ -644,5 +639,4 @@
memo09 text,
memo10 text,
- payment_date timestamp,
PRIMARY KEY (order_id)
) TYPE=InnoDB;
@@ -707,15 +701,9 @@
deliv_check smallint,
point_check smallint,
- loan_result text,
- credit_result text,
- credit_msg text,
- create_date datetime NOT NULL,
- update_date datetime,
+ create_date datetime NOT NULL,
+ update_date datetime,
+ device_type_id int,
del_flg smallint NOT NULL DEFAULT 0,
deliv_date text,
- conveni_data text,
- cell01 text,
- cell02 text,
- cell03 text,
order_id int,
memo01 text,
@@ -1173,4 +1161,11 @@
) TYPE=InnoDB;
+CREATE TABLE mtb_device_type (
+ id int2,
+ name text,
+ rank int2 NOT NULL,
+ PRIMARY KEY (id)
+) TYPE=InnoDB;
+
CREATE TABLE dtb_mobile_ext_session_id (
session_id text NOT NULL,
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 19686)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql (revision 19706)
@@ -625,15 +625,10 @@
status smallint,
create_date timestamp NOT NULL DEFAULT now(),
- loan_result text,
- credit_result text,
- credit_msg text,
update_date timestamp,
commit_date timestamp,
+ payment_date timestamp,
+ device_type_id int,
del_flg smallint NOT NULL DEFAULT 0,
deliv_date text,
- conveni_data text,
- cell01 text,
- cell02 text,
- cell03 text,
memo01 text,
memo02 text,
@@ -646,5 +641,4 @@
memo09 text,
memo10 text,
- payment_date timestamp,
PRIMARY KEY (order_id)
);
@@ -709,15 +703,9 @@
deliv_check smallint,
point_check smallint,
- loan_result text,
- credit_result text,
- credit_msg text,
- create_date timestamp NOT NULL DEFAULT now(),
- update_date timestamp,
+ create_date timestamp NOT NULL DEFAULT now(),
+ update_date timestamp,
+ device_type_id int,
del_flg smallint NOT NULL DEFAULT 0,
deliv_date text,
- conveni_data text,
- cell01 text,
- cell02 text,
- cell03 text,
order_id int,
memo01 text,
@@ -1172,5 +1160,10 @@
);
-
+CREATE TABLE mtb_device_type (
+ id int2,
+ name text,
+ rank int2 NOT NULL,
+ PRIMARY KEY (id)
+);
CREATE TABLE dtb_mobile_ext_session_id (