Changeset 18791 for branches/version-2_5-dev/html/install

Timestamp:

2010/08/25 16:38:50 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/helper/SC_Helper_CSV.php 15535@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_CSV.php
data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php 16251@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fsystem%2FLC_Page_Admin_System_Bkup.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
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:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2274

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-parents:

data/class/helper/SC_Helper_CSV.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18781
data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php [email protected]
html/install/sql/create_table_mysql.sql [email protected]
html/install/sql/create_table_pgsql.sql [email protected]
html/install/sql/drop_table.sql [email protected]
html/install/sql/insert_data.sql [email protected]

bzr:timestamp:

2010-08-25 16:38:46.040999889 +0900

bzr:user-agent:

bzr2.1.2+bzr-svn1.0.2

svn:original-date:

2010-08-25T07:38:46.041000Z

Message:

DB_TYPE で条件分岐している箇所の抽象化(#801)

• SC_Helper_CSV
  • convert を mb_convert_kana_option へ変更
  • PEAR::DB の定数を MDB2 の定数へ修正
• LC_Page_Admin_System_Bkup
  • DB_TYPE を使用している箇所を抽象化
  • シーケンス値バックアップファイルのフォーマット変更
• html/install/index.php
  • 管理ユーザーの追加ができなくなっていたのを修正
• html/install/sql/create_table_mysql.sql, html/install/sql/create_table_pgsql.sql
  • dtb_csv.convert を dtb_csv.mb_convert_kana_option へ変更
  • dtb_bkup を追加
• html/install/sql/drop_table.sql
  • dtb_bkup を追加
• html/install/sql/insert_data.sql
  • NOT NULL のフィールドが空文字にならないよう修正

Location:

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

Files:

• index.php (modified) (1 diff)
• sql/create_table_mysql.sql (modified) (2 diffs)
• sql/create_table_pgsql.sql (modified) (2 diffs)
• sql/drop_table.sql (modified) (1 diff)
• sql/insert_data.sql (modified) (2 diffs)

branches/version-2_5-dev/html/install/index.php

@@ -276 +276 @@
     $objQuery->query($sql, array($login_id));
 
-    $sql = "INSERT INTO dtb_member (name, login_id, password, creator_id, authority, work, del_flg, rank, create_date, update_date)
-            VALUES ('管理者',?,?,0,0,1,0,1, now(), now());";
-
-    $objQuery->query($sql, array($login_id, $login_pass));
+    $sql = "INSERT INTO dtb_member (member_id, name, login_id, password, creator_id, authority, work, del_flg, rank, create_date, update_date)
+            VALUES (?,'管理者',?,?,0,0,1,0,1, now(), now());";
+    $member_id = $objQuery->nextVal("dtb_member_member_id");
+    $objQuery->query($sql, array($member_id, $login_id, $login_pass));
 
     $GLOBAL_ERR = "";

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

@@ -841 +841 @@
     create_date datetime NOT NULL,
     update_date datetime NOT NULL,
-    `convert` text,
+    mb_convert_kana_option text,
     PRIMARY KEY (no)
 ) TYPE=InnoDB;
@@ -1232 +1232 @@
     update_date datetime NOT NULL,
     PRIMARY KEY (trackback_id)
+) TYPE=InnoDB;
+
+CREATE TABLE dtb_bkup (
+    bkup_name varchar(50),
+    bkup_memo text,
+    create_date datetime,
+    PRIMARY KEY (bkup_name)
 ) TYPE=InnoDB;
 

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

@@ -842 +842 @@
     create_date timestamp NOT NULL DEFAULT now(),
     update_date timestamp NOT NULL DEFAULT now(),
-    convert text,
+    mb_convert_kana_option text,
     PRIMARY KEY (no)
 );
@@ -1230 +1230 @@
 );
 
+CREATE TABLE dtb_bkup (
+    bkup_name   varchar(50),
+    bkup_memo   text,
+    create_date timestamp,
+    PRIMARY KEY (bkup_name)
+);
+
 CREATE INDEX dtb_customer_mobile_phone_id_key ON dtb_customer (mobile_phone_id);
 CREATE INDEX dtb_products_class_product_id_key ON dtb_products_class(product_id);

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

@@ -94 +94 @@
 DROP TABLE dtb_site_control;
 DROP TABLE dtb_trackback;
-
+DROP TABLE dtb_bkup;

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

@@ -371 +371 @@
 INSERT INTO dtb_mailtemplate (template_id, subject, header, footer, creator_id, del_flg, create_date, update_date) VALUES (5, 'お問い合わせを受け付けました', '', '', 0, 0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 
-INSERT INTO dtb_member (member_id, name, department, login_id, password, authority, rank, work, del_flg, creator_id, update_date, create_date, login_date) VALUES (1, 'dummy', NULL, 'dummy', ' ', 0, 0, 1, 1, 0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
-INSERT INTO dtb_member (member_id, name, department, login_id, password, authority, rank, work, del_flg, creator_id, update_date, create_date, login_date) VALUES (2, '管理者', NULL, 'admin', '2c19f4a742398150cecc80b3e76b673a35b8c19c', 0, 1, 1, 0, 0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
+INSERT INTO dtb_member (member_id, name, department, login_id, password, authority, rank, work, del_flg, creator_id, update_date, create_date, login_date) VALUES (1, 'dummy', NULL, 'dummy', 'dummy', 0, 0, 1, 1, 0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
 
 INSERT INTO dtb_module (module_id, module_code, module_name, sub_data, auto_update_flg, del_flg, create_date, update_date) VALUES (0, '0', 'patch', NULL, 0, 0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -382 +381 @@
 INSERT INTO dtb_pagelayout (page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (3, '商品詳細ページ', 'products/detail.php', ' ', 'user_data/templates/', 'detail', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 INSERT INTO dtb_pagelayout (page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (4, 'MYページ', 'mypage/index.php', ' ', '', '', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_pagelayout (page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (0, 'プレビューデータ', ' ', NULL, NULL, NULL, 1, 1, 1, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_pagelayout (page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (0, 'プレビューデータ', 'preview', NULL, NULL, NULL, 1, 1, 1, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 
 INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, deliv_id, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (1, 'クレジット', 0, NULL, 1, 5, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);