- WIP on migration and some bug fixes linked to withJoin() select problems

src/Repository/RelationBuilder.php

@@ -57,7 +57,7 @@ class RelationBuilder
 
         }
         else {
-            if ( $relation = $this->resolver->searchFieldAnnotation($name, [ Relation::class ] ) ) {
+            if ( $relation = $this->resolver->searchFieldAnnotation($name, [ Relation::class, Join::class ] ) ) {
                 return $this->instanciateEmptyObject($name, $relation);
             }
             elseif ($virtual = $this->resolveVirtual($name)) {
@@ -91,7 +91,7 @@ class RelationBuilder
 
     protected function resolveRelation(string $name) : mixed
     {
-        if ( null !== ( $relation = $this->resolver->searchFieldAnnotation($name, [ Relation::class ] ) ) ) {
+        if ( null !== ( $relation = $this->resolver->searchFieldAnnotation($name, [ Relation::class, /*Join::class*/ ] ) ) ) {
             $this->orders = $this->resolver->searchFieldAnnotationList($name, [ OrderBy::class ] );
             $this->wheres = $this->resolver->searchFieldAnnotationList($name, [  Where::class ] );
             $this->filters = $this->resolver->searchFieldAnnotationList($name, [ Filter::class ] );

src/Repository/WithOptionEnum.php

@@ -5,7 +5,7 @@ namespace Ulmus\Repository;
 enum WithOptionEnum
 {
     case SkipWhere;
-            case SkipHaving;
+    case SkipHaving;
     case SkipFilter;
     case SkipOrderBy;
     case SkipJoinWhere;