改进缓存标识自动生成

Author: liu21st

src/db/Query.php

@@ -13,7 +13,9 @@
 
 namespace think\db;
 
+use Closure;
 use PDOStatement;
+use ReflectionFunction;
 use think\db\exception\DbException as Exception;
 
 /**
@@ -518,11 +520,29 @@ protected function getLazyFieldCacheKey(string $field, $id = null): string
     public function getQueryGuid($data = null): string
     {
         if (null === $data) {
-            $data = $this->options;
+            $data          = $this->options;
+            $data['table'] = $this->getConfig('database') . $this->getTable();
             unset($data['scope'], $data['default_model']);
+            foreach (['AND', 'OR', 'XOR'] as $logic) {
+                if (isset($data['where'][$logic])) {
+                    foreach ($data['where'][$logic] as $key => $val) {
+                        if ($val instanceof Closure) {
+                            $reflection = new ReflectionFunction($val);
+                            $properties = $reflection->getStaticVariables();
+                            if (empty($properties)) {
+                                $name = $reflection->getName() . $reflection->getStartLine() . '-' . $reflection->getEndLine();
+                            } else {
+                                $name = var_export($properties, true);
+                            }
+                            $data['Closure'][] = $name;
+                            unset($data['where'][$logic][$key]);
+                        }
+                    }
+                }
+            }
         }
 
-        return md5($this->getConfig('database') . serialize(var_export($data, true)) . serialize($this->getBind(false)));
+        return md5(serialize(var_export($data, true)) . serialize($this->getBind(false)));
     }
 
     /**

src/db/concern/WhereQuery.php

@@ -47,15 +47,16 @@ public function where($field, $op = null, $condition = null)
             $this->options['key'] = is_null($condition) ? $op : $condition;
         }
 
+        $logic = 'AND';
         $param = func_get_args();
         array_shift($param);
 
         if (is_array($field) && !empty($field) && array_is_list($field)) {
-            return $this->where(function ($query) use ($param, $condition, $op, $field) {
-                return $query->parseWhereExp('AND', $field, $op, $condition, $param);
+            return $this->where(function ($query) use ($param, $condition, $op, $field, $logic) {
+                return $query->parseWhereExp($logic, $field, $op, $condition, $param);
             });
         }
-        return $this->parseWhereExp('AND', $field, $op, $condition, $param);
+        return $this->parseWhereExp($logic, $field, $op, $condition, $param);
     }
 
     /**
@@ -95,16 +96,17 @@ protected function parseQueryWhere(BaseQuery $query): void
      */
     public function whereOr($field, $op = null, $condition = null)
     {
+        $logic = 'OR';
         $param = func_get_args();
         array_shift($param);
 
         if (is_array($field) && !empty($field) && array_is_list($field)) {
-            return $this->where(function ($query) use ($param, $condition, $op, $field) {
-                return $query->parseWhereExp('OR', $field, $op, $condition, $param);
+            return $this->where(function ($query) use ($param, $condition, $op, $field, $logic) {
+                return $query->parseWhereExp($logic, $field, $op, $condition, $param);
             });
         }
 
-        return $this->parseWhereExp('OR', $field, $op, $condition, $param);
+        return $this->parseWhereExp($logic, $field, $op, $condition, $param);
     }
 
     /**
@@ -118,15 +120,16 @@ public function whereOr($field, $op = null, $condition = null)
      */
     public function whereXor($field, $op = null, $condition = null)
     {
+        $logic = 'XOR';
         $param = func_get_args();
         array_shift($param);
 
         if (is_array($field) && !empty($field) && array_is_list($field)) {
-            return $this->where(function ($query) use ($param, $condition, $op, $field) {
-                return $query->parseWhereExp('XOR', $field, $op, $condition, $param);
+            return $this->where(function ($query) use ($param, $condition, $op, $field, $logic) {
+                return $query->parseWhereExp($logic, $field, $op, $condition, $param);
             });
         }
-        return $this->parseWhereExp('XOR', $field, $op, $condition, $param);
+        return $this->parseWhereExp($logic, $field, $op, $condition, $param);
     }
 
     /**