改进复合主键查询

Author: liu21st

src/Entity.php

@@ -1055,7 +1055,14 @@ public function setKey($value)
     public function getKey()
     {
         $pk = $this->getPk();
-        return is_string($pk) ? $this->get($pk) : null;
+        if (is_string($pk)) {
+            return $this->get($pk);
+        }
+        
+        foreach ($pk as $name) {
+            $data[$name] = $this->get($name);
+        }
+        return $data;
     }
 
     /**

src/db/BaseQuery.php

@@ -1400,7 +1400,11 @@ public function delete($data = null): int
             if ($this->model && $this->model instanceof Model) {
                 $this->where($this->model->getWhere());
             } elseif (!empty($this->options['key'])) {
-                $this->where($this->pk, '=', $this->options['key']);
+                if (is_array($this->pk)) {
+                    $this->where($this->options['key']);
+                } else {
+                    $this->where($this->pk, '=', $this->options['key']);
+                }
             }
         }
 
@@ -1580,7 +1584,11 @@ public function parseUpdateData(array &$data): bool
         $isUpdate = false;
         // 如果存在主键数据 则自动作为更新条件
         if (!empty($this->options['key'])) {
-            $this->where($pk, '=', $this->options['key']);
+            if (is_array($pk)) {
+                $this->where($this->options['key']);
+            } else {
+                $this->where($pk, '=', $this->options['key']);
+            }
             $isUpdate = true;
         } elseif (is_string($pk) && isset($data[$pk])) {
             $this->where($pk, '=', $data[$pk]);

src/model/concern/Attribute.php

@@ -217,10 +217,10 @@ protected function isPk(string $key): bool
     public function setKey($value)
     {
         $pk = $this->getPk();
-        if (is_string($pk)) {
-            $this->key    = $value;
-            $this->exists = true;
-        }
+
+        $this->key    = $value;
+        $this->exists = true;
+
         return $this;
     }
 
@@ -239,8 +239,16 @@ public function getKey()
 
         if (is_string($pk) && array_key_exists($pk, $this->data)) {
             $this->key = $this->data[$pk];
-            return $this->data[$pk];
+        } elseif (is_array($pk)) {
+            $data = [];
+            foreach ($pk as $name) {
+                if (array_key_exists($name, $this->data)) {
+                    $data[$name] = $this->data[$name];
+                }
+            }
+            $this->key = $data;
         }
+        return $this->key ?? null;
     }
 
     /**