Merge branch 'master' into master

src/ZM/DB/DB.php

@@ -31,7 +31,6 @@ class DB
 
     /**
      * @param $table_name
-     * @param bool $enable_cache
      * @return Table
      * @throws DbException
      */
@@ -39,7 +38,7 @@ class DB
         if (Table::getTableInstance($table_name) === null) {
             if (in_array($table_name, self::$table_list))
                 return new Table($table_name);
-            elseif(SqlPoolStorage::$sql_pool !== null){
+            elseif (SqlPoolStorage::$sql_pool !== null) {
                 throw new DbException("Table " . $table_name . " not exist in database.");
             } else {
                 throw new DbException("Database connection not exist or connect failed. Please check sql configuration");
@@ -85,7 +84,8 @@ class DB
      * @throws DbException
      */
     public static function rawQuery(string $line, $params = [], $fetch_mode = ZM_DEFAULT_FETCH_MODE) {
-        Console::debug("MySQL: ".$line." | ". implode(", ", array($params)));
+        if (!is_array($params)) $params = [$params];
+        Console::debug("MySQL: " . $line . " | " . implode(", ", $params));
         try {
             $conn = SqlPoolStorage::$sql_pool->get();
             if ($conn === false) {
@@ -95,6 +95,7 @@ class DB
             $ps = $conn->prepare($line);
             if ($ps === false) {
                 SqlPoolStorage::$sql_pool->put(null);
+                /** @noinspection PhpUndefinedFieldInspection */
                 throw new DbException("SQL语句查询错误，" . $line . "，错误信息：" . $conn->error);
             } else {
                 if (!($ps instanceof PDOStatement) && !($ps instanceof PDOStatementProxy)) {
@@ -115,7 +116,7 @@ class DB
                 return $ps->fetchAll($fetch_mode);
             }
         } catch (DbException $e) {
-            if(mb_strpos($e->getMessage(), "has gone away") !== false) {
+            if (mb_strpos($e->getMessage(), "has gone away") !== false) {
                 zm_sleep(0.2);
                 Console::warning("Gone away of MySQL! retrying!");
                 return self::rawQuery($line, $params);
@@ -123,7 +124,7 @@ class DB
             Console::warning($e->getMessage());
             throw $e;
         } catch (PDOException $e) {
-            if(mb_strpos($e->getMessage(), "has gone away") !== false) {
+            if (mb_strpos($e->getMessage(), "has gone away") !== false) {
                 zm_sleep(0.2);
                 Console::warning("Gone away of MySQL! retrying!");
                 return self::rawQuery($line, $params);

src/ZM/DB/InsertBody.php

@@ -28,6 +28,6 @@ class InsertBody
      * @throws DbException
      */
     public function save() {
-        DB::rawQuery('INSERT INTO ' . $this->table->getTableName() . ' VALUES ('.implode(',', array_fill(0, count($this->row), '?')).')', $this->row);
+        DB::rawQuery('INSERT INTO ' . $this->table->getTableName() . ' VALUES (' . implode(',', array_fill(0, count($this->row), '?')) . ')', $this->row);
     }
 }

src/ZM/DB/Table.php

@@ -4,7 +4,6 @@
 namespace ZM\DB;
 
 
-
 class Table
 {
     private $table_name;
@@ -28,7 +27,7 @@ class Table
         return new SelectBody($this, $what == [] ? ["*"] : $what);
     }
 
-    public function where($column, $operation_or_value, $value = null){
+    public function where($column, $operation_or_value, $value = null) {
         return (new SelectBody($this, ["*"]))->where($column, $operation_or_value, $value);
     }
 
@@ -47,7 +46,7 @@ class Table
         return new DeleteBody($this);
     }
 
-    public function statement($line){
+    public function statement() {
         $this->cache = [];
         //TODO: 无返回的statement语句
     }

src/ZM/DB/UpdateBody.php

@@ -18,6 +18,7 @@ class UpdateBody
      * @var array
      */
     private $set_value;
+
     /**
      * UpdateBody constructor.
      * @param Table $table
@@ -31,19 +32,19 @@ class UpdateBody
     /**
      * @throws DbException
      */
-    public function save(){
+    public function save() {
         $arr = [];
         $msg = [];
-        foreach($this->set_value as $k => $v) {
-            $msg []= $k .' = ?';
-            $arr[]=$v;
+        foreach ($this->set_value as $k => $v) {
+            $msg [] = $k . ' = ?';
+            $arr[] = $v;
         }
-        if(($msg ?? []) == []) throw new DbException('update value sets can not be empty!');
-        $line = 'UPDATE '.$this->table->getTableName().' SET '.implode(', ', $msg);
-        if($this->where_thing != []) {
+        if (($msg ?? []) == []) throw new DbException('update value sets can not be empty!');
+        $line = 'UPDATE ' . $this->table->getTableName() . ' SET ' . implode(', ', $msg);
+        if ($this->where_thing != []) {
             list($sql, $param) = $this->getWhereSQL();
             $arr = array_merge($arr, $param);
-            $line .= ' WHERE '.$sql;
+            $line .= ' WHERE ' . $sql;
         }
         return DB::rawQuery($line, $arr);
     }

src/ZM/DB/WhereBody.php

@@ -15,17 +15,17 @@ trait WhereBody
         return $this;
     }
 
-    protected function getWhereSQL(){
+    protected function getWhereSQL() {
         $param = [];
         $msg = '';
-        foreach($this->where_thing as $k => $v) {
-            foreach($v as $ks => $vs) {
-                if($param != []) {
-                    $msg .= ' AND '.$ks ." $k ?";
+        foreach ($this->where_thing as $k => $v) {
+            foreach ($v as $ks => $vs) {
+                if ($param != []) {
+                    $msg .= ' AND ' . $ks . " $k ?";
                 } else {
                     $msg .= "$ks $k ?";
                 }
-                $param []=$vs;
+                $param [] = $vs;
             }
         }
         if ($msg == '') $msg = 1;