改进查询缓存标识自动获取

Author: liu21st

src/db/BaseQuery.php

@@ -1006,7 +1006,7 @@ public function cache($key = true, $expire = null, $tag = null)
             $key    = true;
         }
 
-        $this->options['cache'] = [$key, $expire, $tag ?: $this->getTable()];
+        $this->options['cache'] = [$key, $expire, $tag ?: var_export($this->getTable(), true)];
         return $this;
     }
 

src/db/Connection.php

@@ -320,7 +320,7 @@ protected function cacheData(CacheItem $cacheItem)
     protected function getCacheKey(BaseQuery $query, string $method = ''): string
     {
         if (!empty($query->getOptions('key')) && empty($method)) {
-            $key = 'think_' . $this->getConfig('database') . '.' . $query->getTable() . '|' . $query->getOptions('key');
+            $key = 'think_' . $this->getConfig('database') . '.' . var_export($query->getTable(), true) . '|' . $query->getOptions('key');
         } else {
             $key = $query->getQueryGuid();
         }

src/db/Query.php

@@ -521,7 +521,7 @@ public function getQueryGuid($data = null): string
     {
         if (null === $data) {
             $data          = $this->options;
-            $data['table'] = $this->getConfig('database') . $this->getTable();
+            $data['table'] = $this->getConfig('database') . var_export($this->getTable(), true);
             unset($data['scope'], $data['default_model']);
             foreach (['AND', 'OR', 'XOR'] as $logic) {
                 if (isset($data['where'][$logic])) {