- Work done on Join and using the @Relation annotation in case there is no join.

- Added some field type (date, Datetime, Time)
- Added a new @Filter annotation which allows to filter repository from relation into a method.

src/Query/Create.php

@@ -31,7 +31,7 @@ class Create extends Fragment {
     public function renderFields() : string
     {
         return "(" . PHP_EOL . implode(",".PHP_EOL, array_map(function($field) {
-            return "    ".EntityField::generateCreateColumn($field);
+            return "    " . EntityField::generateCreateColumn($field);
         }, $this->fieldList)) . PHP_EOL . ")";
     }
 }

src/Query/Join.php

@@ -37,6 +37,8 @@ class Join extends Fragment
     
     public /* QueryBuilder */ $queryBuilder;
 
+    public int $order = 40;
+
     public function __construct(QueryBuilder $queryBuilder) 
     {
         $this->queryBuilder = new QueryBuilder();
@@ -47,18 +49,14 @@ class Join extends Fragment
     {
         $this->side = $side;
         $this->table = $table;
-        $this->field = $field;
-        $this->value = $value;
+
+        $this->where($this->field = $field, $this->value = $value);
     }
 
     public function render() : string
     {
-        if ($this->queryBuilder->where ?? false ) {
-            $where = $this->renderSegments([Where::CONDITION_AND, $this->queryBuilder->render(true)]);
-        }
-        
         return $this->renderSegments([ 
-            strtoupper($this->side), $this->outer ? static::SQL_OUTER : "", static::SQL_TOKEN, $this->table, $this->alias ?? "", $this->attachment, $this->field, "=", $this->value, $where ?? ""
+            strtoupper($this->side), $this->outer ? static::SQL_OUTER : "", static::SQL_TOKEN, $this->table, $this->alias ?? "", $this->attachment, $this->queryBuilder->render(true) ?? ""
         ]);
     }
 }