- 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/Annotation/Property/Field.php

@@ -14,7 +14,7 @@ class Field implements \Ulmus\Annotation\Annotation {
 
     public array $attributes = [];
 
-    public bool $nullable = false;
+    public bool $nullable;
         
     public function __construct(? string $type = null, ? int $length = null)
     {

src/Annotation/Property/Field/Date.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Ulmus\Annotation\Property\Field;
+
+class Date extends \Ulmus\Annotation\Property\Field {
+
+    public function __construct(? string $type = "date", ? int $length = null)
+    {
+        parent::__construct($type, $length);
+    }
+}

src/Annotation/Property/Field/Datetime.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Ulmus\Annotation\Property\Field;
+
+class Datetime extends \Ulmus\Annotation\Property\Field {
+
+    public function __construct(? string $type = "datetime", ? int $length = null)
+    {
+        parent::__construct($type, $length);
+    }
+}

src/Annotation/Property/Field/Time.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Ulmus\Annotation\Property\Field;
+
+class Time extends \Ulmus\Annotation\Property\Field {
+
+    public function __construct(? string $type = "time", ? int $length = null)
+    {
+        parent::__construct($type, $length);
+    }
+}

src/Annotation/Property/Filter.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Ulmus\Annotation\Property;
+
+class Filter implements \Ulmus\Annotation\Annotation {
+
+    public string $method;
+
+    public function __construct(string $method = null)
+    {
+        if ( $method !== null ) {
+            $this->method = $method;
+        }
+    }
+}

src/Annotation/Property/Having.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Ulmus\Annotation\Property;
+
+class Having extends Where {}

src/Annotation/Property/On.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Ulmus\Annotation\Property;
+
+class On extends Where {}

src/Annotation/Property/Relation.php

@@ -19,7 +19,9 @@ class Relation implements \Ulmus\Annotation\Annotation {
     public /*stringable*/ $bridgeForeignKey;
     
     public string $entity;
-    
+
+    public string $join;
+
     public string $function = "loadAll";
 
     public function __construct(string $type = null)
@@ -44,4 +46,9 @@ class Relation implements \Ulmus\Annotation\Annotation {
         
         return new $e();
     }
+
+    public function normalizeType() : string
+    {
+        return strtolower(str_replace(['-', '_', ' '], '', $this->type));
+    }
 }

src/Annotation/Property/Where.php

@@ -6,13 +6,13 @@ use Ulmus\Query;
 
 class Where implements \Ulmus\Annotation\Annotation {
 
-    public string $field;
+    public /* stringable */ $field;
     
     public $value;
     
     public string $operator;
     
-    public function __construct(? string $field = null, $value = null, ? string $operator = null)
+    public function __construct(/* stringable */ $field = null, $value = null, ? string $operator = null)
     {
         if ( $field !== null ) {
             $this->field = $field;