patch alg

composer.json

@@ -18,7 +18,8 @@
   "require": {
     "php": "^7.0",
     "doctrine/inflector": "~1.0",
-    "deimos/database": "~2.0"
+    "deimos/database": "~2.0",
+    "phpixie/orm": "dev-master"
   },
   "require-dev": {
     "phpunit/phpunit": "^6.0",

demo/test.php

@@ -101,7 +101,7 @@ class Asd extends \Deimos\ORM\Entity
 
 $user = $orm->repository('user')
 //    ->orderBy('id', 'DESC')
-    ->findOne();
+    ->findOne(['images', 'asd', 'roles']);
 
 if (!$user)
 {

src/ORM/Entity.php

@@ -297,11 +297,21 @@ protected function manyToMany(array &$config, array &$arguments)
         $leftRightModel = $config['modelId'] ?: $model . ucfirst($pkModel);
         $leftRightFrom  = $config['itemId'] ?: $from . ucfirst($pkFrom);
 
-        return $this->orm->repository(['right' => $model])
-            ->select(['right.*'])
-            ->join(['leftRight' => $table])->inner()
-            ->on('right.' . $pkModel, 'leftRight.' . $leftRightModel)
-            ->where('leftRight.' . $leftRightFrom, $this->id());
+//        SELECT `right`.`*` FROM `roles` AS `right`  INNER JOIN `usersRoles` AS `leftRight` ON (`right`.`id` = `leftRight`.`roleId`) WHERE ( (`leftRight`.`userId` = '1') )
+
+        $ids = $this->orm->repository($table)
+            ->select($leftRightModel)
+            ->where($leftRightFrom, $this->id())
+            ->find(false);
+
+        return $this->orm->repository($model)
+            ->where($this->orm->mapPK($model), array_map('current', $ids));
+
+//        return $this->orm->repository(['right' => $model])
+//            ->select(['right.*'])
+//            ->join(['leftRight' => $table])->inner()
+//            ->on('right.' . $pkModel, 'leftRight.' . $leftRightModel)
+//            ->where('leftRight.' . $leftRightFrom, $this->id());
     }
 
     /**

src/ORM/ORM.php

@@ -31,7 +31,6 @@ class ORM
      */
     protected $tableMap = [];
 
-
     /**
      * @var string[]
      */
@@ -94,8 +93,8 @@ public function setConfig(array $storage)
     {
         foreach ($storage as $modelName => $config)
         {
-            $class     = isset($config['class']) ? $config['class'] : Entity::class;
-            $relations = isset($config['relations']) ? $config['relations'] : [];
+            $class     = $config['class'] ?? Entity::class;
+            $relations = $config['relations'] ?? [];
 
             $this->register($modelName, $class, $relations);
         }

src/ORM/Queries/Query.php

@@ -102,13 +102,13 @@ public function find($asObject = true)
     }
 
     /**
-     * @param array $asObject
+     * @param array|boolean $preload
      *
      * @return array|Entity
      */
-    public function findOne($asObject = [])
+    public function findOne($preload = [])
     {
-        if (false !== $asObject)
+        if (false !== $preload)
         {
             $self = clone $this;
             $self->limit(1);
@@ -133,6 +133,14 @@ public function findOne($asObject = [])
             $object();
             $object->setModelName($this->modelName);
 
+            if (is_array($preload))
+            {
+                foreach ($preload as $load)
+                {
+                    $object->$load;
+                }
+            }
+
             $sth->closeCursor();
 
             return $object;