Merge pull request #7 from stein-j/master

Sync with original attributes
archtechx · Jan 4, 2022 · c5e70e8 · c5e70e8
2 parents 41d300b + 9b31176
commit c5e70e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/VirtualColumn.php b/src/VirtualColumn.php
@@ -30,6 +30,7 @@ protected static function decodeVirtualColumn(self $model): void
 
         foreach ($model->getAttribute(static::getDataColumn()) ?? [] as $key => $value) {
             $model->setAttribute($key, $value);
+            $model->syncOriginalAttribute($key);
         }
 
         $model->setAttribute(static::getDataColumn(), null);
@@ -52,6 +53,7 @@ protected static function encodeAttributes(self $model): void
                 ]));
 
                 unset($model->attributes[$key]);
+                unset($model->original[$key]);
             }
         }
 

diff --git a/tests/VirtualColumnTest.php b/tests/VirtualColumnTest.php
@@ -34,6 +34,7 @@ public function keys_which_dont_have_their_own_column_go_into_data_json_column()
         // Model has the correct structure when retrieved
         $model = MyModel::first();
         $this->assertSame('bar', $model->foo);
+        $this->assertSame('bar', $model->getOriginal('foo'));
         $this->assertSame(null, $model->data);
 
         // Model can be updated
@@ -43,7 +44,9 @@ public function keys_which_dont_have_their_own_column_go_into_data_json_column()
         ]);
 
         $this->assertSame('baz', $model->foo);
+        $this->assertSame('baz', $model->getOriginal('foo'));
         $this->assertSame('xyz', $model->abc);
+        $this->assertSame('xyz', $model->getOriginal('abc'));
         $this->assertSame(null, $model->data);
 
         // Model can be retrieved after update & is structure correctly