- A lot of fixes made again in this patch

src/EntityTrait.php

@@ -8,7 +8,7 @@ use Ulmus\Repository,
     Ulmus\Common\EntityField;
 
 use Ulmus\Annotation\Classes\{ Method, Table, Collation, };
-use Ulmus\Annotation\Property\{ Field, Filter, Relation, OrderBy, Where, Join, Virtual, On, WithJoin, };
+use Ulmus\Annotation\Property\{ Field, Filter, FilterJoin, Relation, OrderBy, Where, OrWhere, Join, Virtual, On, WithJoin, };
 use Ulmus\Annotation\Property\Field\{ Id, ForeignKey, CreatedAt, UpdatedAt, Datetime as DateTime, Date, Time, Bigint, Tinyint, Text, Mediumtext, Longtext, };
 use Ulmus\Annotation\Property\Relation\{ Ignore as RelationIgnore };
 
@@ -254,7 +254,23 @@ trait EntityTrait {
     {
         return array_keys($this->resolveEntity()->fieldList());
     }
-    
+
+    /**
+     * @Ignore
+     */
+    public function __clone()
+    {
+        foreach($this as $prop) {
+
+        }
+
+        if ( null !== $pkField = $this->resolveEntity()->getPrimaryKeyField($this) ) {
+            $key = key($pkField);
+
+            unset($this->$key);
+        }
+    }
+
     /**
      * @Ignore
      */