Update SelectQuery.php

DeimosProject · Apr 12, 2017 · a6a2a7a · a6a2a7a
1 parent 58928d0
commit a6a2a7a
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/ORM/SelectQuery.php b/src/ORM/SelectQuery.php
@@ -93,9 +93,20 @@ public function findOne($asObject = true)
                 'state'     => Entity::STATE_QUERY,
                 'tableName' => $table
             ]);
-
-            $object(Entity::STATE_LOADED);
-
+
+            if (!$object)
+            {
+                $object = new $model(
+                    $this->builder,
+                    Entity::STATE_CREATED,
+                    $table
+                );
+            }
+            else
+            {
+                $object(Entity::STATE_LOADED);
+            }
+
             return $object;
         }
 
@@ -147,4 +158,4 @@ public function raw($sql, array $parameters = [])
         return $statement;
     }
 
-}
+}