Update ActiveRecord.php

evas-php · Aug 18, 2021 · 0d45638 · 0d45638
1 parent 0b6efc3
commit 0d45638
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/ActiveRecord.php b/src/ActiveRecord.php
@@ -172,6 +172,21 @@ public function getRowProperties(): array
         return $props;
     }
 
+    /**
+     * Получение состояния сохраняемых полей.
+     * @return array
+     */
+    public function getState(): array
+    {
+        $state = static::getDb()->identityMapGetState($this, static::primaryKey());
+        foreach ($state as $name => &$value) {
+            if (!in_array($name, static::columns())) {
+                unset($state[$name]);
+            }
+        }
+        return $state;
+    }
+
     /**
      * Получение маппинга измененных свойств записи.
      * @return array
@@ -183,7 +198,8 @@ public function getUpdatedProperties(): array
         if (empty($this->$pk)) {
             return $props;
         } else {
-            $state = static::getDb()->identityMapGetState($this, $pk);
+            // $state = static::getDb()->identityMapGetState($this, $pk);
+            $state = $this->getState();
             // return array_diff($props, $state ?? []);
             return array_merge(
                 array_fill_keys(array_keys(array_diff($state ?? [], $props)), null),