优化

Author: onanying

README.md

@@ -4,11 +4,13 @@
 
 ## 使用方法
 
-ThinkPHP 5
+ThinkPHP 5 的范例，支持任何框架，只需修改 `query` 参数的闭包代码。
 
 ```php
 $shardingQuery = new ShardingQuery([
-    'callback' => 'think\Db::query',
+    'query'    => function ($sql) {
+        return \think\Db::query($sql);
+    },
     'table'    => [
         'order',
         'order_201805',
@@ -23,7 +25,22 @@ $shardingQuery = new ShardingQuery([
     'offset'   => 0,
     'limit'    => 10,
 ]);
-$res           = $shardingQuery->select();
+// 查询结果
+$result        = $shardingQuery->select();
+// 总行数
 $count         = $shardingQuery->count();
+// 追踪数据，用于调试
 $trace         = $shardingQuery->trace();
 ```
+
+全部参数：
+
+- `query`：执行 sql 返回结果的闭包，接收一个 $sql 参数，返回查询结果。
+- `table`：要查询的多个同构表的清单，数组类型。
+- `field`：select 选择的列名，字符串类型。
+- `innerJoin`：join信息，数组类型。
+- `leftJoin`：join信息，数组类型。
+- `where`：查询条件，字符串类型。
+- `order`：排序，字符串类型。
+- `offset`：偏移数，整数类型。
+- `limit`：限制数，整数类型。

ShardingQuery.php

@@ -8,11 +8,10 @@ class ShardingQuery
 {
 
     /**
-     * 数据库查询的回调
-     * 回调必须返回数组类型
-     * @var callable
+     * 查询闭包
+     * @var \Closure
      */
-    public $callback;
+    public $query;
 
     /**
      * 数据表列表
@@ -28,29 +27,17 @@ class ShardingQuery
     public $field;
 
     /**
-     * join
+     * innerJoin
      * @var array
      */
     public $innerJoin;
 
     /**
-     * join
+     * leftJoin
      * @var array
      */
     public $leftJoin;
 
-    /**
-     * join
-     * @var array
-     */
-    public $rightJoin;
-
-    /**
-     * join
-     * @var array
-     */
-    public $fullJoin;
-
     /**
      * 条件
      * @var string
@@ -101,9 +88,9 @@ public function __construct(array $config)
     {
         foreach ($config as $key => $value) {
             switch ($key) {
-                case 'callback':
-                    if (!is_callable($value)) {
-                        throw new \RuntimeException("'callback' is not a callable type.");
+                case 'query':
+                    if (!($value instanceof \Closure)) {
+                        throw new \RuntimeException("'query' is not a closure type.");
                     }
                     $this->$key = $value;
                     break;
@@ -131,18 +118,6 @@ public function __construct(array $config)
                     }
                     $this->$key = $value;
                     break;
-                case 'rightJoin':
-                    if (!is_array($value)) {
-                        throw new \RuntimeException("'rightJoin' is not a array type.");
-                    }
-                    $this->$key = $value;
-                    break;
-                case 'fullJoin':
-                    if (!is_array($value)) {
-                        throw new \RuntimeException("'fullJoin' is not a array type.");
-                    }
-                    $this->$key = $value;
-                    break;
                 case 'where':
                     if (!is_string($value)) {
                         throw new \RuntimeException("'where' is not a string type.");
@@ -187,7 +162,7 @@ public function select()
             $tmpSql = str_replace(static::$tableSymbol, $tableName, $sql);
             $tmpSql = "{$tmpSql} LIMIT {$item['limit']} OFFSET {$item['offset']}";
             $this->log(['sql' => $tmpSql]);
-            $result = call_user_func($this->callback, $tmpSql);
+            $result = call_user_func($this->query, $tmpSql);
             $this->log(['resultCount' => count($result)]);
             $data = array_merge($data, $result);
         }
@@ -210,8 +185,8 @@ protected function stats($table)
             }
             $sql = str_replace(static::$tableSymbol, $tableName, $sql);
             $this->log(['sql' => $sql]);
-            $result = call_user_func($this->callback, $sql);
-            $first  = array_pop($result);
+            $result = call_user_func($this->query, $sql);
+            $first  = (array)array_pop($result);
             $count  = array_pop($first);
             $this->log(['result' => $count]);
             $start             = $end;
@@ -285,16 +260,6 @@ protected function sql()
                 $sql .= " LEFT JOIN {$item}";
             }
         }
-        if (!empty($this->rightJoin)) {
-            foreach ($this->rightJoin as $item) {
-                $sql .= " RIGHT JOIN {$item}";
-            }
-        }
-        if (!empty($this->fullJoin)) {
-            foreach ($this->fullJoin as $item) {
-                $sql .= " FULL JOIN {$item}";
-            }
-        }
         if (!empty($this->where)) {
             $sql .= " WHERE {$this->where}";
         }
@@ -317,7 +282,7 @@ public function count()
     }
 
     /**
-     * 记录日志
+     * 记录追踪数据
      */
     protected function log($message)
     {