Bladeren bron

Fixed:warning

Jinhui Zhu 4 jaren geleden
bovenliggende
commit
5458acb0c9
2 gewijzigde bestanden met toevoegingen van 7 en 5 verwijderingen
  1. 3 3
      src/Driver/Base.php
  2. 4 2
      src/Driver/traitDatabase.php

+ 3 - 3
src/Driver/Base.php

@@ -232,15 +232,15 @@ class Base
      *
      * @param $table
      * @param $dataArray
-     * @param array $keys
+     * @param array $where [key => $val]
      * @return string
      * @throws \Exception
      */
-    final function updateObject($table, $dataArray, $keys = array()){
+    final function updateObject($table, $dataArray, $where = array()){
         if(!$table) {
             throw new \Qii\Exceptions\InvalidParams(_i('%s is invalid', '表名'), __LINE__);
         }
-        return $this->set($dataArray)->where($keys)->update($table);
+        return $this->set($dataArray)->where($where)->update($table);
     }
 
     /**

+ 4 - 2
src/Driver/traitDatabase.php

@@ -102,8 +102,10 @@ trait traitDatabase
             }
             if (in_array($row['DATA_TYPE'], array('bigint', 'int', 'smallint', 'tinyint', 'integer'))) {
                 preg_match('/[\d]{1,}/', $row['COLUMN_TYPE'], $matches);
-                $data['rules']['int'][$row['COLUMN_NAME']] = $matches[0];
-                $data['rules']['number'][] = $row['COLUMN_NAME'];
+                if(!empty($matches)) {
+                    $data['rules']['int'][$row['COLUMN_NAME']] = $matches[0];
+                    $data['rules']['number'][] = $row['COLUMN_NAME'];
+                }
             }
             if (in_array($row['DATA_TYPE'], array('float', 'double', 'decimal'))) {
                 $data['rules']['float'][$row['COLUMN_NAME']] = $this->getValueFromBrackets($row['COLUMN_TYPE']);