fix: Fixed Entity::injectRawData()

Author: neznaika0

system/Entity/Entity.php

@@ -306,7 +306,7 @@ public function hasChanged(?string $key = null): bool
      */
     public function injectRawData(array $data)
     {
-        $this->attributes = $data;
+        $this->attributes = array_merge($this->attributes, $data);
 
         $this->syncOriginal();
 

tests/system/Entity/EntityTest.php

@@ -1094,6 +1094,52 @@ public function testJsonSerializableEntity(): void
         $this->assertSame(json_encode($entity->toArray()), json_encode($entity));
     }
 
+    public function testInjectRawArray(): void
+    {
+        $entity = new class () extends Entity {
+            // The "user" property is not for DB
+            protected $attributes = [
+                'type'    => 'Normal',
+                'limit'   => 10,
+                'user'    => 'John',
+                '_secure' => 'High',
+            ];
+            protected $original = [
+                'type'    => 'None',
+                'limit'   => 0,
+                'user'    => null,
+                '_secure' => 'Low',
+            ];
+        };
+
+        $entity->injectRawData([
+            'type'    => 'High',
+            'limit'   => 15,
+            '_secure' => 'Normal',
+            'extra'   => 'undefined',
+        ]);
+
+        $this->assertSame(
+            [
+                'type'    => 'High',
+                'limit'   => 15,
+                'user'    => 'John',
+                '_secure' => 'Normal',
+                'extra'   => 'undefined',
+            ],
+            $entity->toRawArray(),
+        );
+        $this->assertSame(
+            [
+                'type'  => 'High',
+                'limit' => 15,
+                'user'  => 'John',
+                'extra' => 'undefined',
+            ],
+            $entity->toArray(),
+        );
+    }
+
     private function getEntity(): object
     {
         return new class () extends Entity {

user_guide_src/source/changelogs/v4.6.4.rst

@@ -41,6 +41,7 @@ Bugs Fixed
 - **Database:** Fixed a bug in ``Connection::getFieldData()`` for ``SQLSRV`` and ``OCI8`` where extra characters were returned in column default values (specific to those handlers), instead of following the convention used by other drivers.
 - **Database:** Fixed a bug in ``BaseBuilder::compileOrderBy()`` where the method could overwrite ``QBOrderBy`` with a string instead of keeping it as an array, causing type errors and preventing additional ``ORDER BY`` clauses from being appended.
 - **Database:** Fixed a bug in ``SQLite3`` where the password parameter was ignored unless it was an empty string.
+- **Entity:** Fixed a bug in ``Entity::injectRawArray()`` where the default values of ``$attributes``values disappear. In the case when, after the DB query, the result did not contain all the values for the properties.
 - **Forge:** Fixed a bug in ``Postgre`` and ``SQLSRV`` where changing a column's default value using ``Forge::modifyColumn()`` method produced incorrect SQL syntax.
 - **Model:** Fixed a bug in ``Model::replace()`` where ``created_at`` field (when available) wasn't set correctly.
 - **Model:** Fixed a bug in ``Model::insertBatch()`` and ``Model::updateBatch()`` where casts were not applied to inserted or updated values.