fixes

src/BaseRow.php

@@ -3,6 +3,8 @@
 
 /**
  * Base class used by Row and RowCollection
+ * 
+ * @property mixed $id
  */
 abstract class BaseRow implements RowInterface
 {

src/EntityFactory.php

@@ -124,7 +124,7 @@ public function get($name)
 
                 return new $class($name, $this->db, $queryFactory, $fieldFactory);
             }
-        } catch (Exception $exception) {
+        } catch (\Exception $exception) {
             throw new SimpleCrudException("Error getting the '{$name}' entity", 0, $exception);
         }
 

src/FieldFactory.php

@@ -79,7 +79,7 @@ public function get($name, $type = null)
             $class = $this->cachedTypes[$type] = $this->defaultType;
 
             return new $class();
-        } catch (Exception $exception) {
+        } catch (\Exception $exception) {
             throw new SimpleCrudException("Error getting the '{$type}' field", 0, $exception);
         }
     }

src/Queries/LimitTrait.php

@@ -3,6 +3,8 @@
 
 /**
  * Common function to manage LIMIT clause
+ * 
+ * @property \SimpleCrud\Entity $entity
  */
 trait LimitTrait
 {

src/Queries/Mysql/Select.php

@@ -162,7 +162,7 @@ public function __toString()
         $query .= ' '.static::buildFields($this->entity->name, array_keys($this->entity->fields));
 
         foreach ($this->leftJoin as $join) {
-            $query .= ', '.static::buildFields($join['entity']->name, array_keys($join['entity']->fields), $join['entity']->name);
+            $query .= ', '.static::buildFields($join['entity']->name, array_keys($join['entity']->fields), true);
         }
 
         $query .= $this->fieldsToString();
@@ -191,19 +191,19 @@ public function __toString()
     /**
      * Generates the fields/tables part of a SELECT query
      *
-     * @param string      $table
-     * @param array       $fields
-     * @param string|null $rename
+     * @param string $table
+     * @param array  $fields
+     * @param bool   $rename
      *
      * @return string
      */
-    protected static function buildFields($table, array $fields, $rename = null)
+    protected static function buildFields($table, array $fields, $rename = false)
     {
         $query = [];
 
         foreach ($fields as $field) {
             if ($rename) {
-                $query[] = "`{$table}`.`{$field}` as `{$rename}.{$field}`";
+                $query[] = "`{$table}`.`{$field}` as `{$table}.{$field}`";
             } else {
                 $query[] = "`{$table}`.`{$field}`";
             }

src/Queries/Sqlite/CompiledOptionsTrait.php

@@ -6,6 +6,8 @@
 
 /**
  * Manages a database select count query in Mysql databases
+ * 
+ * @property \SimpleCrud\Entity $entity
  */
 trait CompiledOptionsTrait
 {

src/Queries/WhereExtendedTrait.php

@@ -5,6 +5,8 @@
 
 /**
  * Common function to manage WHERE clause
+ * 
+ * @property \SimpleCrud\Entity $entity
  */
 trait WhereExtendedTrait
 {

src/Queries/WhereTrait.php

@@ -3,6 +3,8 @@
 
 /**
  * Common function to manage WHERE clause
+ * 
+ * @property \SimpleCrud\Entity $entity
  */
 trait WhereTrait
 {

src/QueryFactory.php

@@ -73,7 +73,7 @@ public function get($name)
                     return new $class($this->entity);
                 }
             }
-        } catch (Exception $exception) {
+        } catch (\Exception $exception) {
             throw new SimpleCrudException("Error getting the '{$name}' query", 0, $exception);
         }
 

src/Row.php

@@ -5,8 +5,6 @@
 
 /**
  * Stores the data of an entity row
- *
- * @property mixed $id
  */
 class Row extends BaseRow implements JsonSerializable
 {

src/RowCollection.php

@@ -7,8 +7,6 @@
 
 /**
  * Stores a collection of rows
- *
- * @property array $id
  */
 class RowCollection extends BaseRow implements ArrayAccess, Iterator, Countable
 {
@@ -54,7 +52,7 @@ public function __get($name)
                             $collection[] = $r;
                         }
                     } else {
-                        $collection = $r;
+                        $collection = $row;
                     }
                 }
 
@@ -74,7 +72,7 @@ public function __get($name)
 
         //Returns values
         if ($first->has($name)) {
-            return $this->get($name, isset($arguments[0]) ? $arguments[0] : null);
+            return $this->get($name);
         }
     }
 

src/SimpleCrud.php

@@ -8,7 +8,7 @@ class SimpleCrud
 {
     protected $connection;
     protected $inTransaction = false;
-    protected $factory;
+    protected $entityFactory;
     protected $entities = [];
     protected $attributes = [];