内核更新

2017-03-16 12:03:34 +08:00
parent b355535009
commit a4d58f9f09
28 changed files with 438 additions and 217 deletions
--- a/core/library/think/db/builder/Pgsql.php
+++ b/core/library/think/db/builder/Pgsql.php
@@ -55,10 +55,11 @@ class Pgsql extends Builder
            $key                = $field . '->>\'' . $name . '\'';
        } elseif (strpos($key, '.')) {
            list($table, $key) = explode('.', $key, 2);
+            if ('__TABLE__' == $table) {
+                $table = $this->query->getTable();
+            }
            if (isset($options['alias'][$table])) {
                $table = $options['alias'][$table];
-            } elseif ('__TABLE__' == $table) {
-                $table = $this->query->getTable();
            }
        }
        if (isset($table)) {