Update ActiveRecord.php

evas-php · Aug 18, 2021 · 0b6efc3 · 0b6efc3
1 parent e6310db
commit 0b6efc3
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/ActiveRecord.php b/src/ActiveRecord.php
@@ -184,7 +184,11 @@ public function getUpdatedProperties(): array
             return $props;
         } else {
             $state = static::getDb()->identityMapGetState($this, $pk);
-            return array_diff($props, $state ?? []);
+            // return array_diff($props, $state ?? []);
+            return array_merge(
+                array_fill_keys(array_keys(array_diff($state ?? [], $props)), null),
+                array_diff($props, $state ?? [])
+            );
         }
     }
 
@@ -196,8 +200,7 @@ public function getUpdatedProperties(): array
      */
     public function save()
     {
-        $props = $this->getUpdatedProperties();
-        if (empty($props)) {
+        if (empty($this->getUpdatedProperties())) {
             $this->hook('nothingSave');
             return $this;
         }
@@ -206,15 +209,15 @@ public function save()
         $pk = static::primaryKey();
         if (empty($this->$pk)) {
             $this->hook('beforeInsert');
-            static::getDb(true)->insert(static::tableName(), $props);
+            static::getDb(true)->insert(static::tableName(), $this->getUpdatedProperties());
             $this->$pk = static::lastInsertId();
             if (empty($this->$pk)) {
                 throw new LastInsertIdUndefinedException();
             }
             $this->hook('afterInsert');
         } else {
             $this->hook('beforeUpdate');
-            static::getDb(true)->update(static::tableName(), $props)
+            static::getDb(true)->update(static::tableName(), $this->getUpdatedProperties())
                 ->where("$pk = ?", [$this->$pk])->one();
             $this->hook('afterUpdate');
         }