Changeset 19678

Timestamp:

2010/11/21 18:24:31 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19677

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.jp>

bzr:file-ids:

html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/drop_table.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fdrop_table.sql
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql

bzr:mapping-version:

v4

bzr:merge:

nanasess@fsm.ne.jp-20101121092256-m4jymyz1ea6szxn3

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

nanasess@fsm.ne.jp-20101121092427-kkvumjjec71dfz73

bzr:revno:

2408

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

html/install/sql/create_table_mysql.sql nanasess@fsm.ne.jp-20101121092256-m4jymyz1ea6szxn3
html/install/sql/create_table_pgsql.sql nanasess@fsm.ne.jp-20101121092256-m4jymyz1ea6szxn3
html/install/sql/drop_table.sql nanasess@fsm.ne.jp-20101121092256-m4jymyz1ea6szxn3
html/install/sql/insert_data.sql nanasess@fsm.ne.jp-20101121092256-m4jymyz1ea6szxn3

bzr:timestamp:

2010-11-21 18:24:27.513999939 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-11-21T09:24:27.514000Z

Message:

• dtb_index_list テーブルに主キーを追加
  • TEXT 型は MySQL で INDEXサイズの指定が必要なため VARCHAR(30) に変更
• r19671 でのコミットミスを修正

Location:

branches/version-2_5-dev/html/install/sql

Files:

• create_table_mysql.sql (modified) (3 diffs)
• create_table_pgsql.sql (modified) (2 diffs)
• drop_table.sql (modified) (1 diff)
• insert_data.sql (modified) (1 diff)

branches/version-2_5-dev/html/install/sql/create_table_mysql.sql

@@ -222 +222 @@
     rank int,
     PRIMARY KEY(product_class_id, payment_id)
-) TYPE=InnoDB;
-
-CREATE TABLE dtb_product_type_options (
-    product_type_id int NOT NULL,
-    deliv_id int NOT NULL,
-    rank int,
-    PRIMARY KEY(product_type_id, deliv_id)
 ) TYPE=InnoDB;
 
@@ -1251 +1244 @@
 
 CREATE TABLE dtb_plugin (
-  plugin_id INT NOT NULL,
-  plugin_name VARCHAR(255) NOT NULL DEFAULT '',
-  enable INT NOT NULL DEFAULT 0,
-  del_flg INT NOT NULL DEFAULT 0,
-  class_name VARCHAR(255) NOT NULL DEFAULT '',
-  create_date DATETIME NOT NULL,
-  update_date DATETIME NOT NULL,
-  PRIMARY KEY (plugin_id)
+    plugin_id int NOT NULL,
+    plugin_name varchar(255) NOT NULL DEFAULT '',
+    enable int2 NOT NULL DEFAULT 0,
+    del_flg int2 NOT NULL DEFAULT 0,
+    class_name varchar(255) NOT NULL DEFAULT '',
+    create_date datetime NOT NULL,
+    update_date datetime NOT NULL,
+    PRIMARY KEY (plugin_id)
 ) TYPE=InnoDB;
 
@@ -1272 +1265 @@
 CREATE INDEX dtb_mobile_kara_mail_create_date_key ON dtb_mobile_kara_mail (create_date);
 CREATE INDEX dtb_mobile_kara_mail_receive_date_key ON dtb_mobile_kara_mail (receive_date);
-CREATE TABLE dtb_index_list(
-    table_name text NOT NULL DEFAULT '',
-    column_name text NOT NULL DEFAULT '',
+
+CREATE TABLE dtb_index_list (
+    table_name varchar(30) NOT NULL DEFAULT '',
+    column_name varchar(30) NOT NULL DEFAULT '',
     recommend_flg int2 NOT NULL DEFAULT 0,
-    recommend_comment text
-) TYPE=InnoDB;
+    recommend_comment text,
+    PRIMARY KEY (table_name, column_name)
+) TYPE=InnoDB;

branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql

@@ -222 +222 @@
     rank int,
     PRIMARY KEY(product_class_id, payment_id)
-);
-
-CREATE TABLE dtb_product_type_options (
-    product_type_id int NOT NULL,
-    deliv_id int NOT NULL,
-    rank int,
-    PRIMARY KEY(product_type_id, deliv_id)
 );
 
@@ -1263 +1256 @@
 CREATE INDEX dtb_mobile_kara_mail_receive_date_key ON dtb_mobile_kara_mail (receive_date);
 
-CREATE TABLE "dtb_plugin" (
-    "plugin_id" int4 primary key NOT NULL,
-    "plugin_name" varchar(255) DEFAULT NULL,
-    "enable" int2 NOT NULL DEFAULT 0,
-    "del_flg" int2 NOT NULL DEFAULT 0,
-    "class_name" varchar(255) DEFAULT NULL,
-    "create_date" timestamp(6) NOT NULL DEFAULT now(),
-    "update_date" timestamp(6) NOT NULL DEFAULT now()
-);
-
-CREATE TABLE dtb_index_list(
-    table_name text NOT NULL DEFAULT '',
-    column_name text NOT NULL DEFAULT '',
+CREATE TABLE dtb_plugin (
+    plugin_id int NOT NULL,
+    plugin_name varchar(255) DEFAULT NULL,
+    enable int2 NOT NULL DEFAULT 0,
+    del_flg int2 NOT NULL DEFAULT 0,
+    class_name varchar(255) DEFAULT NULL,
+    create_date timestamp NOT NULL DEFAULT now(),
+    update_date timestamp NOT NULL DEFAULT now(),
+    PRIMARY KEY (plugin_id)
+);
+
+CREATE TABLE dtb_index_list (
+    table_name varchar(30) NOT NULL DEFAULT '',
+    column_name varchar(30) NOT NULL DEFAULT '',
     recommend_flg int2 NOT NULL DEFAULT 0,
-    recommend_comment text
-);
+    recommend_comment text,
+    PRIMARY KEY (table_name, column_name)
+);

branches/version-2_5-dev/html/install/sql/drop_table.sql

@@ -100 +100 @@
 DROP TABLE dtb_index_list;
 DROP TABLE dtb_payment_options;
-DROP TABLE dtb_product_type_options;

branches/version-2_5-dev/html/install/sql/insert_data.sql

@@ -436 +436 @@
 INSERT INTO dtb_payment_options (product_class_id, payment_id, rank) VALUES (10, 4, 4);
 INSERT INTO dtb_payment_options (product_class_id, payment_id, rank) VALUES (10, 5, 5);
-
-INSERT INTO dtb_product_type_options (product_type_id, deliv_id, rank) VALUES (1, 1, 1);
 
 INSERT INTO dtb_product_categories (product_id, category_id, rank) VALUES (1, 5, 1);