内核更新

core/library/think/db/Query.php

@@ -16,8 +16,6 @@ use think\Cache;
 use think\Collection;
 use think\Config;
 use think\Db;
-use think\db\Builder;
-use think\db\Connection;
 use think\db\exception\BindParamException;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\ModelNotFoundException;
@@ -27,8 +25,7 @@ use think\exception\PDOException;
 use think\Loader;
 use think\Model;
 use think\model\Relation;
-use think\model\relation\BelongsTo;
-use think\model\relation\HasOne;
+use think\model\relation\OneToOne;
 use think\Paginator;
 
 class Query
@@ -1182,7 +1179,14 @@ class Query
                     }
                 }
             }
-            $this->options['order'] = $field;
+            if (!isset($this->options['order'])) {
+                $this->options['order'] = [];
+            }
+            if (is_array($field)) {
+                $this->options['order'] = array_merge($this->options['order'], $field);
+            } else {
+                $this->options['order'][] = $field;
+            }
         }
         return $this;
     }
@@ -1552,7 +1556,7 @@ class Query
      */
     protected function getFieldBindType($type)
     {
-        if (preg_match('/(int|double|float|decimal|real|numeric|serial)/is', $type)) {
+        if (preg_match('/(int|double|float|decimal|real|numeric|serial|bit)/is', $type)) {
             $bind = PDO::PARAM_INT;
         } elseif (preg_match('/bool/is', $type)) {
             $bind = PDO::PARAM_BOOL;
@@ -1653,8 +1657,9 @@ class Query
             }
 
             /** @var Relation $model */
-            $model = $class->$relation();
-            if ($model instanceof HasOne || $model instanceof BelongsTo) {
+            $relation = Loader::parseName($relation, 1, false);
+            $model    = $class->$relation();
+            if ($model instanceof OneToOne && 0 == $model->getEagerlyType()) {
                 $model->eagerly($this, $relation, $subRelation, $closure, $first);
                 $first = false;
             } elseif ($closure) {
@@ -1666,6 +1671,36 @@ class Query
         return $this;
     }
 
+    /**
+     * 关联统计
+     * @access public
+     * @param string|array    $relation 关联方法名
+     * @param bool            $subQuery 是否使用子查询
+     * @return $this
+     */
+    public function withCount($relation, $subQuery = true)
+    {
+        if (!$subQuery) {
+            $this->options['with_count'] = $relation;
+        } else {
+            $relations = is_string($relation) ? explode(',', $relation) : $relation;
+            if (!isset($this->options['field'])) {
+                $this->field('*');
+            }
+            foreach ($relations as $key => $relation) {
+                $closure = false;
+                if ($relation instanceof \Closure) {
+                    $closure  = $relation;
+                    $relation = $key;
+                }
+                $relation = Loader::parseName($relation, 1, false);
+                $count    = '(' . (new $this->model)->$relation()->getRelationCountQuery($closure) . ')';
+                $this->field([$count => Loader::parseName($relation) . '_count']);
+            }
+        }
+        return $this;
+    }
+
     /**
      * 关联预加载中 获取关联指定字段值
      * example:
@@ -1997,6 +2032,10 @@ class Query
                     if (!empty($options['relation'])) {
                         $result->relationQuery($options['relation']);
                     }
+                    // 关联统计
+                    if (!empty($options['with_count'])) {
+                        $result->relationCount($result, $options['with_count']);
+                    }
                     $resultSet[$key] = $result;
                 }
                 if (!empty($options['with'])) {
@@ -2095,10 +2134,14 @@ class Query
                 if (!empty($options['relation'])) {
                     $data->relationQuery($options['relation']);
                 }
+                // 预载入查询
                 if (!empty($options['with'])) {
-                    // 预载入
                     $data->eagerlyResult($data, $options['with'], is_object($result) ? get_class($result) : '');
                 }
+                // 关联统计
+                if (!empty($options['with_count'])) {
+                    $data->relationCount($data, $options['with_count']);
+                }
             }
         } elseif (!empty($options['fail'])) {
             $this->throwNotFound($options);