Changeset 21677 for branches/version-2_12-dev

Timestamp:

2012/03/26 14:37:03 (12 years ago)

Author:

Seasoft

Message:

#1719 (SC_Query#insert SQL文のみの登録ができない)
#1613 (typo修正・ソース整形・ソースコメントの改善)

File:

• branches/version-2_12-dev/data/class/SC_Query.php (modified) (10 diffs)

branches/version-2_12-dev/data/class/SC_Query.php

@@ -470 +470 @@
      *
      * @param string $table テーブル名
-     * @param array $sqlval array('カラム名' => '値', ...)の連想配列
+     * @param array $arrVal array('カラム名' => '値', ...)の連想配列
      * @param array $arrSql array('カラム名' => 'SQL文', ...)の連想配列
      * @param array $arrSqlVal SQL文の中で使用するプレースホルダ配列
      * @param string $from FROM 句・WHERE 句
      * @param string $arrFromVal FROM 句・WHERE 句で使用するプレースホルダ配列
-     * @return integer|DB_Error 挿入件数またはDB_Error
-     */
-    function insert($table, $sqlval, $arrSql = array(), $arrSqlVal = array(), $from = '', $arrFromVal = array()) {
+     * @return integer|DB_Error|boolean 挿入件数またはエラー(DB_Error, false)
+     */
+    function insert($table, $arrVal, $arrSql = array(), $arrSqlVal = array(), $from = '', $arrFromVal = array()) {
         $strcol = '';
         $strval = '';
         $find = false;
-        $arrVal = array();
-
-        if(count($sqlval) <= 0) return false;
-        foreach ($sqlval as $key => $val) {
+        $arrValForQuery = array();
+
+        foreach ($arrVal as $key => $val) {
             $strcol .= $key . ',';
             if (strcasecmp('Now()', $val) === 0) {
@@ -492 +491 @@
             } else {
                 $strval .= '?,';
-                $arrVal[] = $val;
+                $arrValForQuery[] = $val;
             }
             $find = true;
@@ -500 +499 @@
             $strcol .= $key . ',';
             $strval .= $val . ',';
-        }
-
-        $arrVal = array_merge($arrVal, $arrSqlVal);
+            $find = true;
+        }
+
+        $arrValForQuery = array_merge($arrValForQuery, $arrSqlVal);
 
         if (!$find) {
@@ -514 +514 @@
         if (strlen($from) >= 1) {
             $sqlin .= ' ' . $from;
-            $arrVal = array_merge($arrVal, $arrFromVal);
+            $arrValForQuery = array_merge($arrValForQuery, $arrFromVal);
         }
 
         // INSERT文の実行
-        $ret = $this->query($sqlin, $arrVal, false, null, MDB2_PREPARE_MANIP);
+        $ret = $this->query($sqlin, $arrValForQuery, false, null, MDB2_PREPARE_MANIP);
 
         return $ret;
@@ -527 +527 @@
      *
      * @param string $table テーブル名
-     * @param array $sqlval array('カラム名' => '値', ...)の連想配列
+     * @param array $arrVal array('カラム名' => '値', ...)の連想配列
      * @param string $where WHERE句
      * @param array $arrWhereVal WHERE句用のプレースホルダ配列 (従来は追加カラム用も兼ねていた)
@@ -534 +534 @@
      * @return
      */
-    function update($table, $sqlval, $where = '', $arrWhereVal = array(), $arrRawSql = array(), $arrRawSqlVal = array()) {
+    function update($table, $arrVal, $where = '', $arrWhereVal = array(), $arrRawSql = array(), $arrRawSqlVal = array()) {
         $arrCol = array();
-        $arrVal = array();
+        $arrValForQuery = array();
         $find = false;
 
-        foreach ($sqlval as $key => $val) {
+        foreach ($arrVal as $key => $val) {
             if (strcasecmp('Now()', $val) === 0) {
                 $arrCol[] = $key . '= Now()';
@@ -546 +546 @@
             } else {
                 $arrCol[] = $key . '= ?';
-                $arrVal[] = $val;
+                $arrValForQuery[] = $val;
             }
             $find = true;
@@ -557 +557 @@
         }
 
-        $arrVal = array_merge($arrVal, $arrRawSqlVal);
+        $arrValForQuery = array_merge($arrValForQuery, $arrRawSqlVal);
 
         if (empty($arrCol)) {
@@ -568 +568 @@
         if (is_array($arrWhereVal)) { // 旧版との互換用
             // プレースホルダー用に配列を追加
-            $arrVal = array_merge($arrVal, $arrWhereVal);
+            $arrValForQuery = array_merge($arrValForQuery, $arrWhereVal);
         }
 
@@ -577 +577 @@
 
         // UPDATE文の実行
-        return $this->query($sqlup, $arrVal, false, null, MDB2_PREPARE_MANIP);
+        return $this->query($sqlup, $arrValForQuery, false, null, MDB2_PREPARE_MANIP);
     }