Query::prepareResult

2014-08-05 12:43:24 +04:00
parent 2e208b6f88
commit c0dbd87f7a
2 changed files with 28 additions and 14 deletions
--- a/ActiveRecord.php
+++ b/ActiveRecord.php
@@ -133,12 +133,18 @@ abstract class ActiveRecord extends BaseActiveRecord

    /**
     * @param ActiveRecord $record
-     * @param Document $row
+     * @param Document|array $row
     */
    public static function populateRecord($record, $row)
    {
-        $record->document = $row;
-        parent::populateRecord($record, $record->document->getAll());
+        if (is_array($row)) {
+            $document = Document::createFromArray($row);
+        } else {
+            $document = $row;
+            $row = $row->getAll();
+        }
+        $record->document = $document;
+        parent::populateRecord($record, $row);
    }

    public function attributes()