改进join方法的table参数解析

top-think · Nov 23, 2018 · d135886 · d135886
1 parent a26dd44
commit d135886
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/think/db/Query.php b/src/think/db/Query.php
@@ -841,14 +841,24 @@ protected function getJoinTable($join, &$alias = null)
         if (false !== strpos($join, '(')) {
             // 使用子查询
             $table = $join;
-        } elseif (strpos($join, ' ')) {
-            // 使用别名
-            list($table, $alias) = explode(' ', $join);
         } else {
-            $table = $join;
+            // 使用别名
+            if (strpos($join, ' ')) {
+                // 使用别名
+                list($table, $alias) = explode(' ', $join);
+            } else {
+                $table = $join;
+                if (false === strpos($join, '.')) {
+                    $alias = $join;
+                }
+            }
+
+            if ($this->prefix && false === strpos($table, '.') && 0 !== strpos($table, $this->prefix)) {
+                $table = $this->getTable($table);
+            }
         }
 
-        if (isset($alias) && $table != $alias) {
+        if (!empty($alias) && $table != $alias) {
             $table = [$table => $alias];
         }