table name

Author: Ethan

src/Builder.php

@@ -24,6 +24,7 @@ class Builder
     private $db;
 
     protected $table;
+    protected $tableAs;
     protected $field;
     protected $orderBy;
     protected $limit;
@@ -88,14 +89,23 @@ public function getConnection()
      * @param string $tableName 支持 as 例如 user as u
      * @return static
      */
-    public function table($tableName = '')
+    public function table($tableName = '', $asName = null)
     {
-        if (!empty($tableName)) {
-            $tableName = self::addPrefix($tableName);
+        if ($asName === null) {
+            // 兼容as部份写在tableName中
+            // user as u
+            // {{user}} as u
+            // {{%user}} as u
+            // user u
+            if (preg_match('/^(.+?)\s+(as\s+)?(\w+)$/i', $tableName, $res)) {
+                $tableName = $res[1];
+                $asName = $res[3];
+            }
         }
 
         $builder = clone $this;
-        $builder->table = $tableName;
+        $builder->table = self::addPrefix($tableName);
+        $builder->tableAs = $this->addTableQuote($asName);
         return $builder;
     }
 
@@ -108,24 +118,31 @@ public function table($tableName = '')
      */
     public function addPrefix($tableName)
     {
-        // user as u
-        // {{user}} as u
-        // {{%user}} as u
-        // user u
-        if (preg_match('/^(.+?)\s+(as\s+)?(\w+)$/i', $tableName, $res)) {
-            $tableName = $res[1];
-            $asName = ' AS ' . $res[3];
-        } else {
-            $asName = '';
+        if (empty($tableName)) {
+            return $tableName;
+        }
+        if (strpos($tableName, '{{') === false) {
+            return $this->addTableQuote('%' . $tableName);
+        }
+
+        return $tableName;
+    }
+
+    private function addTableQuote($tableName)
+    {
+        if (empty($tableName)) {
+            return $tableName;
         }
 
         if (strpos($tableName, '{{') === false) {
-            $tableName = '{{%' . $tableName . '}}';
+            return '{{' . $tableName . '}}';
         }
+
         if (!preg_match('/^\{\{%?[\w\-\.\$]+%?\}\}$/', $tableName)) {
-            throw new Exception('表名含有不被允许的字符');
+            throw new Exception('表名含有不被允许的字符: ' . $tableName);
         }
-        return $tableName . $asName;
+
+        return $tableName;
     }
 
     /**
@@ -206,7 +223,7 @@ public function findAll($condition = '', $params = array())
     {
         $this->where($condition, $params);
 
-        $sql = 'SELECT ' . static::getFieldString() . ' FROM ' . $this->table
+        $sql = 'SELECT ' . static::getFieldString() . ' FROM ' . $this->table . $this->getTableAs()
             . $this->getJoinString()
             . $this->getWhereString()
             . $this->getGroupByString()
@@ -218,6 +235,15 @@ public function findAll($condition = '', $params = array())
         return static::findAllBySql($sql, $this->params);
     }
 
+    private function getTableAs()
+    {
+        if (empty($this->tableAs)) {
+            return '';
+        }
+
+        return ' AS ' . $this->tableAs;
+    }
+
     /**
      * 拆分查询，用于处理非常多的查询结果,而不会消耗大量内存，建议加上排序字段
      *
@@ -564,7 +590,7 @@ public function __call($method, $arguments)
 
         $method = strtoupper($method);
 
-        $sql = 'SELECT ' . $method . '(' . $field . ') FROM ' . $this->table
+        $sql = 'SELECT ' . $method . '(' . $field . ') FROM ' . $this->table . $this->getTableAs()
             . $this->getJoinString()
             . $this->getWhereString();
 
@@ -894,7 +920,7 @@ public function transaction(Closure $callback)
      */
     public function toSql()
     {
-        $sql = 'SELECT ' . static::getFieldString() . ' FROM ' . $this->table
+        $sql = 'SELECT ' . static::getFieldString() . ' FROM ' . $this->table . $this->getTableAs()
             . $this->getJoinString()
             . $this->getWhereString()
             . $this->getGroupByString()
@@ -1211,6 +1237,7 @@ public function afterFind($callback)
     protected function reset()
     {
         $this->table = null;
+        $this->tableAs = null;
         $this->fetchClass = null;
         $this->orderBy = null;
         $this->field = null;

src/ModelTrait.php

@@ -23,8 +23,17 @@
  * @method static DataProvider paginate($pageSize = null)
  * @method static int count($field = '*')
  * @method static Builder useWritePdo()
+ * @method static Builder limit($limit)
+ * @method static Builder offset($offset)
  * @method static Builder orderBy($columns)
+ * @method static Builder having($having, array $params = array())
+ * @method static Builder field($field)
+ * @method static Builder lockForUpdate()
+ * @method static Builder lockInShareMode()
+ * @method static Builder join($table, $on)
+ * @method static Builder leftJoin($table, $on)
  * @method static boolean chunk($num, $callback)
+ * @method static boolean chunkById($num, callable $callback, $column = 'id')
  *
  * @method static bool insert(array $data);
  * @method static int insertGetId(array $data);
@@ -43,7 +52,9 @@ public static function tableName()
 
     public static function __callStatic($name, $arguments)
     {
-        return call_user_func_array([DB::table(static::tableName())->asEntity(static::className()), $name], $arguments);
+        return call_user_func_array(
+            [DB::table(static::tableName(), self::getTableName(get_called_class()))->asEntity(static::className()), $name],
+            $arguments);
     }
 
     public function loadDefaultValues()
@@ -156,7 +167,7 @@ public static function with($relations)
     {
         $relations = is_string($relations) ? func_get_args() : $relations;
 
-        return DB::table(static::tableName())->asEntity(static::className())->afterFind(function ($models) use ($relations) {
+        return DB::table(static::tableName(), self::getTableName(get_called_class()))->asEntity(static::className())->afterFind(function ($models) use ($relations) {
             RelationBase::appendRelationData($models, $relations);
         });
     }