Mudanças

src/ORM/BelongsTo.php

@@ -16,7 +16,6 @@ class BelongsTo {
         $this->localElement = $localElement;
     }
 
-    
     function get() {
         return $this->foreignObject::findOne(Array($this->remoteField => Array('=', $this->localElement->{$this->localField})));
     }

src/ORM/Collection.php

@@ -100,11 +100,13 @@ class Collection implements \Countable, \IteratorAggregate, \ArrayAccess
 
                 switch (get_class($relation)) {
                     case 'ORM\HasMany':
+                        $this->items[$key]->$connection = $this->items[$key]->$connection()->get();
                         break;
                     case 'ORM\HasOne':
+                        $this->items[$key]->$connection = $this->items[$key]->$connection()->get();
                         break;
                     case 'ORM\BelongsTo':
-                        $searchs['belongsTo'][] = [];
+                        $this->items[$key]->$connection = $this->items[$key]->$connection()->get();
                         break;
                     case 'ORM\BelongsToMany':
                         $this->items[$key]->$connection = $this->items[$key]->$connection()->get();

src/ORM/DBInstance.php

@@ -96,6 +96,7 @@ class DBInstance
      */
     public static function queryOne($sql, $data = null, $instance = 'default')
     {
+
         $sql = self::addPrefix($sql, $instance);
 
         if ($data) {

src/ORM/Entity.php

@@ -15,7 +15,8 @@ abstract class Entity {
         '_timestamps',
         '_softdelete',
         '_tableName',
-        '_idPolice'
+        '_idPolice',
+        '_ignore'
     );
     const _properties = Array();
 
@@ -53,7 +54,7 @@ abstract class Entity {
         if (!isset($this->$key)) {
             return 0;
         }
-        return $this->toArray()[$key];
+        return $this->$key;
     }
 
     public function __toString() {
@@ -66,9 +67,21 @@ abstract class Entity {
         return static::class;
     }
 
+    /*public function __call($name, $arguments){
+        dd($name);
+    }*/
+
     public function charge($payload) {
 
-        $elements = array_diff(static::_properties, self::_ignore, $this->_ignore);
+        $properties = [];
+
+        foreach( get_object_vars($this) as $key => $property){
+            if(substr($key, 0, 1) != '_'){
+                $properties[] = $key;
+            }
+        }
+
+        $elements = array_diff(array_merge($properties, static::_properties), self::_ignore);
 
         foreach ($elements as $key => $property) {
             if ($property == 'id' && !isset($payload[$property])) {
@@ -225,6 +238,7 @@ abstract class Entity {
         foreach ($data as $key => $value) {
             $this->$key = $value;
         }
+
     }
 
     /**
@@ -256,7 +270,7 @@ abstract class Entity {
         } else {
             $sql = "SELECT $criteria FROM {" . static::_tableName . "} $limits_sql";
         }
-        error_log($sql);
+
         $results = DBInstance::query($sql, Array(), static::_connectionName);
         $objects = new Collection;
 
@@ -421,7 +435,7 @@ abstract class Entity {
 
             if (substr($criteria[0], 0, 2) == "OR") {
                 $criteria[0] = str_replace('OR', '', $criteria[0]);
-                $criteria_sql .= "OR $key::text $criteria[0] ('%$criteria[1]%')";
+                $criteria_sql .= "OR $key $criteria[0] ('%$criteria[1]%')";
             } else if (is_string($criteria[1])) {
                 $criteria_sql .= "$key $criteria[0] '$criteria[1]'";
             } else if (is_array($criteria[1])) {
@@ -454,9 +468,11 @@ abstract class Entity {
             $object->fill($value);
             $objects->addItem($object);
         }
+
         if (empty($objects)) {
             return Array();
         }
+
         return $objects;
     }
 
@@ -594,11 +610,15 @@ abstract class Entity {
             $relations = [$relations];
         }
 
+        if(!$relations){
+            return $this;
+        }
+
         $possibleRelations = get_class_methods(static::class);
 
         foreach($relations as $relation){
             if(in_array($relation, $possibleRelations)){
-                $this->$relation = $this->$relation(true)->get();                
+                $this->$relation = $this->$relation()->get();
             }
             if($this->$relation){
                 $this->$relation->with($propagate);