Skip to content

Y
yii2
Commit 6133133e by Carsten Brandt
Options

added dependency in db\AR -> redis\AR needs to be refactored later

this is to make relations work. tests are passing now. refactoring needed to remove the dependency
parent df22ffa3
Showing with 2 additions and 2 deletions
framework/yii/db/ActiveRecord.php
...@@ -386,7 +386,7 @@ class ActiveRecord extends Model ...@@ -386,7 +386,7 @@ class ActiveRecord extends Model
return $this->_related[$t]; return $this->_related[$t];
} }
$value = parent::__get($name); $value = parent::__get($name);
if ($value instanceof ActiveRelation) { if ($value instanceof ActiveRelation || $value instanceof \yii\redis\ActiveRelation) { // TODO this should be done differently remove dep on redis
return $this->_related[$t] = $value->multiple ? $value->all() : $value->one(); return $this->_related[$t] = $value->multiple ? $value->all() : $value->one();
} else { } else {
return $value; return $value;
...@@ -1272,7 +1272,7 @@ class ActiveRecord extends Model ...@@ -1272,7 +1272,7 @@ class ActiveRecord extends Model
$getter = 'get' . $name; $getter = 'get' . $name;
try { try {
$relation = $this->$getter(); $relation = $this->$getter();
if ($relation instanceof ActiveRelation) { if ($relation instanceof ActiveRelation || $relation instanceof \yii\redis\ActiveRelation) { // TODO this should be done differently remove dep on redis
return $relation; return $relation;
} }
} catch (UnknownMethodException $e) { } catch (UnknownMethodException $e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment