Index: /branches/version-2_11-dev/html/test/upgrade/index.php
===================================================================
--- /branches/version-2_11-dev/html/test/upgrade/index.php (revision 20813)
+++ /branches/version-2_11-dev/html/test/upgrade/index.php (revision 21185)
@@ -117,5 +117,5 @@
'auto_update_flg' => '0',
'del_flg' => '0',
- 'update_date' => 'NOW()',
+ 'update_date' => 'CURRENT_TIMESTAMP',
);
$objQuery->update($table, $arrUpdate, $where, array($arrProduct['product_id']));
@@ -127,6 +127,6 @@
'auto_update_flg' => '0',
'del_flg' => '0',
- 'update_date' => 'NOW()',
- 'create_date' => 'NOW()',
+ 'update_date' => 'CURRENT_TIMESTAMP',
+ 'create_date' => 'CURRENT_TIMESTAMP',
);
$objQuery->insert($table, $arrInsert);
Index: /branches/version-2_11-dev/html/install/index.php
===================================================================
--- /branches/version-2_11-dev/html/install/index.php (revision 20970)
+++ /branches/version-2_11-dev/html/install/index.php (revision 21185)
@@ -551,5 +551,5 @@
$sqlval['detail_tpl'] = "default1";
$sqlval['mypage_tpl'] = "default1";
- $sqlval['update_date'] = 'now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery = new SC_Query($dsn);
$cnt = $objQuery->count("dtb_baseinfo");
@@ -571,5 +571,5 @@
'work' => 1,
'del_flg' => 0,
- 'update_date' => 'now()',
+ 'update_date' => 'CURRENT_TIMESTAMP',
);
Index: /branches/version-2_11-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- /branches/version-2_11-dev/html/install/sql/create_table_pgsql.sql (revision 20887)
+++ /branches/version-2_11-dev/html/install/sql/create_table_pgsql.sql (revision 21185)
@@ -6,5 +6,5 @@
error text,
ok text,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
PRIMARY KEY (log_id)
@@ -21,5 +21,5 @@
rank int NOT NULL DEFAULT 0,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -34,5 +34,5 @@
rank int NOT NULL DEFAULT 0,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -70,5 +70,5 @@
other_files text,
del_flg smallint NOT NULL DEFAULT 0,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
release_date timestamp NOT NULL,
@@ -154,5 +154,5 @@
del_flg smallint NOT NULL DEFAULT 0,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
PRIMARY KEY (deliv_id)
@@ -192,5 +192,5 @@
del_flg smallint NOT NULL DEFAULT 0,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
payment_image text,
@@ -221,5 +221,5 @@
creator_id int NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL
);
@@ -232,5 +232,5 @@
del_flg smallint NOT NULL DEFAULT 0,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
PRIMARY KEY (template_id)
@@ -249,5 +249,5 @@
del_flg smallint NOT NULL DEFAULT 0,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
PRIMARY KEY (send_id)
@@ -306,5 +306,5 @@
del_flg smallint NOT NULL DEFAULT 0,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
deliv_date_id int,
@@ -326,5 +326,5 @@
point_rate numeric,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
down_filename text,
@@ -339,5 +339,5 @@
rank int,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -351,5 +351,5 @@
rank int,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -372,5 +372,5 @@
rank int,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -389,5 +389,5 @@
product_id int NOT NULL,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -402,5 +402,5 @@
status smallint NOT NULL DEFAULT 0,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL
);
@@ -418,5 +418,5 @@
status smallint DEFAULT 2,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -427,5 +427,5 @@
customer_id int NOT NULL,
product_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
PRIMARY KEY (customer_id, product_id)
@@ -435,5 +435,5 @@
category_id int NOT NULL,
product_count int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now()
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
);
@@ -441,5 +441,5 @@
category_id int NOT NULL,
product_count int,
- create_date timestamp NOT NULL DEFAULT now()
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
);
@@ -454,5 +454,5 @@
link_method text,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -468,5 +468,5 @@
comment text,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -519,5 +519,5 @@
note text,
status smallint NOT NULL DEFAULT 1,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -566,5 +566,5 @@
note text,
status smallint,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
commit_date timestamp,
@@ -626,5 +626,5 @@
deliv_check smallint,
point_check smallint,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
device_type_id int,
@@ -669,5 +669,5 @@
shipping_commit_date timestamp,
rank int,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -733,5 +733,5 @@
del_flg smallint NOT NULL DEFAULT 0,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
login_date timestamp,
@@ -752,5 +752,5 @@
keyword text,
update_url text,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
PRIMARY KEY (device_type_id, page_id)
@@ -763,5 +763,5 @@
tpl_path text,
filename text NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
php_path text,
@@ -789,5 +789,5 @@
rw_flg smallint DEFAULT 1,
status smallint NOT NULL DEFAULT 1,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
mb_convert_kana_option text,
@@ -801,5 +801,5 @@
sql_name text NOT NULL,
csv_sql text,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
PRIMARY KEY (sql_id)
@@ -810,5 +810,5 @@
device_type_id int NOT NULL,
template_name text,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
PRIMARY KEY (template_code)
@@ -820,5 +820,5 @@
rank int NOT NULL DEFAULT 0,
creator_id int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
del_flg smallint NOT NULL DEFAULT 0,
@@ -829,5 +829,5 @@
maker_id int NOT NULL,
product_count int NOT NULL,
- create_date timestamp NOT NULL DEFAULT now()
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
);
@@ -1104,5 +1104,5 @@
param_value text,
url text,
- create_date timestamp NOT NULL DEFAULT now()
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
);
@@ -1114,5 +1114,5 @@
auto_update_flg smallint NOT NULL DEFAULT 0,
del_flg smallint NOT NULL DEFAULT 0,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL
);
@@ -1121,5 +1121,5 @@
sess_id text NOT NULL,
sess_data text,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
PRIMARY KEY (sess_id)
@@ -1129,5 +1129,5 @@
bkup_name text,
bkup_memo text,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (bkup_name)
);
@@ -1147,5 +1147,5 @@
enable smallint NOT NULL DEFAULT 0,
del_flg smallint NOT NULL DEFAULT 0,
- create_date timestamp NOT NULL DEFAULT now(),
+ create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_date timestamp NOT NULL,
PRIMARY KEY (plugin_id)
Index: /branches/version-2_11-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
===================================================================
--- /branches/version-2_11-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php (revision 20942)
+++ /branches/version-2_11-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php (revision 21185)
@@ -108,5 +108,5 @@
. "WHERE del_flg = 0 "
. "AND date_format(create_date, '%Y/%m') = ? "
- . "AND date_format(create_date, '%Y/%m/%d') <> date_format(now(), '%Y/%m/%d') "
+ . "AND date_format(create_date, '%Y/%m/%d') <> date_format(CURRENT_TIMESTAMP, '%Y/%m/%d') "
. "AND status <> " . ORDER_CANCEL;
}
@@ -133,5 +133,5 @@
*/
function getSendHistoryWhereStartdateSql() {
- return "start_date BETWEEN date_add(now(),INTERVAL -5 minute) AND date_add(now(),INTERVAL 5 minute)";
+ return "start_date BETWEEN date_add(CURRENT_TIMESTAMP,INTERVAL -5 minute) AND date_add(CURRENT_TIMESTAMP,INTERVAL 5 minute)";
}
@@ -143,5 +143,5 @@
*/
function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order') {
- return "(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(NOW()) <= DATE(DATE_ADD(" . $dtb_order_alias . ".payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))";
+ return "(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(CURRENT_TIMESTAMP) <= DATE(DATE_ADD(" . $dtb_order_alias . ".payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))";
}
Index: /branches/version-2_11-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php
===================================================================
--- /branches/version-2_11-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php (revision 20942)
+++ /branches/version-2_11-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php (revision 21185)
@@ -73,5 +73,5 @@
return "SELECT ".$method."(total) FROM dtb_order "
. "WHERE del_flg = 0 "
- . "AND to_char(create_date,'YYYY/MM/DD') = to_char(now() - interval '1 days','YYYY/MM/DD') "
+ . "AND to_char(create_date,'YYYY/MM/DD') = to_char(CURRENT_TIMESTAMP - interval '1 days','YYYY/MM/DD') "
. "AND status <> " . ORDER_CANCEL;
}
@@ -87,5 +87,5 @@
. "WHERE del_flg = 0 "
. "AND to_char(create_date,'YYYY/MM') = ? "
- . "AND to_char(create_date,'YYYY/MM/DD') <> to_char(now(),'YYYY/MM/DD') "
+ . "AND to_char(create_date,'YYYY/MM/DD') <> to_char(CURRENT_TIMESTAMP,'YYYY/MM/DD') "
. "AND status <> " . ORDER_CANCEL;
}
@@ -102,6 +102,6 @@
. "WHERE A.del_flg=0 "
. "AND B.del_flg = 0 "
- . "AND to_char(A.create_date, 'YYYY/MM/DD') = to_char(now() - interval '1 days','YYYY/MM/DD') "
- . "AND to_char(A.create_date,'YYYY/MM/DD') != to_char(now(),'YYYY/MM/DD')";
+ . "AND to_char(A.create_date, 'YYYY/MM/DD') = to_char(CURRENT_TIMESTAMP - interval '1 days','YYYY/MM/DD') "
+ . "AND to_char(A.create_date,'YYYY/MM/DD') != to_char(CURRENT_TIMESTAMP,'YYYY/MM/DD')";
}
@@ -126,5 +126,5 @@
$downloadable_days = $baseinfo['downloadable_days'];
if($downloadable_days ==null || $downloadable_days == "")$downloadable_days=0;
- return "(SELECT CASE WHEN (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND " . $dtb_order_alias . ".payment_date IS NOT NULL THEN 1 WHEN DATE(NOW()) <= DATE(" . $dtb_order_alias . ".payment_date + '". $downloadable_days ." days') THEN 1 ELSE 0 END)";
+ return "(SELECT CASE WHEN (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND " . $dtb_order_alias . ".payment_date IS NOT NULL THEN 1 WHEN DATE(CURRENT_TIMESTAMP) <= DATE(" . $dtb_order_alias . ".payment_date + '". $downloadable_days ." days') THEN 1 ELSE 0 END)";
}
Index: /branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Review.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Review.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Review.php (revision 21185)
@@ -198,6 +198,6 @@
$arrRegist = $objFormParam->getDbArray();
- $arrRegist['create_date'] = 'now()';
- $arrRegist['update_date'] = 'now()';
+ $arrRegist['create_date'] = 'CURRENT_TIMESTAMP';
+ $arrRegist['update_date'] = 'CURRENT_TIMESTAMP';
$arrRegist['creator_id'] = '0';
Index: /branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 21182)
+++ /branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 21185)
@@ -532,6 +532,6 @@
$sqlval['customer_id'] = $customer_id;
$sqlval['product_id'] = $favorite_product_id;
- $sqlval['update_date'] = "now()";
- $sqlval['create_date'] = "now()";
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
$objQuery->begin();
Index: /branches/version-2_11-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php (revision 20764)
+++ /branches/version-2_11-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php (revision 21185)
@@ -97,5 +97,5 @@
$sqlval['del_flg'] = 1;
- $sqlval['update_date'] = 'now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$where = 'customer_id = ?';
$objQuery->update('dtb_customer', $sqlval, $where, array($customer_id));
Index: /branches/version-2_11-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php (revision 21185)
@@ -273,5 +273,5 @@
'module_code' => $objRet->product_code,
'module_name' => $objRet->product_name,
- 'update_date' => 'NOW()'
+ 'update_date' => 'CURRENT_TIMESTAMP'
);
$objQuery->update($table, $arrUpdate ,$where, array($objRet->product_id));
@@ -282,6 +282,6 @@
'module_name' => $objRet->product_name,
'auto_update_flg' => '0',
- 'create_date' => 'NOW()',
- 'update_date' => 'NOW()'
+ 'create_date' => 'CURRENT_TIMESTAMP',
+ 'update_date' => 'CURRENT_TIMESTAMP'
);
$objQuery->insert($table, $arrInsert);
@@ -368,6 +368,6 @@
'error' => implode("\n", $arrLog['err']),
'ok' => implode("\n", $arrLog['ok']),
- 'update_date' => 'NOW()',
- 'create_date' => 'NOW()'
+ 'update_date' => 'CURRENT_TIMESTAMP',
+ 'create_date' => 'CURRENT_TIMESTAMP'
);
$objQuery->insert('dtb_module_update_logs', $arrInsert);
Index: /branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php (revision 21113)
+++ /branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php (revision 21185)
@@ -344,5 +344,5 @@
$arrForm['order_temp_id'] = $uniqid;
- $arrForm['update_date'] = 'Now()';
+ $arrForm['update_date'] = 'CURRENT_TIMESTAMP';
if($arrForm['point_check'] != '1') {
Index: /branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 21138)
+++ /branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping.php (revision 21185)
@@ -361,5 +361,5 @@
// 登録データの作成
$arrValues['order_birth'] = SC_Utils_Ex::sfGetTimestamp($arrParams['year'], $arrParams['month'], $arrParams['day']);
- $arrValues['update_date'] = 'Now()';
+ $arrValues['update_date'] = 'CURRENT_TIMESTAMP';
$arrValues['customer_id'] = '0';
Index: /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php (revision 20911)
+++ /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php (revision 21185)
@@ -159,6 +159,6 @@
$sqlval['creator_id'] = $member_id;
$sqlval['rank'] = $objQuery->max('rank', "dtb_kiyaku") + 1;
- $sqlval['update_date'] = "Now()";
- $sqlval['create_date'] = "Now()";
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
// INSERTの実行
$sqlval['kiyaku_id'] = $objQuery->nextVal('dtb_kiyaku_kiyaku_id');
@@ -188,5 +188,5 @@
$sqlval['kiyaku_title'] = $arrData['kiyaku_title'];
$sqlval['kiyaku_text'] = $arrData['kiyaku_text'];
- $sqlval['update_date'] = "Now()";
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$where = "kiyaku_id = ?";
// UPDATEの実行
Index: /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php (revision 21185)
@@ -223,5 +223,5 @@
$arrRet = $this->objUpFile->getDBFileList(); // ファイル名の取得
$sqlval = array_merge($sqlval, $arrRet);
- $sqlval['update_date'] = 'Now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
if($sqlval['fix'] != '1') {
@@ -234,5 +234,5 @@
$sqlval['creator_id'] = $member_id;
$sqlval['rank'] = $objQuery->max('rank', "dtb_payment") + 1;
- $sqlval['create_date'] = 'Now()';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
$sqlval['payment_id'] = $objQuery->nextVal('dtb_payment_payment_id');
$objQuery->insert("dtb_payment", $sqlval);
Index: /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php (revision 21031)
+++ /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php (revision 21185)
@@ -191,5 +191,5 @@
}
}
- $sqlval['update_date'] = 'Now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
// UPDATEの実行
$ret = $objQuery->update("dtb_baseinfo", $sqlval);
@@ -204,5 +204,5 @@
$sqlval[$val] = $array[$val];
}
- $sqlval['update_date'] = 'Now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
// INSERTの実行
$ret = $objQuery->insert("dtb_baseinfo", $sqlval);
Index: /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php (revision 20911)
+++ /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php (revision 21185)
@@ -133,5 +133,5 @@
$post['creator_id'] = $member_id;
- $post['update_date'] = 'now()';
+ $post['update_date'] = 'CURRENT_TIMESTAMP';
$sql = "SELECT * FROM dtb_mailtemplate WHERE template_id = ?";
Index: /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php (revision 21185)
@@ -158,5 +158,5 @@
$sqlval['product_type_id'] = $arrRet['product_type_id'];
$sqlval['creator_id'] = $member_id;
- $sqlval['update_date'] = 'Now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
// deliv_id が決まっていた場合
@@ -212,5 +212,5 @@
$sqlval['deliv_id'] = $deliv_id;
$sqlval['rank'] = $objQuery->max('rank', "dtb_deliv") + 1;
- $sqlval['create_date'] = 'Now()';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
// INSERTの実行
$objQuery->insert("dtb_deliv", $sqlval);
Index: /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php (revision 21185)
@@ -147,5 +147,5 @@
function lfUpdateData($sqlval) {
- $sqlval['update_date'] = 'Now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery =& SC_Query_Ex::getSingletonInstance();
// UPDATEの実行
@@ -154,5 +154,5 @@
function lfInsertData($sqlval) {
- $sqlval['update_date'] = 'Now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery =& SC_Query_Ex::getSingletonInstance();
// INSERTの実行
Index: /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php (revision 20911)
+++ /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php (revision 21185)
@@ -185,6 +185,6 @@
$sqlval['creator_id'] = $member_id;
$sqlval['rank'] = $objQuery->max('rank', "dtb_holiday") + 1;
- $sqlval['update_date'] = "Now()";
- $sqlval['create_date'] = "Now()";
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
// INSERTの実行
$sqlval['holiday_id'] = $objQuery->nextVal('dtb_holiday_holiday_id');
@@ -200,5 +200,5 @@
$sqlval['month'] = $arrData['month'];
$sqlval['day'] = $arrData['day'];
- $sqlval['update_date'] = "Now()";
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$where = "holiday_id = ?";
// UPDATEの実行
Index: /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php (revision 21185)
@@ -130,5 +130,5 @@
// 入力データを渡す。
$sqlval = $post;
- $sqlval['update_date'] = 'Now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery =& SC_Query_Ex::getSingletonInstance();
// UPDATEの実行
@@ -139,5 +139,5 @@
// 入力データを渡す。
$sqlval = $post;
- $sqlval['update_date'] = 'Now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery =& SC_Query_Ex::getSingletonInstance();
// INSERTの実行
Index: /branches/version-2_11-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php (revision 21118)
+++ /branches/version-2_11-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php (revision 21185)
@@ -183,5 +183,5 @@
// XXXX: 仮会員は物理削除となっていたが論理削除に変更。
$arrVal["del_flg"] = "1";
- $arrVal["update_date"] ="now()";
+ $arrVal["update_date"] = 'CURRENT_TIMESTAMP';
SC_Helper_Customer_Ex::sfEditCustomerData($arrVal, $customer_id);
return true;
Index: /branches/version-2_11-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php (revision 21185)
@@ -129,5 +129,5 @@
$sqlval['creator_id'] = $_SESSION['member_id'];
- $sqlval['update_date'] = "now()";
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
if ( SC_Utils_Ex::sfIsInt($template_id) ){
@@ -139,5 +139,5 @@
} else {
// 新規登録時
- $sqlval['create_date'] = "now()";
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
$sqlval['template_id'] = $objQuery->nextVal('dtb_mailmaga_template_template_id');
$objQuery->insert("dtb_mailmaga_template", $sqlval);
Index: /branches/version-2_11-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 21118)
+++ /branches/version-2_11-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 21185)
@@ -250,10 +250,10 @@
$dtb_send_history['subject'] = $objFormParam->getValue('subject');
$dtb_send_history['body'] = $objFormParam->getValue('body');
- $dtb_send_history["start_date"] = "now()";
+ $dtb_send_history["start_date"] = 'CURRENT_TIMESTAMP';
$dtb_send_history["creator_id"] = $_SESSION['member_id'];
$dtb_send_history["send_count"] = $send_customer_cnt;
$dtb_send_history["search_data"] = serialize($objFormParam->getSearchArray());
- $dtb_send_history["update_date"] = "now()";
- $dtb_send_history["create_date"] = "now()";
+ $dtb_send_history["update_date"] = 'CURRENT_TIMESTAMP';
+ $dtb_send_history["create_date"] = 'CURRENT_TIMESTAMP';
$dtb_send_history['send_id'] = $send_id;
$objQuery->insert("dtb_send_history", $dtb_send_history );
Index: /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php (revision 21185)
@@ -287,5 +287,5 @@
$arrCategory = array();
$arrCategory['category_name'] = $objFormParam->getValue('category_name');
- $arrCategory['update_date'] = 'NOW()';
+ $arrCategory['update_date'] = 'CURRENT_TIMESTAMP';
$this->updateCategory($objFormParam->getValue('category_id'), $arrCategory);
}
@@ -482,6 +482,6 @@
$arrCategory['category_name'] = $category_name;
$arrCategory['parent_category_id'] = $parent_category_id;
- $arrCategory['create_date'] = "Now()";
- $arrCategory['update_date'] = "Now()";
+ $arrCategory['create_date'] = 'CURRENT_TIMESTAMP';
+ $arrCategory['update_date'] = 'CURRENT_TIMESTAMP';
$arrCategory['creator_id'] = $creator_id;
$arrCategory['rank'] = $rank;
Index: /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php (revision 21185)
@@ -361,5 +361,5 @@
// 登録データ対象取得
$arrList = $objFormParam->getHashArray();
- // 登録時間を生成(DBのnow()だとcommitした際、すべて同一の時間になってしまう)
+ // 登録時間を生成(DBのCURRENT_TIMESTAMPだとcommitした際、すべて同一の時間になってしまう)
$arrList['update_date'] = $this->lfGetDbFormatTimeWithLine($line);
@@ -536,6 +536,6 @@
$arrCategory['category_name'] = $category_name;
$arrCategory['parent_category_id'] = $parent_category_id;
- $arrCategory['create_date'] = "Now()";
- $arrCategory['update_date'] = "Now()";
+ $arrCategory['create_date'] = 'CURRENT_TIMESTAMP';
+ $arrCategory['update_date'] = 'CURRENT_TIMESTAMP';
$arrCategory['creator_id'] = $creator_id;
$arrCategory['rank'] = $rank;
@@ -559,5 +559,5 @@
/**
* 指定された行番号をmicrotimeに付与してDB保存用の時間を生成する。
- * トランザクション内のnow()は全てcommit()時の時間に統一されてしまう為。
+ * トランザクション内のCURRENT_TIMESTAMPは全てcommit()時の時間に統一されてしまう為。
*
* @param string $line_no 行番号
Index: /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php (revision 21185)
@@ -190,6 +190,6 @@
$sqlval['rank'] = $objQuery->max('rank', "dtb_maker") + 1;
$sqlval['creator_id'] = $_SESSION['member_id'];
- $sqlval['update_date'] = "Now()";
- $sqlval['create_date'] = "Now()";
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
$sqlval['maker_id'] = $objQuery->nextVal('dtb_maker_maker_id');
@@ -209,5 +209,5 @@
// UPDATEする値を作成する
$sqlval['name'] = $arrForm['name'];
- $sqlval['update_date'] = "Now()";
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$where = "maker_id = ?";
Index: /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 21183)
+++ /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 21185)
@@ -257,5 +257,5 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$sqlval['del_flg'] = 1;
- $sqlval['update_date'] = 'now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery->begin();
$objQuery->update('dtb_products_class', $sqlval, "product_id IN (SELECT product_id FROM dtb_products WHERE $where)", $arrParam);
Index: /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (revision 21182)
+++ /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (revision 21185)
@@ -983,5 +983,5 @@
$sqlval['maker_id'] = $arrList['maker_id'];
$sqlval['note'] = $arrList['note'];
- $sqlval['update_date'] = "Now()";
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$sqlval['creator_id'] = $_SESSION['member_id'];
$arrRet = $objUpFile->getDBFileList();
@@ -1001,5 +1001,5 @@
// INSERTの実行
- $sqlval['create_date'] = "Now()";
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert("dtb_products", $sqlval);
@@ -1043,5 +1043,5 @@
$sqlval['product_class_id'] = $objQuery->nextVal('dtb_products_class_product_class_id');
$sqlval['product_id'] = $product_id;
- $sqlval['create_date'] = 'now()';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
$sqlval['class_combination_id'] = $arrRetCombinationId[$arrData['class_combination_id']];
$sqlval['product_type_id'] = $arrData['product_type_id'];
@@ -1055,5 +1055,5 @@
$sqlval['point_rate'] = $arrData['point_rate'];
$sqlval['creator_id'] = $arrData['creator_id'];
- $sqlval['update_date'] = 'now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$sqlval['down_filename'] = $arrData['down_filename'];
$sqlval['down_realfilename'] = $arrData['down_realfilename'];
@@ -1136,10 +1136,10 @@
if (strlen($sqlval['product_class_id']) == 0) {
$sqlval['product_class_id'] = $objQuery->nextVal('dtb_products_class_product_class_id');
- $sqlval['create_date'] = 'now()';
- $sqlval['update_date'] = 'now()';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
// INSERTの実行
$objQuery->insert('dtb_products_class', $sqlval);
} else {
- $sqlval['update_date'] = 'now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
// UPDATEの実行
$objQuery->update('dtb_products_class', $sqlval, "product_class_id = ?", array($sqlval['product_class_id']));
@@ -1191,6 +1191,6 @@
$sqlval['rank'] = $rank;
$sqlval['creator_id'] = $_SESSION['member_id'];
- $sqlval['create_date'] = "now()";
- $sqlval['update_date'] = "now()";
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert("dtb_recommend_products", $sqlval);
$rank--;
@@ -1232,6 +1232,6 @@
$records["product_class_id"] = $objQuery->nextVal('dtb_products_class_product_class_id');
- $records["update_date"] = 'now()';
- $records["create_date"] = "Now()";
+ $records["update_date"] = 'CURRENT_TIMESTAMP';
+ $records["create_date"] = 'CURRENT_TIMESTAMP';
$objQuery->insert($table, $records);
//エラー発生時は中断
Index: /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (revision 21182)
+++ /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (revision 21185)
@@ -378,5 +378,5 @@
// 登録データ対象取得
$arrList = $objFormParam->getHashArray();
- // 登録時間を生成(DBのnow()だとcommitした際、すべて同一の時間になってしまう)
+ // 登録時間を生成(DBのCURRENT_TIMESTAMPだとcommitした際、すべて同一の時間になってしまう)
$arrList['update_date'] = $this->lfGetDbFormatTimeWithLine($line);
@@ -717,5 +717,5 @@
/**
* 指定された行番号をmicrotimeに付与してDB保存用の時間を生成する。
- * トランザクション内のnow()は全てcommit()時の時間に統一されてしまう為。
+ * トランザクション内のCURRENT_TIMESTAMPは全てcommit()時の時間に統一されてしまう為。
*
* @param string $line_no 行番号
Index: /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php (revision 21185)
@@ -211,6 +211,6 @@
$sqlval['creator_id'] = $_SESSION['member_id'];
$sqlval['rank'] = $objQuery->max('rank', "dtb_classcategory", $where, array($arrForm['class_id'])) + 1;
- $sqlval['create_date'] = "now()";
- $sqlval['update_date'] = "now()";
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
// INSERTの実行
$sqlval['classcategory_id'] = $objQuery->nextVal('dtb_classcategory_classcategory_id');
@@ -231,5 +231,5 @@
// UPDATEする値を作成する。
$sqlval['name'] = $arrForm['name'];
- $sqlval['update_date'] = "Now()";
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$where = "classcategory_id = ?";
// UPDATEの実行
Index: /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php (revision 21185)
@@ -188,6 +188,6 @@
$sqlval['creator_id'] = $_SESSION['member_id'];
$sqlval['rank'] = $objQuery->max('rank', "dtb_class") + 1;
- $sqlval['create_date'] = "now()";
- $sqlval['update_date'] = "now()";
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
// INSERTの実行
$sqlval['class_id'] = $objQuery->nextVal('dtb_class_class_id');
@@ -206,5 +206,5 @@
// UPDATEする値を作成する。
$sqlval['name'] = $arrForm['name'];
- $sqlval['update_date'] = "Now()";
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$where = "class_id = ?";
// UPDATEの実行
Index: /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (revision 21183)
+++ /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (revision 21185)
@@ -262,5 +262,5 @@
// 該当関数が無いため, セッションの値を直接代入
$arrPC['creator_id'] = $_SESSION['member_id'];
- $arrPC['update_date'] = 'now()';
+ $arrPC['update_date'] = 'CURRENT_TIMESTAMP';
$arrPC['del_flg'] = $del_flg;
@@ -294,5 +294,5 @@
}
- $arrPC['create_date'] = "now()";
+ $arrPC['create_date'] = 'CURRENT_TIMESTAMP';
$arrPC['product_class_id'] = $objQuery->nextVal('dtb_products_class_product_class_id');
/*
@@ -306,5 +306,5 @@
// 規格無し用の商品規格を非表示に
$arrBlank['del_flg'] = 1;
- $arrBlank['update_date'] = 'now()';
+ $arrBlank['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery->update("dtb_products_class", $arrBlank,
"product_id = ? AND class_combination_id IS NULL",
Index: /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php (revision 21185)
@@ -176,5 +176,5 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$arrValues = $objFormParam->getDbArray();
- $arrValues['update_date'] = 'now()';
+ $arrValues['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery->update("dtb_review", $arrValues, "review_id = ?", array($review_id));
}
Index: /branches/version-2_11-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php (revision 21185)
@@ -289,5 +289,5 @@
$sqlval['status'] = PLUGIN_STATUS_UPLOADED;
$sqlval['enable'] = PLUGIN_ENABLE_FALSE;
- $sqlval['update_date'] = 'now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert('dtb_plugin', $sqlval);
}
Index: /branches/version-2_11-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php (revision 21079)
+++ /branches/version-2_11-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php (revision 21185)
@@ -333,6 +333,6 @@
$sqlVal['del_flg'] = '0'; // 削除フラグをOFFに設定
$sqlVal['creator_id'] = $_SESSION['member_id'];
- $sqlVal['create_date'] = 'NOW()';
- $sqlVal['update_date'] = 'NOW()';
+ $sqlVal['create_date'] = 'CURRENT_TIMESTAMP';
+ $sqlVal['update_date'] = 'CURRENT_TIMESTAMP';
// INSERTの実行
@@ -357,5 +357,5 @@
$sqlVal['authority'] = $arrMemberData['authority'];
$sqlVal['work'] = $arrMemberData['work'];
- $sqlVal['update_date'] = 'NOW()';
+ $sqlVal['update_date'] = 'CURRENT_TIMESTAMP';
if($arrMemberData['password'] != DEFAULT_PASSWORD) {
$salt = SC_Utils_Ex::sfGetRandomString(10);
Index: /branches/version-2_11-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php (revision 21185)
@@ -393,5 +393,5 @@
$arrVal['bkup_name'] = $data['bkup_name'];
$arrVal['bkup_memo'] = $data['bkup_memo'];
- $arrVal['create_date'] = "now()";
+ $arrVal['create_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert('dtb_bkup', $arrVal);
Index: /branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (revision 21002)
+++ /branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (revision 21185)
@@ -260,5 +260,5 @@
$arrValues = $objQuery->extractOnlyColsOf($table, $arrParams);
$arrValues['update_url'] = $_SERVER['HTTP_REFERER'];
- $arrValues['update_date'] = 'now()';
+ $arrValues['update_date'] = 'CURRENT_TIMESTAMP';
// 新規登録
@@ -267,5 +267,5 @@
$arrValues['page_id'] = 1 + $objQuery->max('page_id', $table, 'device_type_id = ?',
array($arrValues['device_type_id']));
- $arrValues['create_date'] = 'now()';
+ $arrValues['create_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert($table, $arrValues);
}
Index: /branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php (revision 21185)
@@ -211,6 +211,6 @@
'device_type_id' => $device_type_id,
'template_name' => $template_name,
- 'create_date' => 'now()',
- 'update_date' => 'now()');
+ 'create_date' => 'CURRENT_TIMESTAMP',
+ 'update_date' => 'CURRENT_TIMESTAMP');
$objQuery->insert('dtb_templates', $arrValues);
Index: /branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php (revision 21185)
@@ -213,5 +213,5 @@
$arrValues = $objQuery->extractOnlyColsOf($table, $arrParams);
$arrValues['tpl_path'] = $arrParams['filename'] . '.tpl';
- $arrValues['update_date'] = 'now()';
+ $arrValues['update_date'] = 'CURRENT_TIMESTAMP';
// 新規登録
@@ -220,5 +220,5 @@
$arrValues['bloc_id'] = 1 + $objQuery->max('bloc_id', $table, 'device_type_id = ?',
array($arrValues['device_type_id']));
- $arrValues['create_date'] = 'now()';
+ $arrValues['create_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert($table, $arrValues);
}
Index: /branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php (revision 21185)
@@ -400,5 +400,5 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$sqlval['del_flg'] = 1;
- $sqlval['update_date'] = 'now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery->update("dtb_order", $sqlval, $where, $arrParam);
}
Index: /branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php (revision 21182)
+++ /branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php (revision 21185)
@@ -235,5 +235,5 @@
$arrUpdate = array(
'del_flg' => 1,
- 'update_date' => 'Now()'
+ 'update_date' => 'CURRENT_TIMESTAMP'
);
Index: /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (revision 21185)
@@ -186,6 +186,6 @@
$sqlval['comment'] = $arrPost['comment'];
$sqlval['creator_id'] = $member_id;
- $sqlval['create_date'] = "NOW()";
- $sqlval['update_date'] = "NOW()";
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$sqlval['best_id'] = $objQuery->nextVal('dtb_best_products_best_id');
$objQuery->insert("dtb_best_products", $sqlval);
Index: /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php (revision 21185)
@@ -229,5 +229,5 @@
$where = "csv_id = ?";
$arrWhereVal = array($csv_id);
- $arrUpdVal = array( 'status' => '2', 'rank' => NULL, 'update_date' => 'now()' );
+ $arrUpdVal = array( 'status' => '2', 'rank' => NULL, 'update_date' => 'CURRENT_TIMESTAMP' );
$objQuery->begin();
Index: /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php (revision 21033)
+++ /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php (revision 21185)
@@ -375,5 +375,5 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$table = "dtb_csv_sql";
- $arrSqlVal['update_date'] = 'now()';
+ $arrSqlVal['update_date'] = 'CURRENT_TIMESTAMP';
if (SC_Utils_Ex::sfIsInt($sql_id)) {
//データ更新
@@ -384,5 +384,5 @@
$sql_id = $objQuery->nextVal('dtb_csv_sql_sql_id');
$arrSqlVal['sql_id'] = $sql_id;
- $arrSqlVal['create_date'] = 'now()';
+ $arrSqlVal['create_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert($table, $arrSqlVal);
}
Index: /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents.php (revision 21185)
@@ -212,6 +212,6 @@
$sqlval['news_comment'] = $arrPost['news_comment'];
$sqlval['rank'] = $rank_max;
- $sqlval['create_date'] = 'now()';
- $sqlval['update_date'] = 'now()';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert($table, $sqlval);
@@ -234,5 +234,5 @@
$sqlval['news_comment'] = $arrPost['news_comment'];
$sqlval['link_method'] = $arrPost['link_method'];
- $sqlval['update_date'] = 'NOW()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$where = 'news_id = ?';
$arrValIn = array($arrPost['news_id']);
@@ -307,5 +307,5 @@
$sqlval = array();
$sqlval['rank'] = $rank;
- $sqlval['update_date'] = 'NOW()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$where = 'del_flg = 0 AND rank > ?';
$arrValIn = array($rank);
@@ -315,5 +315,5 @@
$sqlval['rank'] = '0';
$sqlval['del_flg'] = '1';
- $sqlval['update_date'] = 'NOW()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$where = 'news_id = ?';
$arrValIn = array($news_id);
Index: /branches/version-2_11-dev/data/class/pages/regist/LC_Page_Regist.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/regist/LC_Page_Regist.php (revision 20972)
+++ /branches/version-2_11-dev/data/class/pages/regist/LC_Page_Regist.php (revision 21185)
@@ -105,5 +105,5 @@
$arrRegist["secret_key"] = SC_Helper_Customer_Ex::sfGetUniqSecretKey(); //本登録ID発行
$arrRegist['status'] = 2;
- $arrRegist["update_date"] = "NOW()";
+ $arrRegist["update_date"] = 'CURRENT_TIMESTAMP';
$objQuery->begin();
Index: /branches/version-2_11-dev/data/class/helper/SC_Helper_Session.php
===================================================================
--- /branches/version-2_11-dev/data/class/helper/SC_Helper_Session.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/helper/SC_Helper_Session.php (revision 21185)
@@ -89,5 +89,5 @@
// レコード更新
$sqlval['sess_data'] = $sess_data;
- $sqlval['update_date'] = 'Now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery->update("dtb_session", $sqlval, "sess_id = ?", array($id));
} else {
@@ -96,6 +96,6 @@
$sqlval['sess_id'] = $id;
$sqlval['sess_data'] = $sess_data;
- $sqlval['update_date'] = 'Now()';
- $sqlval['create_date'] = 'Now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert("dtb_session", $sqlval);
}
Index: /branches/version-2_11-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- /branches/version-2_11-dev/data/class/helper/SC_Helper_DB.php (revision 21182)
+++ /branches/version-2_11-dev/data/class/helper/SC_Helper_DB.php (revision 21185)
@@ -729,5 +729,5 @@
foreach($arrDiffCategory_id as $cid) {
$sqlval = array();
- $sqlval['create_date'] = 'Now()';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
$sqlval['product_count'] = (string)$arrNew[$cid];
if($sqlval['product_count'] =="") {
@@ -780,5 +780,5 @@
foreach($arrUpdateData as $cid => $count) {
$sqlval = array();
- $sqlval['create_date'] = 'Now()';
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
$sqlval['product_count'] = $count;
if($sqlval['product_count'] =="") {
@@ -1271,5 +1271,5 @@
//各メーカーの商品数を数えて格納
$sql = " INSERT INTO dtb_maker_count(maker_id, product_count, create_date) ";
- $sql .= " SELECT T1.maker_id, count(T2.maker_id), now() ";
+ $sql .= " SELECT T1.maker_id, count(T2.maker_id), CURRENT_TIMESTAMP ";
$sql .= " FROM dtb_maker AS T1 LEFT JOIN dtb_products AS T2";
$sql .= " ON T1.maker_id = T2.maker_id ";
Index: /branches/version-2_11-dev/data/class/helper/SC_Helper_Mobile.php
===================================================================
--- /branches/version-2_11-dev/data/class/helper/SC_Helper_Mobile.php (revision 20764)
+++ /branches/version-2_11-dev/data/class/helper/SC_Helper_Mobile.php (revision 21185)
@@ -373,5 +373,5 @@
$arrValues = array('email' => $email);
- $arrRawValues = array('receive_date' => 'now()');
+ $arrRawValues = array('receive_date' => 'CURRENT_TIMESTAMP');
$objQuery->update('dtb_mobile_kara_mail', $arrValues, 'kara_mail_id = ?', array($kara_mail_id), $arrRawValues);
Index: /branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- /branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php (revision 21182)
+++ /branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php (revision 21185)
@@ -275,5 +275,5 @@
$this->copyFromCustomer($sqlval, $objCustomer);
$sqlval['order_temp_id'] = $uniqId;
- $sqlval['create_date'] = "now()";
+ $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert("dtb_order_temp", $sqlval);
} else {
@@ -436,5 +436,5 @@
$dest['customer_id'] = $objCustomer->getValue('customer_id');
- $dest['update_date'] = 'Now()';
+ $dest['update_date'] = 'CURRENT_TIMESTAMP';
}
}
@@ -683,6 +683,6 @@
}
$arrValues['order_id'] = $order_id;
- $arrValues['create_date'] = 'Now()';
- $arrValues['update_date'] = 'Now()';
+ $arrValues['create_date'] = 'CURRENT_TIMESTAMP';
+ $arrValues['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert($table, $arrValues);
}
@@ -768,6 +768,6 @@
}
- $orderParams['create_date'] = 'Now()';
- $orderParams['update_date'] = 'Now()';
+ $orderParams['create_date'] = 'CURRENT_TIMESTAMP';
+ $orderParams['update_date'] = 'CURRENT_TIMESTAMP';
$this->registerOrder($orderParams['order_id'], $orderParams);
@@ -833,5 +833,5 @@
$this->sfUpdateOrderNameCol($order_id);
- $arrValues['update_date'] = 'now()';
+ $arrValues['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery->update($table, $arrValues, $where, array($order_id));
} else {
@@ -849,6 +849,6 @@
SC_Utils_Ex::isBlank($arrValues['customer_id'])
? 0 : $arrValues['customer_id'];
- $arrValues['create_date'] = 'now()';
- $arrValues['update_date'] = 'now()';
+ $arrValues['create_date'] = 'CURRENT_TIMESTAMP';
+ $arrValues['update_date'] = 'CURRENT_TIMESTAMP';
$objQuery->insert($table, $arrValues);
@@ -1119,5 +1119,5 @@
if ($addCustomerPoint != 0) {
// ▼会員テーブルの更新
- $objQuery->update('dtb_customer', array('update_date' => 'Now()'),
+ $objQuery->update('dtb_customer', array('update_date' => 'CURRENT_TIMESTAMP'),
'customer_id = ?', array($arrOrderOld['customer_id']),
array('point' => 'point + ?'), array($addCustomerPoint));
@@ -1150,13 +1150,13 @@
// 対応状況が発送済みに変更の場合、発送日を更新
if ($arrOrderOld['status'] != ORDER_DELIV && $newStatus == ORDER_DELIV) {
- $sqlval['commit_date'] = 'Now()';
+ $sqlval['commit_date'] = 'CURRENT_TIMESTAMP';
}
// 対応状況が入金済みに変更の場合、入金日を更新
elseif ($arrOrderOld['status'] != ORDER_PRE_END && $newStatus == ORDER_PRE_END) {
- $sqlval['payment_date'] = 'Now()';
+ $sqlval['payment_date'] = 'CURRENT_TIMESTAMP';
}
$sqlval['status'] = $newStatus;
- $sqlval['update_date'] = 'Now()';
+ $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
$dest = $objQuery->extractOnlyColsOf('dtb_order', $sqlval);
Index: /branches/version-2_11-dev/data/class/helper/SC_Helper_Customer.php
===================================================================
--- /branches/version-2_11-dev/data/class/helper/SC_Helper_Customer.php (revision 21118)
+++ /branches/version-2_11-dev/data/class/helper/SC_Helper_Customer.php (revision 21185)
@@ -44,5 +44,5 @@
$objQuery->begin();
- $array["update_date"] = "now()"; // 更新日
+ $array["update_date"] = 'CURRENT_TIMESTAMP'; // 更新日
// salt値の生成(insert時)または取得(update時)。
@@ -103,5 +103,5 @@
// 作成日
if (is_null($array["create_date"])){
- $array["create_date"] = "now()";
+ $array["create_date"] = 'CURRENT_TIMESTAMP';
}
$objQuery->insert("dtb_customer", $array);
Index: /branches/version-2_11-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- /branches/version-2_11-dev/data/class/helper/SC_Helper_Mail.php (revision 21118)
+++ /branches/version-2_11-dev/data/class/helper/SC_Helper_Mail.php (revision 21185)
@@ -234,5 +234,5 @@
$sqlval['order_id'] = $order_id;
$sqlval['template_id'] = $template_id;
- $sqlval['send_date'] = "Now()";
+ $sqlval['send_date'] = 'CURRENT_TIMESTAMP';
if (!isset($_SESSION['member_id'])) $_SESSION['member_id'] = "";
if($_SESSION['member_id'] != "") {
@@ -454,5 +454,5 @@
// メール全件送信完了後の処理
$objQuery->update('dtb_send_history',
- array('end_date'=>"now()", 'complete_count'=>$complete_count),
+ array('end_date'=>'CURRENT_TIMESTAMP', 'complete_count'=>$complete_count),
'send_id = ?',
array($send_id));
Index: /branches/version-2_11-dev/data/class/SC_Query.php
===================================================================
--- /branches/version-2_11-dev/data/class/SC_Query.php (revision 20970)
+++ /branches/version-2_11-dev/data/class/SC_Query.php (revision 21185)
@@ -460,4 +460,6 @@
if(strcasecmp("Now()", $val) === 0) {
$strval .= 'Now(),';
+ } else if(strcasecmp('CURRENT_TIMESTAMP', $val) === 0) {
+ $strval .= 'CURRENT_TIMESTAMP,';
} else if(strpos($val, '~') === 0) {
$strval .= preg_replace("/^~/", "", $val);
@@ -500,4 +502,6 @@
if (strcasecmp("Now()", $val) === 0) {
$arrCol[] = $key . '= Now()';
+ } else if(strcasecmp('CURRENT_TIMESTAMP', $val) === 0) {
+ $arrCol[] = $key . '= CURRENT_TIMESTAMP';
} else if(strpos('~', $val) === 0) {
$arrCol[] = $key . '= ' . $val;
Index: /branches/version-2_11-dev/data/class/SC_Product.php
===================================================================
--- /branches/version-2_11-dev/data/class/SC_Product.php (revision 21131)
+++ /branches/version-2_11-dev/data/class/SC_Product.php (revision 21185)
@@ -539,6 +539,6 @@
$val['product_id'] = $productId;
$val['creator_id'] = $_SESSION['member_id'];
- $val['create_date'] = 'Now()';
- $val['update_date'] = 'Now()';
+ $val['create_date'] = 'CURRENT_TIMESTAMP';
+ $val['update_date'] = 'CURRENT_TIMESTAMP';
$val['del_flg'] = '0';