Index: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql (revision 19769)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql (revision 19773)
@@ -289,5 +289,5 @@
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (117, 3, 'order_zip01', '郵便番号1', 15, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (118, 3, 'order_zip02', '郵便番号2', 16, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (119, 3, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.order_pref)', '都道府県', 17, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (119, 3, '(SELECT name FROM mtb_pref WHERE id = dtb_order.order_pref)', '都道府県', 17, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (120, 3, 'order_addr01', '住所1', 18, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (121, 3, 'order_addr02', '住所2', 19, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -307,5 +307,5 @@
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (135, 3, 'deliv_zip01', '郵便番号1', 33, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (136, 3, 'deliv_zip02', '郵便番号2', 34, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (137, 3, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.deliv_pref)', '都道府県', 35, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (137, 3, '(SELECT name FROM mtb_pref WHERE id = dtb_order.deliv_pref)', '都道府県', 35, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (138, 3, 'deliv_addr01', '住所1', 36, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (139, 3, 'deliv_addr02', '住所2', 37, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -343,5 +343,5 @@
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (171, 4, 'order_zip01', '郵便番号1', 16, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (172, 4, 'order_zip02', '郵便番号2', 17, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (173, 4, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.order_pref)', '都道府県', 18, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (173, 4, '(SELECT name FROM mtb_pref WHERE id = dtb_order.order_pref)', '都道府県', 18, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (174, 4, 'order_addr01', '住所1', 19, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (175, 4, 'order_addr02', '住所2', 20, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -361,5 +361,5 @@
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (189, 4, 'deliv_zip01', '郵便番号1', 34, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (190, 4, 'deliv_zip02', '郵便番号2', 35, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (191, 4, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.deliv_pref)', '都道府県', 36, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (191, 4, '(SELECT name FROM mtb_pref WHERE id = dtb_order.deliv_pref)', '都道府県', 36, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (192, 4, 'deliv_addr01', '住所1', 37, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (193, 4, 'deliv_addr02', '住所2', 38, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -909,51 +909,51 @@
INSERT INTO mtb_permission (id, name, rank) VALUES ('/admin/search/delete_note.php', '1', 11);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (1, '北海道', 1);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (2, '青森県', 2);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (3, '岩手県', 3);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (4, '宮城県', 4);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (5, '秋田県', 5);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (6, '山形県', 6);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (7, '福島県', 7);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (8, '茨城県', 8);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (9, '栃木県', 9);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (10, '群馬県', 10);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (11, '埼玉県', 11);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (12, '千葉県', 12);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (13, '東京都', 13);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (14, '神奈川県', 14);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (15, '新潟県', 15);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (16, '富山県', 16);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (17, '石川県', 17);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (18, '福井県', 18);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (19, '山梨県', 19);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (20, '長野県', 20);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (21, '岐阜県', 21);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (22, '静岡県', 22);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (23, '愛知県', 23);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (24, '三重県', 24);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (25, '滋賀県', 25);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (26, '京都府', 26);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (27, '大阪府', 27);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (28, '兵庫県', 28);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (29, '奈良県', 29);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (30, '和歌山県', 30);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (31, '鳥取県', 31);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (32, '島根県', 32);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (33, '岡山県', 33);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (34, '広島県', 34);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (35, '山口県', 35);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (36, '徳島県', 36);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (37, '香川県', 37);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (38, '愛媛県', 38);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (39, '高知県', 39);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (40, '福岡県', 40);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (41, '佐賀県', 41);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (42, '長崎県', 42);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (43, '熊本県', 43);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (44, '大分県', 44);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (45, '宮崎県', 45);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (46, '鹿児島県', 46);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (47, '沖縄県', 47);
+INSERT INTO mtb_pref (id, name, rank) VALUES (1, '北海道', 1);
+INSERT INTO mtb_pref (id, name, rank) VALUES (2, '青森県', 2);
+INSERT INTO mtb_pref (id, name, rank) VALUES (3, '岩手県', 3);
+INSERT INTO mtb_pref (id, name, rank) VALUES (4, '宮城県', 4);
+INSERT INTO mtb_pref (id, name, rank) VALUES (5, '秋田県', 5);
+INSERT INTO mtb_pref (id, name, rank) VALUES (6, '山形県', 6);
+INSERT INTO mtb_pref (id, name, rank) VALUES (7, '福島県', 7);
+INSERT INTO mtb_pref (id, name, rank) VALUES (8, '茨城県', 8);
+INSERT INTO mtb_pref (id, name, rank) VALUES (9, '栃木県', 9);
+INSERT INTO mtb_pref (id, name, rank) VALUES (10, '群馬県', 10);
+INSERT INTO mtb_pref (id, name, rank) VALUES (11, '埼玉県', 11);
+INSERT INTO mtb_pref (id, name, rank) VALUES (12, '千葉県', 12);
+INSERT INTO mtb_pref (id, name, rank) VALUES (13, '東京都', 13);
+INSERT INTO mtb_pref (id, name, rank) VALUES (14, '神奈川県', 14);
+INSERT INTO mtb_pref (id, name, rank) VALUES (15, '新潟県', 15);
+INSERT INTO mtb_pref (id, name, rank) VALUES (16, '富山県', 16);
+INSERT INTO mtb_pref (id, name, rank) VALUES (17, '石川県', 17);
+INSERT INTO mtb_pref (id, name, rank) VALUES (18, '福井県', 18);
+INSERT INTO mtb_pref (id, name, rank) VALUES (19, '山梨県', 19);
+INSERT INTO mtb_pref (id, name, rank) VALUES (20, '長野県', 20);
+INSERT INTO mtb_pref (id, name, rank) VALUES (21, '岐阜県', 21);
+INSERT INTO mtb_pref (id, name, rank) VALUES (22, '静岡県', 22);
+INSERT INTO mtb_pref (id, name, rank) VALUES (23, '愛知県', 23);
+INSERT INTO mtb_pref (id, name, rank) VALUES (24, '三重県', 24);
+INSERT INTO mtb_pref (id, name, rank) VALUES (25, '滋賀県', 25);
+INSERT INTO mtb_pref (id, name, rank) VALUES (26, '京都府', 26);
+INSERT INTO mtb_pref (id, name, rank) VALUES (27, '大阪府', 27);
+INSERT INTO mtb_pref (id, name, rank) VALUES (28, '兵庫県', 28);
+INSERT INTO mtb_pref (id, name, rank) VALUES (29, '奈良県', 29);
+INSERT INTO mtb_pref (id, name, rank) VALUES (30, '和歌山県', 30);
+INSERT INTO mtb_pref (id, name, rank) VALUES (31, '鳥取県', 31);
+INSERT INTO mtb_pref (id, name, rank) VALUES (32, '島根県', 32);
+INSERT INTO mtb_pref (id, name, rank) VALUES (33, '岡山県', 33);
+INSERT INTO mtb_pref (id, name, rank) VALUES (34, '広島県', 34);
+INSERT INTO mtb_pref (id, name, rank) VALUES (35, '山口県', 35);
+INSERT INTO mtb_pref (id, name, rank) VALUES (36, '徳島県', 36);
+INSERT INTO mtb_pref (id, name, rank) VALUES (37, '香川県', 37);
+INSERT INTO mtb_pref (id, name, rank) VALUES (38, '愛媛県', 38);
+INSERT INTO mtb_pref (id, name, rank) VALUES (39, '高知県', 39);
+INSERT INTO mtb_pref (id, name, rank) VALUES (40, '福岡県', 40);
+INSERT INTO mtb_pref (id, name, rank) VALUES (41, '佐賀県', 41);
+INSERT INTO mtb_pref (id, name, rank) VALUES (42, '長崎県', 42);
+INSERT INTO mtb_pref (id, name, rank) VALUES (43, '熊本県', 43);
+INSERT INTO mtb_pref (id, name, rank) VALUES (44, '大分県', 44);
+INSERT INTO mtb_pref (id, name, rank) VALUES (45, '宮崎県', 45);
+INSERT INTO mtb_pref (id, name, rank) VALUES (46, '鹿児島県', 46);
+INSERT INTO mtb_pref (id, name, rank) VALUES (47, '沖縄県', 47);
INSERT INTO mtb_product_list_max (id, name, rank) VALUES (15, '15件', 0);
Index: branches/version-2_5-dev/html/install/sql/column_comment.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/column_comment.sql (revision 19670)
+++ branches/version-2_5-dev/html/install/sql/column_comment.sql (revision 19773)
@@ -527,7 +527,4 @@
INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (539, 'dtb_order_detail', 'quantity', '数量');
INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (540, 'dtb_order_detail', 'point_rate', 'ポイント付与率');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (541, 'mtb_pref', 'pref_id', '都道府県ID');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (542, 'mtb_pref', 'pref_name', '都道府県名');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (543, 'mtb_pref', 'rank', '表示順位');
INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (544, 'dtb_member', 'member_id', '管理者ID');
INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (545, 'dtb_member', '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 19761)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql (revision 19773)
@@ -750,11 +750,4 @@
) TYPE=InnoDB;
-CREATE TABLE mtb_pref (
- pref_id smallint NOT NULL,
- pref_name text,
- rank smallint NOT NULL DEFAULT 0,
- PRIMARY KEY (pref_id)
-) TYPE=InnoDB;
-
CREATE TABLE dtb_member (
member_id int NOT NULL,
@@ -883,4 +876,10 @@
) TYPE=InnoDB;
+CREATE TABLE mtb_pref (
+ id smallint NOT NULL,
+ name text,
+ rank smallint NOT NULL DEFAULT 0,
+ PRIMARY KEY (pref_id)
+) TYPE=InnoDB;
CREATE TABLE mtb_permission (
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 19761)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql (revision 19773)
@@ -752,11 +752,4 @@
);
-CREATE TABLE mtb_pref (
- pref_id smallint NOT NULL,
- pref_name text,
- rank smallint NOT NULL DEFAULT 0,
- PRIMARY KEY (pref_id)
-);
-
CREATE TABLE dtb_member (
member_id int NOT NULL,
@@ -885,4 +878,11 @@
);
+CREATE TABLE mtb_pref (
+ id text,
+ name text,
+ rank smallint NOT NULL DEFAULT 0,
+ PRIMARY KEY (id)
+);
+
CREATE TABLE mtb_permission (
id text,