内核更新

2017-02-14 09:41:34 +08:00
parent 689376a5d9
commit b355535009
43 changed files with 330 additions and 100 deletions
--- a/core/library/think/db/builder/Mysql.php
+++ b/core/library/think/db/builder/Mysql.php
@@ -38,6 +38,8 @@ class Mysql extends Builder
            list($table, $key) = explode('.', $key, 2);
            if (isset($options['alias'][$table])) {
                $table = $options['alias'][$table];
+            } elseif ('__TABLE__' == $table) {
+                $table = $this->query->getTable();
            }
        }
        if (!preg_match('/[,\'\"\*\(\)`.\s]/', $key)) {