改进Query类的view和join方法

top-think · Oct 24, 2016 · 0674c77 · 0674c77
1 parent 4e8467b
commit 0674c77
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/library/think/db/Query.php b/library/think/db/Query.php
@@ -671,7 +671,7 @@ public function join($join, $condition = null, $type = 'INNER')
             } else {
                 $prefix = $this->prefix;
                 $join   = trim($join);
-                if ($prefix && false === strpos($join, '(') && false === strpos($join, '.') && 0 !== strpos($join, $prefix) && 0 !== strpos($join, '__')) {
+                if ($prefix && false === strpos($join, ' ') && false === strpos($join, '(') && false === strpos($join, '.') && 0 !== strpos($join, $prefix) && 0 !== strpos($join, '__')) {
                     $table = $this->getTable($join);
                     $table = [$table => $join];
                     $this->alias($table);
@@ -774,9 +774,11 @@ public function view($join, $field = true, $on = null, $type = 'INNER')
             if (is_array($join)) {
                 // 支持数据表别名
                 list($table, $alias) = each($join);
-            } elseif ($prefix && 0 !== strpos($join, $prefix) && 0 !== strpos($join, '__')) {
+            } elseif ($prefix && false === strpos($join, ' ') && 0 !== strpos($join, $prefix) && 0 !== strpos($join, '__')) {
                 $table = $this->getTable($join);
                 $alias = $join;
+            } elseif (strpos($join, ' ')) {
+                list($table, $alias) = explode(' ', $join);
             } else {
                 $alias = $join;
             }