[Svn-src-all:845] [version-2_5-dev 19732] #855(SC_Query の #select, #getRow, #getCol, #get, #min, #max の引数順を統一する)
Seasoft
admin ＠ mail.ec-cube.net
2010年 12月 16日 (木) 23:29:12 JST
Subversion committed to /home/svn/open 19732
http://svn.ec-cube.net/open_trac/changeset/19732
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2010-12-16 23:29:12 +0900 (木, 16 12月 2010)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#855(SC_Query の #select, #getRow, #getCol, #get, #min, #max の引数順を統一する)
* SC_Query#max を改訂
* SC_Query#min を改訂
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/SC_Query.php
U branches/version-2_5-dev/data/class/batch/SC_Batch_Daily.php
U branches/version-2_5-dev/data/class/db/SC_DB_MasterData.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
U branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php
変更: branches/version-2_5-dev/data/class/SC_Query.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Query.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/SC_Query.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -512,7 +512,7 @@
* @param array $arrval ブレースホルダに挿入する値
* @return integer MAX文の実行結果
*/
- function max($table, $col, $where = "", $arrval = array()) {
+ function max($col, $table, $where = "", $arrval = array()) {
$ret = $this->get($table, "MAX($col)", $where, $arrval);
return $ret;
}
@@ -526,7 +526,7 @@
* @param array $arrval ブレースホルダに挿入する値
* @return integer MIN文の実行結果
*/
- function min($table, $col, $where = "", $arrval = array()) {
+ function min($col, $table, $where = "", $arrval = array()) {
$ret = $this->get($table, "MIN($col)", $where, $arrval);
return $ret;
}
変更: branches/version-2_5-dev/data/class/batch/SC_Batch_Daily.php
===================================================================
--- branches/version-2_5-dev/data/class/batch/SC_Batch_Daily.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/batch/SC_Batch_Daily.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -95,7 +95,7 @@
$objQuery->delete("dtb_order_detail", $where);
// 最後に更新された日付を取得
- $ret = $objQuery->max("dtb_bat_order_daily", "create_date");
+ $ret = $objQuery->max("create_date", "dtb_bat_order_daily");
list($batch_last) = split("\.", $ret);
$pass = $now_time - strtotime($batch_last);
変更: branches/version-2_5-dev/data/class/db/SC_DB_MasterData.php
===================================================================
--- branches/version-2_5-dev/data/class/db/SC_DB_MasterData.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/db/SC_DB_MasterData.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -180,9 +180,9 @@
}
// 指定のデータを追加
- $sqlVal[$columns[0]] = $key;
+ $sqlVal[$columns[0]] = $key;
$sqlVal[$columns[1]] = $value;
- $sqlVal[$columns[2]] = $this->objQuery->max($name, $columns[2]) + 1;
+ $sqlVal[$columns[2]] = $this->objQuery->max($columns[2], $name) + 1;
$sqlVal[$columns[3]] = $comment;
$this->objQuery->insert($name, $sqlVal);
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -1273,7 +1273,7 @@
// 対象項目のランクを取得
$rank = $objQuery->get("rank", $table, $where, array($id));
// ランクの最大値を取得
- $maxrank = $objQuery->max($table, "rank", $andwhere);
+ $maxrank = $objQuery->max("rank", $table, $andwhere);
// ランクが最大値よりも小さい場合に実行する。
if($rank < $maxrank) {
// ランクが一つ上のIDを取得する。
@@ -1355,7 +1355,7 @@
}
$rank = $objQuery->get("rank", $tableName, $getWhere, array($keyId));
- $max = $objQuery->max($tableName, "rank", $where);
+ $max = $objQuery->max("rank", $tableName, $where);
// 値の調整（逆順）
if($pos > $max) {
@@ -1492,7 +1492,7 @@
$objQuery->exec($sqlup, array($rank, $old_catid));
// 新カテゴリでの登録処理
// 新カテゴリの最大ランクを取得する。
- $max_rank = $objQuery->max($table, "rank", "$cat_name = ?", array($new_catid)) + 1;
+ $max_rank = $objQuery->max("rank", $table, "$cat_name = ?", array($new_catid)) + 1;
$where = "$id_name = ?";
$sqlup = "UPDATE $table SET rank = ? WHERE $where";
$objQuery->exec($sqlup, array($max_rank, $id));
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -224,7 +224,7 @@
// 登録する配送業者IDの取得
$deliv_id = $objQuery->nextVal('dtb_deliv_deliv_id');
$sqlval['deliv_id'] = $deliv_id;
- $sqlval['rank'] = $objQuery->max("dtb_deliv", "rank") + 1;
+ $sqlval['rank'] = $objQuery->max("rank", "dtb_deliv") + 1;
$sqlval['create_date'] = 'Now()';
// INSERTの実行
$objQuery->insert("dtb_deliv", $sqlval);
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -158,7 +158,7 @@
$sqlval['month'] = $arrData['month'];
$sqlval['day'] = $arrData['day'];
$sqlval['creator_id'] = $_SESSION['member_id'];
- $sqlval['rank'] = $objQuery->max("dtb_holiday", "rank") + 1;
+ $sqlval['rank'] = $objQuery->max("rank", "dtb_holiday") + 1;
$sqlval['update_date'] = "Now()";
$sqlval['create_date'] = "Now()";
// INSERTの実行
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -152,7 +152,7 @@
$sqlval['kiyaku_title'] = $arrData['kiyaku_title'];
$sqlval['kiyaku_text'] = $arrData['kiyaku_text'];
$sqlval['creator_id'] = $_SESSION['member_id'];
- $sqlval['rank'] = $objQuery->max("dtb_kiyaku", "rank") + 1;
+ $sqlval['rank'] = $objQuery->max("rank", "dtb_kiyaku") + 1;
$sqlval['update_date'] = "Now()";
$sqlval['create_date'] = "Now()";
// INSERTの実行
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -199,7 +199,7 @@
if($payment_id == "") {
// INSERTの実行
$sqlval['creator_id'] = $_SESSION['member_id'];
- $sqlval['rank'] = $objQuery->max("dtb_payment", "rank") + 1;
+ $sqlval['rank'] = $objQuery->max("rank", "dtb_payment") + 1;
$sqlval['create_date'] = 'Now()';
$sqlval['payment_id'] = $objQuery->nextVal('dtb_payment_payment_id');
$objQuery->insert("dtb_payment", $sqlval);
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -275,7 +275,7 @@
if($parent_category_id == 0) {
// ROOT階層で最大のランクを取得する。
$where = "parent_category_id = ?";
- $rank = $objQuery->max("dtb_category", "rank", $where, array($parent_category_id)) + 1;
+ $rank = $objQuery->max("rank", "dtb_category", $where, array($parent_category_id)) + 1;
} else {
// 親のランクを自分のランクとする。
$where = "category_id = ?";
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -152,7 +152,7 @@
// INSERTする値を作成する。
$sqlval['name'] = $arrData['name'];
$sqlval['creator_id'] = $_SESSION['member_id'];
- $sqlval['rank'] = $objQuery->max("dtb_class", "rank") + 1;
+ $sqlval['rank'] = $objQuery->max("rank", "dtb_class") + 1;
$sqlval['create_date'] = "now()";
$sqlval['update_date'] = "now()";
// INSERTの実行
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -179,7 +179,7 @@
$sqlval['name'] = $_POST['name'];
$sqlval['class_id'] = $_POST['class_id'];
$sqlval['creator_id'] = $_SESSION['member_id'];
- $sqlval['rank'] = $objQuery->max("dtb_classcategory", "rank", $where, array($_POST['class_id'])) + 1;
+ $sqlval['rank'] = $objQuery->max("rank", "dtb_classcategory", $where, array($_POST['class_id'])) + 1;
$sqlval['create_date'] = "now()";
$sqlval['update_date'] = "now()";
// INSERTの実行
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -149,7 +149,7 @@
$objQuery = new SC_Query();
// INSERTする値を作成する。
$sqlval['name'] = $arrData['name'];
- $sqlval['rank'] = $objQuery->max("dtb_maker", "rank") + 1;
+ $sqlval['rank'] = $objQuery->max("rank", "dtb_maker") + 1;
$sqlval['creator_id'] = $_SESSION['member_id'];
$sqlval['update_date'] = "Now()";
$sqlval['create_date'] = "Now()";
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -284,7 +284,7 @@
if ($sqlval['parent_category_id'] == 0) {
// ROOT階層で最大のランクを取得する。
$where = "parent_category_id = ?";
- $sqlval['rank'] = $objQuery->max("dtb_category", "rank", $where, array($sqlval['parent_category_id'])) + 1;
+ $sqlval['rank'] = $objQuery->max("rank", "dtb_category", $where, array($sqlval['parent_category_id'])) + 1;
} else {
// 親のランクを自分のランクとする。
$where = "category_id = ?";
変更: branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php 2010-12-16 14:21:59 UTC (rev 19731)
+++ branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php 2010-12-16 14:29:12 UTC (rev 19732)
@@ -366,7 +366,7 @@
$sqlVal['login_id'] = $arrMemberData['login_id'];
$sqlVal['password'] = sha1($arrMemberData['password'] . ':' . AUTH_MAGIC);
$sqlVal['authority'] = $arrMemberData['authority'];
- $sqlVal['rank'] = $objQuery->max('dtb_member', 'rank') + 1;
+ $sqlVal['rank'] = $objQuery->max('rank', 'dtb_member') + 1;
$sqlVal['work'] = '1'; // 稼働に設定
$sqlVal['del_flg'] = '0'; // 削除フラグをOFFに設定
$sqlVal['creator_id'] = $_SESSION['member_id'];
Svn-src-all メーリングリストの案内