Index: /branches/version-2_5-dev/html/install/index.php
===================================================================
--- /branches/version-2_5-dev/html/install/index.php (revision 18790)
+++ /branches/version-2_5-dev/html/install/index.php (revision 18791)
@@ -276,8 +276,8 @@
$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 = "";
Index: /branches/version-2_5-dev/html/install/sql/drop_table.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/drop_table.sql (revision 18787)
+++ /branches/version-2_5-dev/html/install/sql/drop_table.sql (revision 18791)
@@ -94,3 +94,3 @@
DROP TABLE dtb_site_control;
DROP TABLE dtb_trackback;
-
+DROP TABLE dtb_bkup;
Index: /branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/insert_data.sql (revision 18788)
+++ /branches/version-2_5-dev/html/install/sql/insert_data.sql (revision 18791)
@@ -371,6 +371,5 @@
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,5 +381,5 @@
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);
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 18788)
+++ /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql (revision 18791)
@@ -841,5 +841,5 @@
create_date datetime NOT NULL,
update_date datetime NOT NULL,
- `convert` text,
+ mb_convert_kana_option text,
PRIMARY KEY (no)
) TYPE=InnoDB;
@@ -1232,4 +1232,11 @@
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;
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 18788)
+++ /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql (revision 18791)
@@ -842,5 +842,5 @@
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,4 +1230,11 @@
);
+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);
Index: /branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php (revision 18788)
+++ /branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php (revision 18791)
@@ -69,7 +69,4 @@
SC_Utils_Ex::sfIsSuccess($objSess);
- // バックアップテーブルがなければ作成する
- $this->lfCreateBkupTable();
-
if (!isset($_POST['mode'])) $_POST['mode'] = "";
@@ -207,5 +204,5 @@
// 実行時間を制限しない
set_time_limit(0);
-
+
$objQuery = new SC_Query();
$csv_data = "";
@@ -218,5 +215,5 @@
// 全テーブル取得
- $arrTableList = $this->lfGetTableList();
+ $arrTableList = $objQuery->listTables();
// 各テーブル情報を取得する
@@ -224,8 +221,4 @@
if (!($val == "dtb_bkup" || $val == "mtb_zip")) {
-
- // 自動採番型の構成を取得する
- if (
- $csv_autoinc .= $this->lfGetAutoIncrement($val);
// 全データを取得
@@ -252,6 +245,5 @@
$csv_data .= $val . "\r\n";
$csv_data .= $arrKyes . "\r\n";
- $csv_data .= $data;
- $csv_data .= "\r\n";
+ $csv_data .= $data . "\r\n";
}
@@ -260,4 +252,7 @@
}
}
+
+ // 自動採番型の構成を取得する
+ $csv_autoinc = $this->lfGetAutoIncrement();
$csv_file = $bkup_dir . "bkup_data.csv";
@@ -358,91 +353,22 @@
}
- // 全テーブルリストを取得する
- function lfGetTableList(){
+ /**
+ * シーケンス一覧をCSV出力形式に変換する.
+ *
+ * シーケンス名,シーケンス値 の形式に出力する.
+ *
+ * @return string シーケンス一覧の文字列
+ */
+ function lfGetAutoIncrement() {
$objQuery = new SC_Query();
-
- if(DB_TYPE == "pgsql"){
- $sql = "SELECT tablename FROM pg_tables WHERE tableowner = ? ORDER BY tablename ; ";
- $arrRet = $objQuery->getAll($sql, array(DB_USER));
- $arrRet = SC_Utils_Ex::sfSwapArray($arrRet);
- $arrRet = $arrRet['tablename'];
- }else if(DB_TYPE == "mysql"){
- $sql = "SHOW TABLES;";
- $arrRet = $objQuery->getAll($sql);
- $arrRet = SC_Utils_Ex::sfSwapArray($arrRet);
-
- // キーを取得
- $arrKey = array_keys($arrRet);
-
- $arrRet = $arrRet[$arrKey[0]];
- }
- return $arrRet;
- }
-
- // 自動採番型をCSV出力形式に変換する
- // FIXME MDB2 のシーケンス関数を使用した実装へ要改修
- function lfGetAutoIncrement($table_name){
- $arrColList = $this->lfGetColumnList($table_name);
- $ret = "";
-
- if(DB_TYPE == "pgsql"){
- $match = 'nextval(\'';
- }else if(DB_TYPE == "mysql"){
- $match = "auto_incr";
- }
-
- foreach($arrColList['col_def'] as $key => $val){
-
- if (substr($val,0,9) == $match) {
- $col = $arrColList['col_name'][$key];
- $autoVal = $this->lfGetAutoIncrementVal($table_name, $col);
- $ret .= "$table_name,$col,$autoVal\n";
- }
- }
-
- return $ret;
- }
-
- // テーブル構成を取得する
- Function LfgetColumnlist($table_name){
- $objQuery = new SC_Query();
-
- if(DB_TYPE == "pgsql"){
- $sql = "SELECT
- a.attname, t.typname, a.attnotnull, d.adsrc as defval, a.atttypmod, a.attnum as fldnum, e.description
- FROM
- pg_class c,
- pg_type t,
- pg_attribute a left join pg_attrdef d on (a.attrelid=d.adrelid and a.attnum=d.adnum)
- left join pg_description e on (a.attrelid=e.objoid and a.attnum=e.objsubid)
- WHERE (c.relname=?) AND (c.oid=a.attrelid) AND (a.atttypid=t.oid) AND a.attnum > 0
- ORDER BY fldnum";
- $arrColList = $objQuery->getAll($sql, array($table_name));
- $arrColList = SC_Utils_Ex::sfSwapArray($arrColList);
-
- $arrRet['col_def'] = $arrColList['defval'];
- $arrRet['col_name'] = $arrColList['attname'];
- }else if(DB_TYPE == "mysql"){
- $sql = "SHOW COLUMNS FROM $table_name";
- $arrColList = $objQuery->getAll($sql);
- $arrColList = SC_Utils_Ex::sfSwapArray($arrColList);
-
- $arrRet['col_def'] = $arrColList['Extra'];
- $arrRet['col_name'] = $arrColList['Field'];
- }
- return $arrRet;
- }
-
- // 自動採番型の値を取得する
- function lfGetAutoIncrementVal($table_name , $colname = ""){
- $objQuery = new SC_Query();
- $ret = "";
-
- if(DB_TYPE == "pgsql"){
- $ret = $objQuery->nextval($table_name, $colname) - 1;
- }else if(DB_TYPE == "mysql"){
- $sql = "SHOW TABLE STATUS LIKE ?";
- $arrData = $objQuery->getAll($sql, array($table_name));
- $ret = $arrData[0]['Auto_increment'];
+ $arrSequences = $objQuery->listSequences();
+ $result = "";
+
+ foreach($arrSequences as $val){
+ $seq = $objQuery->currVal($val);
+
+ $ret .= $val . ",";
+ $ret .= is_null($seq) ? "0" : $seq;
+ $ret .= "\r\n";
}
return $ret;
@@ -473,5 +399,5 @@
// 実行時間を制限しない
set_time_limit(0);
-
+
$objQuery = new SC_Query("", false);
$csv_data = "";
@@ -546,5 +472,5 @@
// CSVファイルからインサート実行
- function lfExeInsertSQL($objQuery, $csv){
+ function lfExeInsertSQL(&$objQuery, $csv){
$sql = "";
@@ -604,5 +530,5 @@
// エラーがあれば終了
- if ($err->message != ""){
+ if (PEAR::isError($err)){
SC_Utils_Ex::sfErrorHeader(">> " . $objQuery->getlastquery(false));
return false;
@@ -625,57 +551,31 @@
// 自動採番をセット
- function lfSetAutoInc($objQuery, $csv){
+ function lfSetAutoInc(&$objQuery, $csv){
// csvファイルからデータの取得
$arrCsvData = file($csv);
- foreach($arrCsvData as $key => $val){
+ foreach($arrCsvData as $val){
$arrData = split(",", trim($val));
- if ($arrData[2] == 0) $arrData[2] = 1;
- $objQuery->setval($arrData[0] . "_" . $arrData[1], $arrData[2]);
+ $objQuery->setval($arrData[0], $arrData[1]);
}
}
// DBを全てクリアする
- function lfDeleteAll($objQuery){
+ function lfDeleteAll(&$objQuery){
$ret = true;
- $arrTableList = $this->lfGetTableList();
-
- foreach($arrTableList as $key => $val){
+ $arrTableList = $objQuery->listTables();
+
+ foreach($arrTableList as $val){
// バックアップテーブルは削除しない
if ($val != "dtb_bkup") {
- $trun_sql = "DELETE FROM $val;";
+ $trun_sql = "DELETE FROM $val";
$ret = $objQuery->query($trun_sql);
-
- if (!$ret) return $ret;
- }
- }
-
- return $ret;
- }
-
- // バックアップテーブルを作成する
- function lfCreateBkupTable(){
- $objQuery = new SC_Query();
-
- // テーブルの存在チェック
- $arrTableList = $this->lfGetTableList();
-
- if(!in_array("dtb_bkup", $arrTableList)){
- // 存在していなければ作成
- // MySQL でプライマリキーを設定するため bkup_name は varchar(50) とした。
- $cre_sql = "
- create table dtb_bkup
- (
- bkup_name varchar(50),
- bkup_memo text,
- create_date timestamp,
- PRIMARY KEY (bkup_name)
- );
- ";
-
- $objQuery->query($cre_sql);
- }
+ if (PEAR::isError($ret)) return false;
+ }
+ }
+
+ return true;
}
}
Index: /branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php
===================================================================
--- /branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php (revision 18781)
+++ /branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php (revision 18791)
@@ -78,5 +78,5 @@
create_date,
update_date,
- "convert"
+ mb_convert_kana_option
FROM
dtb_csv
@@ -262,5 +262,5 @@
$objQuery->setOption($option);
- $list_data = $objQuery->select($cols, $from, $where, $arrval, DB_FETCHMODE_ORDERED);
+ $list_data = $objQuery->select($cols, $from, $where, $arrval, MDB2_FETCHMODE_ORDERED);
$csv = '';