refresh relations with BC break

+ implementation with BC break
yiisoft · Dec 6, 2024 · 2c6f34d · 2c6f34d
1 parent 4ed589f
commit 2c6f34d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php
@@ -281,7 +281,7 @@ protected static function filterValidColumnNames($db, array $aliases)
     /**
      * {@inheritdoc}
      */
-    public function refresh()
+    public function refresh(array $with = [])
     {
         $query = static::find();
         $tableName = key($query->getTablesUsedInFrom());
@@ -290,7 +290,8 @@ public function refresh()
         foreach ($this->getPrimaryKey(true) as $key => $value) {
             $pk[$tableName . '.' . $key] = $value;
         }
-        $query->where($pk);
+        $query->where($pk)
+            ->with(...$with);
 
         /* @var $record BaseActiveRecord */
         $record = $query->noCache()->one();

diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php
@@ -1082,8 +1082,8 @@ protected function refreshInternal($record)
             $this->_attributes[$name] = isset($record->_attributes[$name]) ? $record->_attributes[$name] : null;
         }
         $this->_oldAttributes = $record->_oldAttributes;
-        $this->_related = [];
-        $this->_relationsDependencies = [];
+        $this->_related = $record->_related;
+        $this->_relationsDependencies = $record->_relationsDependencies;
         $this->afterRefresh();
 
         return true;

diff --git a/tests/framework/ar/ActiveRecordTestTrait.php b/tests/framework/ar/ActiveRecordTestTrait.php
@@ -288,6 +288,10 @@ public function testRefresh()
         $customer->name = 'to be refreshed';
         $this->assertTrue($customer->refresh());
         $this->assertEquals('user1', $customer->name);
+        $this->assertFalse($customer->isRelationPopulated('profile'));
+
+        $this->assertTrue($customer->refresh(['profile']));
+        $this->assertTrue($customer->isRelationPopulated('profile'));
     }
 
     public function testEquals()