内核更新

core/library/think/db/Builder.php

@@ -24,9 +24,6 @@ abstract class Builder
     // 查询对象实例
     protected $query;
 
-    // 查询参数
-    protected $options = [];
-
     // 数据库表达式
     protected $exp = ['eq' => '=', 'neq' => '<>', 'gt' => '>', 'egt' => '>=', 'lt' => '<', 'elt' => '<=', 'notlike' => 'NOT LIKE', 'like' => 'LIKE', 'in' => 'IN', 'exp' => 'EXP', 'notin' => 'NOT IN', 'not in' => 'NOT IN', 'between' => 'BETWEEN', 'not between' => 'NOT BETWEEN', 'notbetween' => 'NOT BETWEEN', 'exists' => 'EXISTS', 'notexists' => 'NOT EXISTS', 'not exists' => 'NOT EXISTS', 'null' => 'NULL', 'notnull' => 'NOT NULL', 'not null' => 'NOT NULL', '> time' => '> TIME', '< time' => '< TIME', '>= time' => '>= TIME', '<= time' => '<= TIME', 'between time' => 'BETWEEN TIME', 'not between time' => 'NOT BETWEEN TIME', 'notbetween time' => 'NOT BETWEEN TIME'];
 
@@ -606,7 +603,7 @@ abstract class Builder
     {
         // 获取合法的字段
         if ('*' == $options['field']) {
-            $fields = $this->query->getFieldsType($options);
+            $fields = array_keys($this->query->getFieldsType($options));
         } else {
             $fields = $options['field'];
         }
@@ -687,7 +684,7 @@ abstract class Builder
                 $this->parseWhere($options['where'], $options),
                 $this->parseOrder($options['order']),
                 $this->parseLimit($options['limit']),
-                $this->parseLimit($options['lock']),
+                $this->parseLock($options['lock']),
                 $this->parseComment($options['comment']),
             ], $this->updateSql);
 
@@ -711,7 +708,7 @@ abstract class Builder
                 $this->parseWhere($options['where'], $options),
                 $this->parseOrder($options['order']),
                 $this->parseLimit($options['limit']),
-                $this->parseLimit($options['lock']),
+                $this->parseLock($options['lock']),
                 $this->parseComment($options['comment']),
             ], $this->deleteSql);