- fixed a changed interface execute() event

- Fixed setTime return value
- Fixed PDO return value of connect() in mssql
2026-10-22 19:43:31 +00:00 · 2026-10-22 17:28:00 +00:00 · 2026-10-22 17:24:04 +00:00 · 2026-10-22 17:24:04 +00:00 · 2026-10-22 17:24:04 +00:00 · 2026-10-22 17:16:36 +00:00
157 changed files with 3456 additions and 1107 deletions
@@ -10,12 +10,12 @@
        }
    ],
    "require": {
-        "mcnd/notes": "dev-master"
+        "mcnd/notes": "^2.1.1"
    },
    "repositories": [
        {
-            "type": "vcs",
-            "url": "https://github.com/mcNdave/notes.git"
+            "type": "composer",
+            "url": "https://git.mcnd.ca/api/packages/mcndave/composer"
        }
    ],
    "autoload": {
@@ -2,7 +2,6 @@

 namespace Ulmus\Adapter;

-use Ulmus\Common\PdoObject;
 use Ulmus\Migration\FieldDefinition;

 interface AdapterInterface {
@@ -12,7 +11,7 @@ interface AdapterInterface {
    public const IDENTIFIER_SCHEMA = 4;
    public const IDENTIFIER_VALUE = 5;

-    public function connect() : object /* | PdoObject|mixed */;
+    public function connect() : object;
    public function buildDataSourceName() : string;
    public function setup(array $configuration) : void;
    public function writableValue(/* mixed */ $value); /*: mixed*/
@@ -1,121 +0,0 @@
-<?php
-
-namespace Ulmus\Adapter;
-
-use Ulmus\{ConnectionAdapter, Entity\InformationSchema\Table, Migration\FieldDefinition, Repository, QueryBuilder\Sql\MysqlQueryBuilder, Entity};
-
-trait DefaultAdapterTrait
-{
-    public function repositoryClass() : string
-    {
-        return Repository::class;
-    }
-
-    public function queryBuilderClass() : string
-    {
-        return MysqlQueryBuilder::class;
-    }
-
-    public function tableSyntax() : array
-    {
-        return [
-            'ai' => "AUTO_INCREMENT",
-            'pk' => "PRIMARY KEY",
-            'unsigned' => "UNSIGNED",
-        ];
-    }
-
-    public function databaseName() : string
-    {
-        return $this->database;
-    }
-
-    public function schemaTable(ConnectionAdapter $adapter, $databaseName, string $tableName) : null|object
-    {
-        return Table::repository(Repository::DEFAULT_ALIAS, $adapter)
-            ->select(\Ulmus\Common\Sql::raw('this.*'))
-            ->where($this->escapeIdentifier('table_schema', AdapterInterface::IDENTIFIER_FIELD), $databaseName)
-            ->loadOneFromField($this->escapeIdentifier('table_name', AdapterInterface::IDENTIFIER_FIELD), $tableName);
-    }
-
-    public function mapFieldType(FieldDefinition $field, bool $typeOnly = false) : string
-    {
-        $type = $field->type;
-
-        $length = $field->length;
-
-        if ( is_a($type, Entity\Field\Date::class, true) ) {
-            $type = "DATE";
-        }
-        elseif ( is_a($type, Entity\Field\Time::class, true) ) {
-            $type = "TIME";
-        }
-        elseif ( is_a($type, \DateTime::class, true) ) {
-            $type = "DATETIME";
-        }
-
-        switch($type) {
-            case "bool":
-                $type = "TINYINT";
-                $length = 1;
-                break;
-
-            case "array":
-            case "string":
-                if ($length && $length <= 255) {
-                    $type = "VARCHAR";
-                    break;
-                }
-                elseif (! $length || ( $length <= 65535 ) ) {
-                    $type = "TEXT";
-                }
-                elseif ( $length <= 16777215 ) {
-                    $type = "MEDIUMTEXT";
-                }
-                elseif ($length <= 4294967295) {
-                    $type = "LONGTEXT";
-                }
-                else {
-                    throw new \Exception("A column with size bigger than 4GB cannot be created.");
-                }
-
-                # Length is unnecessary on TEXT fields
-                unset($length);
-
-                break;
-
-            case "float":
-                $type = "DOUBLE";
-                break;
-
-            default:
-                $type = strtoupper($type);
-                break;
-        }
-
-        return $typeOnly ? $type : $type . ( isset($length) ? "($length" . ( ! empty($precision) ? ",$precision" : "" ) . ")" : "" );
-    }
-
-    public function whitelistAttributes(array &$parameters) : void
-    {
-        $parameters = array_intersect_key($parameters, array_flip(static::ALLOWED_ATTRIBUTES));
-    }
-
-    public function generateAlterColumn(FieldDefinition $definition, array $field) : string|\Stringable
-    {
-        if ($field['previous']) {
-            $position = sprintf('AFTER %s', $this->escapeIdentifier($field['previous']['field'], AdapterInterface::IDENTIFIER_FIELD));
-        }
-        else {
-            $position = "FIRST";
-        }
-
-        return implode(" ", [
-            strtoupper($field['action']),
-            $this->escapeIdentifier($definition->getSqlName(), AdapterInterface::IDENTIFIER_FIELD),
-            $definition->getSqlType(),
-            $definition->getSqlParams(),
-            $position,
-        ]);
-    }
-}
@@ -2,17 +2,22 @@

 namespace Ulmus\Adapter;

-use Ulmus\Common\PdoObject;
+use Ulmus\Pdo;

 use Ulmus\Exception\AdapterConfigurationException;

 use Ulmus\Ulmus;

 use Ulmus\Migration\FieldDefinition;
-use Ulmus\{Entity\InformationSchema\Table, Migration\MigrateInterface, Repository, QueryBuilder};
+use Ulmus\{ConnectionAdapter,
+    Entity\InformationSchema\Table,
+    Migration\MigrateInterface,
+    Migration\SqlMigrationTrait,
+    Repository,
+    QueryBuilder};

 class MsSQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
-    use SqlAdapterTrait;
+    use SqlAdapterTrait, SqlMigrationTrait;

    const ALLOWED_ATTRIBUTES = [
        'default', 'primary_key', 'auto_increment',
@@ -51,7 +56,9 @@ class MsSQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
    public function __construct(
        ?string $server = null,
        ?string $database = null,
+        #[\SensitiveParameter]
        ?string $username = null,
+        #[\SensitiveParameter]
        ?string $password = null,
        ?int $port = null
    ) {
@@ -76,10 +83,10 @@ class MsSQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
        }
    }

-    public function connect() : PdoObject
+    public function connect() : \PDO
    {
        try {
-            $pdo = new PdoObject($this->buildDataSourceName(), $this->username, $this->password);
+            $pdo = new Pdo\Mssql($this->buildDataSourceName(), $this->username, $this->password);
            $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
            $pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
            $pdo->setAttribute(\PDO::SQLSRV_ATTR_ENCODING, \PDO::SQLSRV_ENCODING_UTF8);
@@ -204,9 +211,17 @@ class MsSQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
        }
    }

+    public function mapFieldType(FieldDefinition $field, bool $typeOnly = false) : string
+    {
+        $mapper = new MsSQLFieldMapper($field);
+
+        return $typeOnly ? $mapper->type : $mapper->render();
+    }
+
    public static function escapeIdentifier(string $segment, int $type) : string 
    {
        switch($type) {
+            default:
            case static::IDENTIFIER_SCHEMA:
            case static::IDENTIFIER_DATABASE:
            case static::IDENTIFIER_TABLE:
@@ -232,4 +247,13 @@ class MsSQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
    {
        return QueryBuilder\Sql\MssqlQueryBuilder::class;
    }
+
+    public function schemaTable(ConnectionAdapter $adapter, $databaseName, string $tableName) : null|object
+    {
+        return \Ulmus\Entity\Mssql\Table::repository(Repository::DEFAULT_ALIAS, $adapter)
+            ->select(\Ulmus\Common\Sql::raw('this.*'))
+            ->where($this->escapeIdentifier('table_schema', AdapterInterface::IDENTIFIER_FIELD), $databaseName)
+            ->or($this->escapeIdentifier('table_catalog', AdapterInterface::IDENTIFIER_FIELD), $databaseName)
+            ->loadOneFromField($this->escapeIdentifier('table_name', AdapterInterface::IDENTIFIER_FIELD), $tableName);
+    }
 }
@@ -0,0 +1,29 @@
+<?php
+
+namespace Ulmus\Adapter;
+
+use Ulmus\Migration\FieldDefinition;
+
+class MsSQLFieldMapper extends SqlFieldMapper
+{
+    public function map() : void
+    {
+        parent::map();
+
+        if (in_array($this->type, [ 'CHAR', 'VARCHAR', 'TEXT', ])) {
+            $this->type = "N" . $this->type;
+        };
+    }
+
+    /* @TODO !
+    public function postProcess() : void
+    {
+        if (
+            in_array($this->type, [ 'BLOB', 'TINYBLOB', 'MEDIUMBLOB', 'LONGBLOB', 'JSON', 'TEXT', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'GEOMETRY' ]) &&
+            ! is_object($this->field->default ?? false) # Could be a functional default, which would now be valid
+        ) {
+            unset($this->field->default);
+        }
+    }
+     * */
+}
@@ -2,15 +2,19 @@

 namespace Ulmus\Adapter;

+use Ulmus\ConnectionAdapter;
+use Ulmus\Entity\Mysql\Table;
 use Ulmus\Migration\FieldDefinition;
 use Ulmus\Migration\MigrateInterface;
+use Ulmus\Migration\SqlMigrationTrait;
 use Ulmus\QueryBuilder\Sql;
-use Ulmus\Common\PdoObject;
+use Ulmus\Pdo;

 use Ulmus\Exception\AdapterConfigurationException;
+use Ulmus\Repository;

 class MySQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
-    use SqlAdapterTrait;
+    use SqlAdapterTrait, SqlMigrationTrait;

    const ALLOWED_ATTRIBUTES = [
        'default', 'primary_key', 'auto_increment', 'update',
@@ -35,7 +39,9 @@ class MySQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
    public function __construct(
        ?string $hostname = null,
        ?string $database = null,
+        #[\SensitiveParameter]
        ?string $username = null,
+        #[\SensitiveParameter]
        ?string $password = null,
        ?int $port = null,
        ?string $charset = null
@@ -65,10 +71,10 @@ class MySQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
        }
    }

-    public function connect() : PdoObject
+    public function connect() : \PDO
    {
        try {
-            $pdo = new PdoObject($this->buildDataSourceName(), $this->username, $this->password);
+            $pdo = new Pdo\Mysql($this->buildDataSourceName(), $this->username, $this->password);
            $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
            $pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
            $pdo->setAttribute(\PDO::ATTR_AUTOCOMMIT, false);
@@ -147,6 +153,7 @@ class MySQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
    public static function escapeIdentifier(string $segment, int $type) : string
    {
        switch($type) {
+            default:
            case static::IDENTIFIER_DATABASE:
            case static::IDENTIFIER_TABLE:
            case static::IDENTIFIER_FIELD:
@@ -166,4 +173,34 @@ class MySQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
    {
        return Sql\MysqlQueryBuilder::class;
    }
+
+    public function schemaTable(ConnectionAdapter $adapter, $databaseName, string $tableName) : null|object
+    {
+        return Table::repository(Repository::DEFAULT_ALIAS, $adapter)
+            ->select(\Ulmus\Common\Sql::raw('this.*'))
+            ->where($this->escapeIdentifier('table_schema', AdapterInterface::IDENTIFIER_FIELD), $databaseName)
+            ->loadOneFromField($this->escapeIdentifier('table_name', AdapterInterface::IDENTIFIER_FIELD), $tableName);
+    }
+
+
+    public function generateAlterColumn(FieldDefinition $definition, array $field) : string|\Stringable
+    {
+        if ($field['action'] === 'add') {
+            if (! empty($field['previous'])) {
+                $position = sprintf('AFTER %s', $this->escapeIdentifier($field['previous']->field, AdapterInterface::IDENTIFIER_FIELD));
+            }
+            else {
+                $position = "FIRST";
+            }
+        }
+
+        return implode(" ", array_filter([
+            strtoupper($field['action']),
+            $this->escapeIdentifier($definition->getSqlName(), AdapterInterface::IDENTIFIER_FIELD),
+            $definition->getSqlType(),
+            $definition->getSqlParams(),
+            $position ?? null,
+        ]));
+    }
+
 }
@@ -6,10 +6,6 @@ use Ulmus\Migration\FieldDefinition;

 class MySQLFieldMapper extends SqlFieldMapper
 {
-    public readonly string $type;
-
-    public readonly string $length;
-
    public function map() : void
    {
        $type = $this->field->type;
@@ -28,4 +24,14 @@ class MySQLFieldMapper extends SqlFieldMapper
            parent::map();
        }
    }
+
+    public function postProcess() : void
+    {
+        if (
+            in_array($this->type, [ 'BLOB', 'TINYBLOB', 'MEDIUMBLOB', 'LONGBLOB', 'JSON', 'TEXT', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'GEOMETRY' ]) &&
+            ! is_object($this->field->default ?? false) # Could be a functional default, which would now be valid
+        ) {
+            unset($this->field->default);
+        }
+    }
 }
@@ -2,18 +2,18 @@

 namespace Ulmus\Adapter;

-use Ulmus\Common\PdoObject;
+use Collator;
+use Ulmus\Pdo;
 use Ulmus\ConnectionAdapter;
-
 use Ulmus\Entity;
 use Ulmus\Migration\FieldDefinition;
-use Ulmus\{Migration\MigrateInterface, Repository, QueryBuilder};
+use Ulmus\{Migration\MigrateInterface, Migration\SqlMigrationTrait, Repository, QueryBuilder};

 class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
-    use SqlAdapterTrait;
+    use SqlAdapterTrait, SqlMigrationTrait;

    const ALLOWED_ATTRIBUTES = [
-        'default', 'primary_key', 'auto_increment'
+        'default', 'primary_key', 'auto_increment', 'collate nocase', 'collate binary', 'collate rtrim',
    ];

    const DSN_PREFIX = "sqlite";
@@ -24,19 +24,20 @@ class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface
        public null|array $pragmaClose = null,
    ) { }

-    public function connect() : PdoObject
+    public function connect() : \Pdo
    {
        try {
-            $pdo = new PdoObject\SqlitePdoObject($this->buildDataSourceName(), null, null);
+            $pdo = new Pdo\Sqlite($this->buildDataSourceName(), null, null);
            $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
            $pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
            $pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);

-            $pdo->onClose = function(PdoObject $obj) {
+            $pdo->onClose = function(\PDO $obj) {
                static::registerPragma($obj, $this->pragmaClose);
            };

            $this->exportFunctions($pdo);
+            $this->exportCollations($pdo);
            $this->registerPragma($pdo, $this->pragmaBegin);
        }
        catch(\PDOException $ex){
@@ -97,12 +98,12 @@ class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface
    public function mapFieldType(FieldDefinition $field, bool $typeOnly = false) : string
    {
        $type = $field->type;
-
        $length = $field->length;

        if ( is_a($type, Entity\Field\Date::class, true) || is_a($type, Entity\Field\Time::class, true) || is_a($type, \DateTime::class, true) ) {
            $type = "TEXT";
-            $length = strlen((string) $type);
+
+            #$length = strlen((string) $type);
        }
        else {
            switch($type) {
@@ -115,6 +116,10 @@ class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface
                    break;

                case "array":
+                    $type = "JSON";
+                    $length = null;
+                    break;
+
                case "string":
                    $type = "TEXT";
                    $length = null;
@@ -152,28 +157,28 @@ class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface
        return QueryBuilder\Sql\SqliteQueryBuilder::class;
    }

-    public function exportFunctions(PdoObject $pdo) : void
+    public function exportFunctions(\PDO $pdo) : void
    {
-        $pdo->sqliteCreateFunction('if', fn($comparison, $yes, $no) => $comparison ? $yes : $no, 3);
-        $pdo->sqliteCreateFunction('length', fn($string) => strlen($string), 1);
-        $pdo->sqliteCreateFunction('lcase', fn($string) => strtolower($string), 1);
-        $pdo->sqliteCreateFunction('ucase', fn($string) => strtoupper($string), 1);
-        $pdo->sqliteCreateFunction('md5', fn($string) => md5($string), 1);
-        $pdo->sqliteCreateFunction('sha1', fn($string) => sha1($string), 1);
-        $pdo->sqliteCreateFunction('sha256', fn($string) => hash('sha256', $string), 1);
-        $pdo->sqliteCreateFunction('sha512', fn($string) => hash('sha512', $string), 1);
-        $pdo->sqliteCreateFunction('whirlpool', fn($string) => hash('whirlpool', $string), 1);
-        $pdo->sqliteCreateFunction('murmur3a', fn($string) => hash('murmur3a', $string), 1);
-        $pdo->sqliteCreateFunction('murmur3c', fn($string) => hash('murmur3c', $string), 1);
-        $pdo->sqliteCreateFunction('murmur3f', fn($string) => hash('murmur3f', $string), 1);
-        $pdo->sqliteCreateFunction('left', fn($string, $length) => substr($string, 0, $length), 2);
-        $pdo->sqliteCreateFunction('right', fn($string, $length) => substr($string, -$length), 2);
-        $pdo->sqliteCreateFunction('strcmp', fn($s1, $s2) => strcmp($s1, $s2), 2);
-        $pdo->sqliteCreateFunction('lpad', fn($string, $length, $pad) => str_pad($string, $length, $pad, STR_PAD_LEFT), 3);
-        $pdo->sqliteCreateFunction('rpad', fn($string, $length, $pad) => str_pad($string, $length, $pad, STR_PAD_RIGHT), 3);
-        $pdo->sqliteCreateFunction('concat', fn(...$args) => implode('', $args), -1);
-        $pdo->sqliteCreateFunction('concat_ws', fn($separator, ...$args) => implode($separator, $args), -1);
-        $pdo->sqliteCreateFunction('find_in_set', function($string, $string_list) {
+        $pdo->createFunction('if', fn($comparison, $yes, $no) => $comparison ? $yes : $no, 3);
+        $pdo->createFunction('length', fn($string) => strlen($string), 1);
+        $pdo->createFunction('lcase', fn($string) => strtolower($string), 1);
+        $pdo->createFunction('ucase', fn($string) => strtoupper($string), 1);
+        $pdo->createFunction('md5', fn($string) => md5($string), 1);
+        $pdo->createFunction('sha1', fn($string) => sha1($string), 1);
+        $pdo->createFunction('sha256', fn($string) => hash('sha256', $string), 1);
+        $pdo->createFunction('sha512', fn($string) => hash('sha512', $string), 1);
+        $pdo->createFunction('whirlpool', fn($string) => hash('whirlpool', $string), 1);
+        $pdo->createFunction('murmur3a', fn($string) => hash('murmur3a', $string), 1);
+        $pdo->createFunction('murmur3c', fn($string) => hash('murmur3c', $string), 1);
+        $pdo->createFunction('murmur3f', fn($string) => hash('murmur3f', $string), 1);
+        $pdo->createFunction('left', fn($string, $length) => substr($string, 0, $length), 2);
+        $pdo->createFunction('right', fn($string, $length) => substr($string, -$length), 2);
+        $pdo->createFunction('strcmp', fn($s1, $s2) => strcmp($s1, $s2), 2);
+        $pdo->createFunction('lpad', fn($string, $length, $pad) => str_pad($string, $length, $pad, STR_PAD_LEFT), 3);
+        $pdo->createFunction('rpad', fn($string, $length, $pad) => str_pad($string, $length, $pad, STR_PAD_RIGHT), 3);
+        $pdo->createFunction('concat', fn(...$args) => implode('', $args), -1);
+        $pdo->createFunction('concat_ws', fn($separator, ...$args) => implode($separator, $args), -1);
+        $pdo->createFunction('find_in_set', function($string, $string_list) {
            if ( $string === null || $string_list === null ) {
                return null;
            }
@@ -184,12 +189,43 @@ class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface

            return (int) in_array($string, explode(',', $string_list));
        }, 2);
-        $pdo->sqliteCreateFunction('day', fn($date) => ( new \DateTime($date) )->format('d'), 1);
-        $pdo->sqliteCreateFunction('month', fn($date) => ( new \DateTime($date) )->format('m'), 1);
-        $pdo->sqliteCreateFunction('year', fn($date) => ( new \DateTime($date) )->format('Y'), 1);
+        $pdo->createFunction('day', fn($date) => ( new \DateTime($date) )->format('j'), 1);
+        $pdo->createFunction('month', fn($date) => ( new \DateTime($date) )->format('n'), 1);
+        $pdo->createFunction('year', fn($date) => ( new \DateTime($date) )->format('Y'), 1);
+        $pdo->createFunction('str_to_date', fn($value, $format) => ($f = \DateTime::createFromFormat($format, $value)) ? $f->format('Y-m-d H:i:s') : false);
    }

-    public static function registerPragma(PdoObject $pdo, array $pragmaList) : void
+    public function exportCollations(\PDO $pdo) : void
+    {
+
+        if ( class_exists('Locale') ) {
+            # @TODO debug this, case-sensitivity not working properly !!
+            $collator = new Collator(\Locale::getDefault());
+            $collator->setStrength(Collator::TERTIARY);
+            $collator->setAttribute(Collator::NUMERIC_COLLATION, Collator::ON);
+
+            $pdo->createCollation('locale_cmp', fn($e1, $e2) => $collator->compare($e1, $e2));
+            $pdo->createCollation('locale_cmp_desc', fn($e1, $e2) => $collator->compare($e2, $e1));
+
+            $collatorCi = new Collator(\Locale::getDefault());
+            $collatorCi->setStrength(Collator::SECONDARY);
+            $collatorCi->setAttribute(Collator::NUMERIC_COLLATION, Collator::ON);
+
+            $pdo->createCollation('locale_cmp_ci', fn($e1, $e2) => $collatorCi->compare($e1, $e2));
+            $pdo->createCollation('locale_cmp_ci_desc', fn($e1, $e2) => $collatorCi->compare($e2, $e1));
+        }
+        else {
+            $comp = fn(string $e1, string $e2) => \iconv('UTF-8', 'ASCII//TRANSLIT', $e1) <=> \iconv('UTF-8', 'ASCII//TRANSLIT', $e2);
+            $pdo->createCollation('locale_cmp', fn($e1, $e2) => $comp);
+            $pdo->createCollation('locale_cmp_desc', fn($e2, $e1) => $comp);
+
+            $compCi = fn(string $e1, string $e2) => strtoupper(\iconv('UTF-8', 'ASCII//TRANSLIT', $e1)) <=> strtoupper(\iconv('UTF-8', 'ASCII//TRANSLIT', $e2));
+            $pdo->createCollation('locale_cmp_ci', fn($e1, $e2) => $compCi);
+            $pdo->createCollation('locale_cmp_ci_desc', fn($e2, $e1) => $compCi);
+        }
+    }
+
+    public static function registerPragma(\PDO $pdo, array $pragmaList) : void
    {
        $builder = new QueryBuilder\Sql\SqliteQueryBuilder();

@@ -217,6 +253,11 @@ class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface
        ]);
    }

+    public function supportAlterColumnAction(string $action)
+    {
+        return in_array(strtolower($action), [ 'add' ]);
+    }
+
    public function splitAlterQuery() : bool
    {
        return true;
@@ -36,44 +36,11 @@ trait SqlAdapterTrait
        return $this->database;
    }

-    public function schemaTable(ConnectionAdapter $adapter, $databaseName, string $tableName) : null|object
-    {
-        return Table::repository(Repository::DEFAULT_ALIAS, $adapter)
-            ->select(\Ulmus\Common\Sql::raw('this.*'))
-            ->where($this->escapeIdentifier('table_schema', AdapterInterface::IDENTIFIER_FIELD), $databaseName)
-            ->loadOneFromField($this->escapeIdentifier('table_name', AdapterInterface::IDENTIFIER_FIELD), $tableName);
-    }
-
-    public function mapFieldType(FieldDefinition $field, bool $typeOnly = false) : string
-    {
-        $mapper = new SqlFieldMapper($field);
-
-        return $typeOnly ? $mapper->type : $mapper->render();
-    }
-
    public function whitelistAttributes(array &$parameters) : void
    {
        $parameters = array_intersect_key($parameters, array_flip(static::ALLOWED_ATTRIBUTES));
    }

-    public function generateAlterColumn(FieldDefinition $definition, array $field) : string|\Stringable
-    {
-        if (! empty($field['previous']) ) {
-            $position = sprintf('AFTER %s', $this->escapeIdentifier($field['previous']->field, AdapterInterface::IDENTIFIER_FIELD));
-        }
-        else {
-            $position = "FIRST";
-        }
-
-        return implode(" ", [
-            strtoupper($field['action']),
-            $this->escapeIdentifier($definition->getSqlName(), AdapterInterface::IDENTIFIER_FIELD),
-            $definition->getSqlType(),
-            $definition->getSqlParams(),
-            $position,
-        ]);
-    }
-
    public function writableValue(mixed $value) : mixed
    {
        switch (true) {
@@ -92,9 +59,4 @@ trait SqlAdapterTrait

        return $value;
    }
-    
-    public function splitAlterQuery() : bool
-    {
-        return false;
-    }
 }
@@ -3,12 +3,13 @@
 namespace Ulmus\Adapter;

 use Ulmus\Migration\FieldDefinition;
+use Ulmus\Entity;

 class SqlFieldMapper
 {
-    public readonly string $type;
+    public string $type;

-    public readonly string $length;
+    public string $length;

    public function __construct(
        public FieldDefinition $field,
@@ -42,13 +43,18 @@ class SqlFieldMapper
        switch($type) {
            case "bool":
                $this->type = "TINYINT";
-                $length = 1;
+                $this->length = 1;
                break;

            case "array":
+                # Was set at JSON, but for now LONGTEXT is an alias of it (with additional constraints)
+                $this->type = "LONGTEXT";
+                break;
+
            case "string":
                if ($length && $length <= 255) {
                    $this->type = "VARCHAR";
+                    $this->length = $length;
                    break;
                }
                elseif (! $length || ( $length <= 65535 ) ) {
@@ -71,17 +77,24 @@ class SqlFieldMapper

            case "float":
                $this->type = "DOUBLE";
-                break;

            default:
-                $this->type = strtoupper($type);
+                if ($length) {
+                    $this->length = $length;
+                }

-                break;
+                $this->type ??= strtoupper($type);
        }
+
+        $this->postProcess();
    }

    public function render() : string
    {
        return $this->type . ( isset($this->length) ? "($this->length)" : "" );
    }
+
+    public function postProcess() : void
+    {
+    }
 }
@@ -7,9 +7,15 @@ use Ulmus\Repository;

 class Attribute
 {
-    public static function handleArrayField(null|\Stringable|string|array $field, null|string|bool $alias = Repository::DEFAULT_ALIAS, string $separator = ', ') : mixed
+    public static function handleArrayField(null|\Stringable|string|array $field, null|string|false $alias = Repository::DEFAULT_ALIAS, string $separator = ', ') : mixed
    {
        if ( is_array($field) ) {
+            if (count($field) < 2) {
+                throw new \RuntimeException(
+                    sprintf("Array field must be formed of at least two things, a class name, and a property. (received %s)", json_encode($field))
+                );
+            }
+
            $class = array_shift($field);
            $field[1] ??= $alias;

@@ -4,5 +4,7 @@ namespace Ulmus\Attribute\Obj;

 #[\Attribute(\Attribute::TARGET_CLASS)]
 class Collation {
-
+    public function __construct(
+        public string $name = ""
+    ) {}
 }
@@ -0,0 +1,10 @@
+<?php
+
+namespace Ulmus\Attribute\Obj;
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class JsonSerialize {
+    public function __construct(
+        public bool $includeRelations = true,
+    ) {}
+}
@@ -0,0 +1,76 @@
+<?php
+
+namespace Ulmus\Attribute\Property;
+
+use Notes\Common\ReflectedProperty;
+use Ulmus\Entity\EntityInterface;
+use Ulmus\Entity\JsonUnserializable;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class ArrayOf implements \Ulmus\Entity\EntityValueModifier
+{
+    public function __construct(
+        public readonly string $type,
+    ) {}
+
+    public function push(mixed $value, ReflectedProperty $property): mixed
+    {
+        $return = [];
+
+        foreach($value as $index => $item) {
+            if (! is_object($item)) {
+                if (enum_exists($this->type)) {
+                    if ($this->type::tryFrom($item) === null) {
+                        throw new \InvalidArgumentException(
+                            sprintf("Given item '%s' is not a valid enum for type %s ; try one of theses instead : %s", $item, $this->type, implode("', '", array_map(fn($e) => $e->value, $this->type::cases())))
+                        );
+                    } else {
+                        $obj = $this->type::from($item);
+                    }
+                }
+                elseif (class_exists($this->type)) {
+                    if (is_subclass_of($this->type, JsonUnserializable::class)) {
+                        $obj = (new \ReflectionClass($this->type))->newInstanceWithoutConstructor();
+                        $obj->jsonUnserialize($item);
+                    }
+                    else {
+                        $obj = new $this->type($item);
+                    }
+                }
+                else {
+                    throw new \InvalidArgumentException("Given type for ArrayOf is incompatible with it's use. An object should be provided");
+                }
+
+                $return[$index] = $obj;
+            }
+        }
+
+        if (! $property->type->builtIn) {
+            $cls = $property->type->type;
+
+            return new $cls($return);
+        }
+
+        return $return;
+    }
+
+    public function pull(mixed $value, ReflectedProperty $property) : mixed
+    {
+        $return = [];
+
+        foreach($value as $index => $item) {
+            if (is_object($item)) {
+                if (enum_exists($this->type)) {
+                    $value = $item->value;
+                } elseif (class_exists($this->type)) {
+                    $value = (string) $value;
+                }
+
+                $return[$index] = $value;
+            }
+        }
+
+        return $return;
+    }
+
+}
@@ -0,0 +1,10 @@
+<?php
+
+namespace Ulmus\Attribute\Property;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class Collation {
+    public function __construct(
+        public string $name = ""
+    ) {}
+}
@@ -14,6 +14,5 @@ class Field {
        public mixed $default = null,
        public bool $readonly = false,
        public null|int $decimal = null,
-        public string $description = "",
    ) {}
 }
@@ -14,6 +14,5 @@ class Bigint extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -0,0 +1,19 @@
+<?php
+
+namespace Ulmus\Attribute\Property\Field;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class Binary extends \Ulmus\Attribute\Property\Field
+{
+    public function __construct(
+        public ? string $name = null,
+        public ? string $type = "binary",
+        public null|int|string $length = null,
+        public ? int $precision = null,
+        public array $attributes = [],
+        public bool $nullable = false,
+        public mixed $default = null,
+        public bool $readonly = false,
+        public string $description = "",
+    ) {}
+}
@@ -14,6 +14,5 @@ class Bit extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -14,6 +14,5 @@ class Blob extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -0,0 +1,19 @@
+<?php
+
+namespace Ulmus\Attribute\Property\Field;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class Char extends \Ulmus\Attribute\Property\Field
+{
+    public function __construct(
+        public ? string $name = null,
+        public ? string $type = "char",
+        public null|int|string $length = null,
+        public ? int $precision = null,
+        public array $attributes = [],
+        public bool $nullable = false,
+        public mixed $default = null,
+        public bool $readonly = false,
+        public string $description = "",
+    ) {}
+}
@@ -13,6 +13,5 @@ class CreatedAt extends \Ulmus\Attribute\Property\Field {
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -11,6 +11,5 @@ class Date extends \Ulmus\Attribute\Property\Field {
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -11,6 +11,5 @@ class Datetime extends \Ulmus\Attribute\Property\Field {
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -14,6 +14,5 @@ class Decimal extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -0,0 +1,19 @@
+<?php
+
+namespace Ulmus\Attribute\Property\Field;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class Double extends \Ulmus\Attribute\Property\Field
+{
+    public function __construct(
+        public ? string $name = null,
+        public ? string $type = "float",
+        public null|int|string $length = null,
+        public ? int $precision = null,
+        public array $attributes = [],
+        public bool $nullable = false,
+        public mixed $default = null,
+        public bool $readonly = false,
+        public string $description = "",
+    ) {}
+}
@@ -14,6 +14,5 @@ class Float extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -26,7 +26,6 @@ class ForeignKey extends PrimaryKey {
        public null|string $relation = null,
        public ConstrainActionEnum $onDelete = ConstrainActionEnum::NoAction,
        public ConstrainActionEnum $onUpdate = ConstrainActionEnum::NoAction,
-        public string $description = "",
    ) {
        #$this->references = Attribute::handleArrayField($this->references, false);
    }
@@ -16,7 +16,6 @@ class Id extends \Ulmus\Attribute\Property\Field {
        ],
        public bool $nullable = false,
        public mixed $default = null,
-        public bool $readonly = false,
-        public string $description = "",
+        public bool $readonly = true,
    ) {}
 }
@@ -0,0 +1,19 @@
+<?php
+
+namespace Ulmus\Attribute\Property\Field;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class Json extends \Ulmus\Attribute\Property\Field
+{
+    public function __construct(
+        public ? string $name = null,
+        public ? string $type = "json",
+        public null|int|string $length = null,
+        public ? int $precision = null,
+        public array $attributes = [],
+        public bool $nullable = false,
+        public mixed $default = null,
+        public bool $readonly = false,
+        public string $description = "",
+    ) {}
+}
@@ -14,6 +14,5 @@ class Longblob extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 } 
@@ -14,6 +14,5 @@ class Longtext extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -14,6 +14,5 @@ class Mediumblob extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -14,6 +14,5 @@ class Mediumint extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -14,6 +14,5 @@ class Mediumtext extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -14,6 +14,5 @@ class Numeric extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -16,6 +16,5 @@ class PrimaryKey extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -0,0 +1,10 @@
+<?php
+
+namespace Ulmus\Attribute\Property\Field;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class Select {
+    public function __construct(
+        public string $sql,
+    ) {}
+}
@@ -14,6 +14,5 @@ class Smallint extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -14,6 +14,5 @@ class Text extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -12,6 +12,5 @@ class Time extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -12,6 +12,5 @@ class Timestamp extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -14,6 +14,5 @@ class Blob extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -14,6 +14,5 @@ class Tinyint extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -14,6 +14,5 @@ class Tinytext extends \Ulmus\Attribute\Property\Field
        public bool $nullable = false,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -15,6 +15,5 @@ class UpdatedAt extends \Ulmus\Attribute\Property\Field
        public bool $nullable = true,
        public mixed $default = null,
        public bool $readonly = false,
-        public string $description = "",
    ) {}
 }
@@ -0,0 +1,19 @@
+<?php
+
+namespace Ulmus\Attribute\Property\Field;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class Varbinary extends \Ulmus\Attribute\Property\Field
+{
+    public function __construct(
+        public ? string $name = null,
+        public ? string $type = "varbinary",
+        public null|int|string $length = null,
+        public ? int $precision = null,
+        public array $attributes = [],
+        public bool $nullable = false,
+        public mixed $default = null,
+        public bool $readonly = false,
+        public string $description = "",
+    ) {}
+}
@@ -0,0 +1,19 @@
+<?php
+
+namespace Ulmus\Attribute\Property\Field;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class Varchar extends \Ulmus\Attribute\Property\Field
+{
+    public function __construct(
+        public ? string $name = null,
+        public ? string $type = "varchar",
+        public null|int|string $length = null,
+        public ? int $precision = null,
+        public array $attributes = [],
+        public bool $nullable = false,
+        public mixed $default = null,
+        public bool $readonly = false,
+        public string $description = "",
+    ) {}
+}
@@ -0,0 +1,19 @@
+<?php
+
+namespace Ulmus\Attribute\Property\Field;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class Year extends \Ulmus\Attribute\Property\Field
+{
+    public function __construct(
+        public ? string $name = null,
+        public ? string $type = "year",
+        public null|int|string $length = null,
+        public ? int $precision = null,
+        public array $attributes = [],
+        public bool $nullable = false,
+        public mixed $default = null,
+        public bool $readonly = false,
+        public string $description = "",
+    ) {}
+}
@@ -6,6 +6,5 @@ namespace Ulmus\Attribute\Property;
 class Filter {
    public function __construct(
        public string $method = ""
-    )
-    {}
+    ) {}
 }
@@ -3,6 +3,7 @@
 namespace Ulmus\Attribute\Property;

 use Ulmus\Attribute\Attribute;
+use Ulmus\Repository;

 #[\Attribute]
 class Join implements ResettablePropertyInterface {
@@ -16,4 +17,35 @@ class Join implements ResettablePropertyInterface {
        $this->key = Attribute::handleArrayField($this->key);
        $this->foreignKey = Attribute::handleArrayField($this->foreignKey);
    }
+
+    ## AWAITING THE Closures in constant expression from PHP 8.5 !
+    public function foreignKey(? Repository $repository = null) : mixed
+    {
+        if (is_string($this->foreignKey)) {
+            if (str_starts_with($this->foreignKey, 'fn(') && str_contains($this->foreignKey, '=>')) {
+                $closure = eval("return {$this->foreignKey};");
+
+                return $repository ? $closure($repository) : $closure;
+            }
+
+            return $this->entity::field($this->foreignKey, $this->alias);
+        }
+
+        return $this->foreignKey;
+    }
+
+    public function isOneToOne() : bool
+    {
+        return true;
+    }
+
+    public function isOneToMany() : bool
+    {
+        return false;
+    }
+
+    public function isManyToMany() : bool
+    {
+        return false;
+    }
 }
@@ -0,0 +1,10 @@
+<?php
+
+namespace Ulmus\Attribute\Property;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class JsonSerialize {
+    public function __construct(
+        public bool $ignoreField = false,
+    ) {}
+}
@@ -0,0 +1,10 @@
+<?php
+
+namespace Ulmus\Attribute\Property;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class Limit {
+    public function __construct(
+        public int $value,
+    ) {}
+}
@@ -0,0 +1,10 @@
+<?php
+
+namespace Ulmus\Attribute\Property;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class Offset {
+    public function __construct(
+        public int $value,
+    ) {}
+}
@@ -13,7 +13,7 @@ class OrWhere extends Where {
        public string $operator = Query\Where::OPERATOR_EQUAL,
        public string $condition = Query\Where::CONDITION_OR,
        public string|\Stringable|array|null $fieldValue = null,
-        public null|array $generateValue = null,
+        public null|array|\Closure $generateValue = null,
    ) {
        parent::__construct($field, $value, $operator, $condition, $fieldValue, $generateValue);
    }
@@ -3,6 +3,7 @@
 namespace Ulmus\Attribute\Property;

 use Ulmus\Attribute\Attribute;
+use Ulmus\Repository;

 #[\Attribute(\Attribute::TARGET_PROPERTY)]
 class Relation implements ResettablePropertyInterface {
@@ -21,6 +22,7 @@ class Relation implements ResettablePropertyInterface {
        public null|string $entity = null,
        public null|string $join = null,
        public null|string $function = null,
+        public null|string $alias = null,
    ) {
        $this->key = Attribute::handleArrayField($this->key);
        $this->foreignKey = Attribute::handleArrayField($this->foreignKey);
@@ -83,4 +85,20 @@ class Relation implements ResettablePropertyInterface {
    {
        return (bool) $this->bridge;
    }
+
+    ## AWAITING THE Closures in constant expression from PHP 8.5 !
+    public function foreignKey(? Repository $repository = null) : mixed
+    {
+        if (is_string($this->foreignKey)) {
+            if (str_starts_with($this->foreignKey, 'fn(') && str_contains($this->foreignKey, '=>')) {
+                $closure = eval("return {$this->foreignKey};");
+
+                return $repository ? $closure($repository) : $closure;
+            }
+
+            return $this->entity::field($this->foreignKey, $this->alias);
+        }
+
+        return $this->foreignKey;
+    }
 }
@@ -0,0 +1,42 @@
+<?php
+
+namespace Ulmus\Attribute\Property\Relation;
+
+use Ulmus\Attribute\Property\Relation;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class ManyToMany extends Relation
+{
+    public function __construct(
+        public \Stringable|string|array $key = "",
+        public null|\Closure|array $generateKey = null,
+        public null|\Stringable|string|array $foreignKey = null,
+        public null|\Stringable|string|array $foreignField = null,
+        public array $foreignKeys = [],
+        public null|string $bridge = null,
+        public null|\Stringable|string|array $bridgeKey = null,
+        public null|\Stringable|string|array $bridgeField = null,
+        public null|\Stringable|string|array $bridgeForeignKey = null,
+        public null|\Stringable|string|array $field = null,
+        public null|string $entity = null,
+        public null|string $join = null,
+        public null|string $function = null,
+    ) {
+        parent::__construct(
+            RelationTypeEnum::manyToMany,
+            $this->key,
+            $this->generateKey,
+            $this->foreignKey,
+            $this->foreignField,
+            $this->foreignKeys,
+            $this->bridge,
+            $this->bridgeKey,
+            $this->bridgeField,
+            $this->bridgeForeignKey,
+            $this->field,
+            $this->entity,
+            $this->join,
+            $this->function,
+        );
+    }
+}
@@ -0,0 +1,42 @@
+<?php
+
+namespace Ulmus\Attribute\Property\Relation;
+
+use Ulmus\Attribute\Property\Relation;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class OneToMany extends Relation
+{
+    public function __construct(
+        public \Stringable|string|array $key = "",
+        public null|\Closure|array $generateKey = null,
+        public null|\Stringable|string|array $foreignKey = null,
+        public null|\Stringable|string|array $foreignField = null,
+        public array $foreignKeys = [],
+        public null|string $bridge = null,
+        public null|\Stringable|string|array $bridgeKey = null,
+        public null|\Stringable|string|array $bridgeField = null,
+        public null|\Stringable|string|array $bridgeForeignKey = null,
+        public null|\Stringable|string|array $field = null,
+        public null|string $entity = null,
+        public null|string $join = null,
+        public null|string $function = null,
+    ) {
+        parent::__construct(
+            RelationTypeEnum::oneToMany,
+            $this->key,
+            $this->generateKey,
+            $this->foreignKey,
+            $this->foreignField,
+            $this->foreignKeys,
+            $this->bridge,
+            $this->bridgeKey,
+            $this->bridgeField,
+            $this->bridgeForeignKey,
+            $this->field,
+            $this->entity,
+            $this->join,
+            $this->function,
+        );
+    }
+}
@@ -0,0 +1,42 @@
+<?php
+
+namespace Ulmus\Attribute\Property\Relation;
+
+use Ulmus\Attribute\Property\Relation;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class OneToOne extends Relation
+{
+    public function __construct(
+        public \Stringable|string|array $key = "",
+        public null|\Closure|array $generateKey = null,
+        public null|\Stringable|string|array $foreignKey = null,
+        public null|\Stringable|string|array $foreignField = null,
+        public array $foreignKeys = [],
+        public null|string $bridge = null,
+        public null|\Stringable|string|array $bridgeKey = null,
+        public null|\Stringable|string|array $bridgeField = null,
+        public null|\Stringable|string|array $bridgeForeignKey = null,
+        public null|\Stringable|string|array $field = null,
+        public null|string $entity = null,
+        public null|string $join = null,
+        public null|string $function = null,
+    ) {
+        parent::__construct(
+            RelationTypeEnum::oneToOne,
+            $this->key,
+            $this->generateKey,
+            $this->foreignKey,
+            $this->foreignField,
+            $this->foreignKeys,
+            $this->bridge,
+            $this->bridgeKey,
+            $this->bridgeField,
+            $this->bridgeForeignKey,
+            $this->field,
+            $this->entity,
+            $this->join,
+            $this->function,
+        );
+    }
+}
@@ -10,6 +10,7 @@ class Virtual extends Field implements ResettablePropertyInterface {
    public function __construct(
        public null|string|array $method = null,
        public ? \Closure $closure = null,
+        public null|string $name = null,
    ) {
        $this->method ??= [ static::class, 'noop' ];
    }
@@ -7,29 +7,38 @@ use Ulmus\Query;

 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::IS_REPEATABLE)]
 class Where {
+
    public function __construct(
        public string|\Stringable|array $field,
        public mixed $value = null,
        public string $operator = Query\Where::OPERATOR_EQUAL,
        public string $condition = Query\Where::CONDITION_AND,
        public string|\Stringable|array|null $fieldValue = null,
-        public null|array $generateValue = null,
+        public null|array|\Closure $generateValue = null,
    ) {
        $this->field = Attribute::handleArrayField($field);
-        $this->fieldValue = Attribute::handleArrayField($fieldValue);
+        $this->fieldValue = Attribute::handleArrayField($fieldValue, false);
    }

    public function getValue(/* null|EntityInterface */ $entity = null) : mixed
    {
-        if ($this->generateValue) {
-            if ($entity) {
+        if ($entity) {
+            if ($this->generateValue) {
                return call_user_func_array($this->generateValue, [ $entity ]);
            }
-            else {
+            elseif ($this->fieldValue) {
+                throw new \Exception(sprintf("Field value, from %s, could not be included in query since the entity is already loaded; it is meant to be used with a OneToOne relation loaded within a join.", (string) $this->fieldValue));
+            }
+        }
+        else {
+            if ($this->fieldValue) {
+                return $this->fieldValue;
+            }
+            elseif ($this->generateValue) {
                throw new \Exception(sprintf("Could not generate value from non-instanciated entity for field %s.", (string) $this->field));
            }
        }

-        return $this->fieldValue ?? $this->value;
+        return $this->value;
    }
 }
@@ -5,6 +5,6 @@ namespace Ulmus\Attribute\Property;
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::IS_REPEATABLE)]
 class WithJoin {
    public function __construct(
-        array $joins = []
+        public string|array $joins = []
    ) {}
 }
@@ -0,0 +1,10 @@
+<?php
+
+namespace Ulmus\Attribute;
+
+use Ulmus\Entity\EntityInterface;
+
+interface RegisterEntityEventInterface
+{
+    public function attach(EntityInterface $entity, string $field);
+}
@@ -0,0 +1,22 @@
+<?php
+
+namespace Ulmus\Cache;
+
+use Psr\SimpleCache\CacheInterface;
+
+trait CacheEventTrait
+{
+    public function __construct(
+        protected CacheInterface $cache,
+        protected string $cacheKey,
+    ) {}
+
+    public function purgeCache() : void
+    {
+        $keys = $this->cache->get($this->cacheKey);
+
+        if ( $keys && is_iterable($keys) ) {
+            $this->cache->deleteMultiple(array_map(fn($e) => sprintf("%s:%s:", $this->cacheKey, $e), $keys));
+        }
+    }
+}
@@ -0,0 +1,117 @@
+<?php
+
+namespace Ulmus;
+
+use Psr\SimpleCache\CacheInterface;
+use Ulmus\Entity\EntityInterface;
+use Ulmus\QueryBuilder\QueryBuilderInterface;
+use Ulmus\Repository\RepositoryInterface;
+
+trait CacheTrait
+{
+    protected CacheInterface $cache;
+
+    public function attachCachingObject(CacheInterface $cache) : self
+    {
+        $cacheKey = "";
+        $this->cache = $cache;
+
+        # Reading from cache
+        $this->eventRegister(new class($cacheKey) implements Event\Repository\CollectionFromQueryDatasetInterface {
+
+            public function __construct(
+                protected string & $cacheKey
+            ) {}
+
+            public function execute(RepositoryInterface $repository, array &$data): void
+            {
+                $this->cacheKey = $repository->queryBuilder->hashSerializedQuery();
+                $data = $repository->getFromCache( $this->cacheKey) ?: [];
+            }
+        });
+
+        # Setting to cache
+        $this->eventRegister(new class($cacheKey) implements Event\Repository\CollectionFromQueryInterface {
+            public function __construct(
+                protected string & $cacheKey
+            ) {}
+
+
+            public function execute(RepositoryInterface $repository, EntityCollection $collection): EntityCollection
+            {
+                $repository->setToCache( $this->cacheKey, $collection->map(fn(EntityInterface $e) => $e->entityGetDataset(false, true)));
+                $this->cacheKey = "";
+
+                return $collection;
+            }
+        });
+
+        $this->eventRegister(new class($this->cache, $this->entityCacheKey()) implements Event\Query\Insert {
+            use Cache\CacheEventTrait;
+
+            public function execute(RepositoryInterface $repository, object|array $entity, ?array $dataset = null, bool $replace = false): void
+            {
+                $this->purgeCache();
+            }
+        });
+
+        # Cache invalidation
+        $this->eventRegister(new class($this->cache, $this->entityCacheKey()) implements Event\Query\Update {
+            use Cache\CacheEventTrait;
+
+            public function execute(RepositoryInterface $repository, object|array $entity, array $dataset, array $diff, bool $replace = false): void
+            {
+                $this->purgeCache();
+            }
+        });
+
+        $this->eventRegister(new class($this->cache, $this->entityCacheKey()) implements  Event\Query\Delete {
+            use Cache\CacheEventTrait;
+
+            public function execute(RepositoryInterface $repository, EntityInterface $entity): void
+            {
+                $this->purgeCache();
+            }
+        });
+
+        $this->eventRegister(new class($this->cache, $this->entityCacheKey()) implements Event\Query\Truncate {
+            use Cache\CacheEventTrait;
+
+            public function execute(RepositoryInterface $repository, ?string $table = null, ?string $alias = null, ?string $schema = null): void
+            {
+                $this->purgeCache();
+            }
+        });
+
+        return $this;
+    }
+
+    protected function entityCacheKey() : string
+    {
+        return sprintf("%s.%s", $this->entityResolver->databaseName(), $this->entityResolver->tableName());
+    }
+
+    public function getFromCache(string $key) : mixed
+    {
+        $keys = $this->cache->get($this->entityCacheKey(), []);
+
+        if (in_array($key, $keys)) {
+            return $this->cache->get(sprintf("%s:%s:", $this->entityCacheKey(), $key));
+        }
+
+        return null;
+    }
+
+    public function setToCache(string $key, mixed $value) : void
+    {
+        $keys = $this->cache->get($this->entityCacheKey(), []);
+
+        if (! in_array($key, $keys)) {
+            $keys[] = $key;
+
+            $this->cache->set($this->entityCacheKey(), $keys);
+        }
+
+        $this->cache->set(sprintf("%s:%s:", $this->entityCacheKey(), $key), $value);
+    }
+}
@@ -10,21 +10,13 @@ use Ulmus\Ulmus,

 class EntityField implements WhereRawParameter
 {
-    public string $name;
-
-    public string $entityClass;
-
-    public ? string $alias;
-
-    protected EntityResolver $entityResolver;
-
-    public function __construct(string $entityClass, string $name, ? string $alias, EntityResolver $resolver)
-    {
-        $this->entityClass = $entityClass;
-        $this->name = $name;
-        $this->alias = $alias;
-        $this->entityResolver = $resolver;
-    } 
+    public function __construct(
+        public string $name,
+        public string $entityClass,
+        public ? string $alias,
+        protected EntityResolver $entityResolver,
+        protected bool $select = false
+    ) {}

    public function name($useAlias = true) : string
    {
@@ -32,7 +24,17 @@ class EntityField implements WhereRawParameter

        $name = $this->entityResolver->databaseAdapter()->adapter()->escapeIdentifier($name, AdapterInterface::IDENTIFIER_FIELD);

-        return $useAlias && $this->alias ? "{$this->alias}.$name" : $name;
+        $fullname = $useAlias && $this->alias ? "{$this->alias}.$name" : $name;
+
+        if ($this->select) {
+            $select = $this->entityResolver->searchFieldAnnotation($this->name, [Field\Select::class]);
+
+            if ($select) {
+                return "(" . str_replace(['%NAME%'], [$fullname], $select->sql) . ") AS code";
+            }
+        }
+
+        return $fullname;
    }

    public static function isScalarType($type) : bool
@@ -43,6 +45,7 @@ class EntityField implements WhereRawParameter
            case 'string':
            case 'float':
            case 'double':
+            case 'mixed':
                return true;
        }

@@ -5,6 +5,7 @@ namespace Ulmus\Common;
 use Notes\Common\ReflectedClass;
 use Notes\Common\ReflectedProperty;
 use Psr\SimpleCache\CacheInterface;
+use Ulmus\Attribute\Obj\Index;
 use Ulmus\Ulmus,
    Ulmus\Attribute\Obj\Table,
    Ulmus\Attribute\Obj\AdapterAttributeInterface,
@@ -72,7 +73,6 @@ class EntityResolver {
                            $key = strtolower($item->name);
                            break;

-
                        case static::KEY_ENTITY_NAME:
                            $key = $item->name;
                        break;
@@ -95,7 +95,7 @@ class EntityResolver {
        return $fieldList;
    }

-    public function relation(string $name) : array
+    public function relation(string $name, bool $throwOnError = true) : ? array
    {
        $property = $this->reflectedClass->getProperties(true)[$name] ?? false;

@@ -111,8 +111,22 @@ class EntityResolver {
            return [];
        }
        catch(\Throwable $e) {
-            throw new \InvalidArgumentException("Can't find entity relation's column named `$name` from entity {$this->entityClass}");
+            $throwOnError && throw new \InvalidArgumentException("Can't find entity relation's column named `$name` from entity {$this->entityClass}");
        }
+
+        return null;
+    }
+
+    public function getPropertyHavingAttribute(array|object|string $type) : array
+    {
+        return array_filter(array_map(
+            fn($e) => $e->getAttributes(is_object($type) ? $type::class : $type), $this->reflectedClass->getProperties(true)
+        ));
+    }
+
+    public function getPropertyEntityType(string $name) : false|string
+    {
+        return $this->reflectedClass->getProperties(true)[$name]->getTypes()[0]->type ?? false;
    }

    public function searchFieldAnnotation(string $field, array|object|string $annotationType, bool $caseSensitive = true) : ? object
@@ -215,9 +229,9 @@ class EntityResolver {
        return null;
    }
    
-    public function getCompoundKeyFields() : ? array
+    public function getCompoundKeyFields() : ? Index
    {
-        return null;
+        return $this->getAttributeImplementing(Index::class);
    }
    
    public function getUniqueFields() : ? array
@@ -19,7 +19,7 @@ class PdoObject extends PDO {

    public function select(string $sql, array $parameters = []): PDOStatement
    {
-        static::$dump && call_user_func_array(static::$dump, [ $sql, $parameters ]);
+        static::$dump && call_user_func_array(static::$dump, [ $this->fillDebugSqlParameters($sql, $parameters) ]);

        try {
            if (false !== ( $statement = $this->prepare($sql) )) {
@@ -43,15 +43,20 @@ class PdoObject extends PDO {

    public function runQuery(string $sql, array $parameters = []): ? static
    {
-        static::$dump && call_user_func_array(static::$dump, [ $sql, $parameters ]);
+        static::$dump && call_user_func_array(static::$dump, [ $this->fillDebugSqlParameters($sql, $parameters) ]);

        try {
            if (false !== ( $statement = $this->prepare($sql) )) {
                return $this->execute($statement, $parameters, true);
            }
        }
+        catch(\PDOException $pdo) {
+            if (!str_starts_with($pdo->getMessage(), 'There is no active transaction')) {
+                throw $pdo;
+            }
+        }
        catch (\Throwable $e) {
-            throw new \PdoException($e->getMessage() . " `$sql` with data:" . json_encode($parameters));
+            throw new \PdoException($e->getMessage() . " `$sql` with data:" . json_encode($parameters), (int) $e->getCode(), $e);
        }
        
        return null;
@@ -78,7 +83,7 @@ class PdoObject extends PDO {
        $this->lastInsertId = null;

        try {
-            if ( ! $this->inTransaction() ) {
+            if (! $this->inTransaction()) {
                $this->beginTransaction();
            }

@@ -105,11 +110,6 @@ class PdoObject extends PDO {

            throw $e;
        }
-        catch (\Throwable $e) {
-            throw $e;
-        }
-
-        return null;
    }

    protected function bindVariables(PDOStatement $statement, array &$parameters) : void
@@ -120,27 +120,24 @@ class PdoObject extends PDO {
            }
            else {
                foreach ($parameters as $key => $value) {
-                    switch (strtolower(gettype($value))) {
-                            #$type = Pdo::PARAM_BOOL;
-                            #break;
-
-                        case "boolean":
-                        case "integer":
-                            $type = Pdo::PARAM_INT;
-                            break;
-
-                        case "null":
-                            $type = Pdo::PARAM_NULL;
-                            break;
-
-                        case "string":
-                        default:
-                            $type = Pdo::PARAM_STR;
-                    }
+                    $type = match (strtolower(gettype($value))) {
+                        "boolean", "integer" => Pdo::PARAM_INT,
+                        "null" => Pdo::PARAM_NULL,
+                        default => Pdo::PARAM_STR,
+                    };

                    $statement->bindValue($key, $value, $type);
                }
            }
        }
    }
+
+    protected function fillDebugSqlParameters(string $sql, array $parameters) : string
+    {
+        $parameters = array_reverse($parameters);
+
+        return str_replace(array_keys($parameters), array_map(fn($e) => is_numeric($e) ? $e : (
+            is_bool($e)  ? (int) $e : $this->quote($e)
+        ), array_values($parameters)), $sql);
+    }
 }
@@ -12,7 +12,7 @@ class SqlPdoObject extends \Ulmus\Common\PdoObject
            return $this->openTransaction();
        }

-        return $this->exec('SAVEPOINT transaction_'.$this->openedTransaction) !== false;
+        return $this->exec("SAVEPOINT transaction_{$this->openedTransaction}") !== false;
    }

    public function commit() : bool
@@ -21,16 +21,19 @@ class SqlPdoObject extends \Ulmus\Common\PdoObject
            return parent::commit();
        }

-        return false;
+        return $this->exec("RELEASE SAVEPOINT transaction_{$this->openedTransaction}") !== false;
    }

    public function rollback() : bool
    {
-        if (0 !== $this->openedTransaction) {
+        if ($this->openedTransaction > 1) {
            return $this->exec('ROLLBACK TO transaction_' . $this->openedTransaction--) !== false;
        }
+        elseif ($this->openedTransaction-- === 1) {
+            return parent::rollback();
+        }

-        return parent::rollback();
+        return false;
    }

    protected function openTransaction() : bool
@@ -17,6 +17,19 @@ class SqlitePdoObject extends SqlPdoObject
            return $this->exec("COMMIT") !== false;
        }

+        return $this->exec("RELEASE SAVEPOINT transaction_{$this->openedTransaction}") !== false;
+    }
+
+    public function rollback() : bool
+    {
+        if ($this->openedTransaction > 1) {
+            return $this->exec('ROLLBACK TO transaction_' . $this->openedTransaction--) !== false;
+        }
+        elseif ($this->openedTransaction-- === 1) {
+            # We must do it manually since opening a transaction manually stucks PDO into thinking we've got no transaction opened
+            return $this->exec('ROLLBACK') !== false;
+        }
+
        return false;
    }

@@ -84,8 +84,12 @@ abstract class Sql {
        return $value;
    }

-    public static function parameter($value) : string
+    public static function collate(string $name) : object
    {
+        if ( ! preg_match('/^[a-z0-9$_]+$/i',$name) ) {
+            throw new \InvalidArgumentException(sprintf("Given identifier '%s' should contains supported characters in function name (a-Z, 0-9, $ and _)", $name));
+        }

+        return static::raw(sprintf("COLLATE %s", $name));
    }
 }
@@ -2,26 +2,21 @@

 namespace Ulmus;

+use Psr\SimpleCache\CacheInterface;
 use Ulmus\Adapter\AdapterInterface;

-use Ulmus\Common\PdoObject;
-
 class ConnectionAdapter
 {
-    public string $name;
-
-    public array $configuration;
-
    protected AdapterInterface $adapter;

-    protected PdoObject $pdo;
-
-    public function __construct(string $name = "default", array $configuration = [], bool $default = false)
-    {
-        $this->name = $name;
-        
-        $this->configuration = $configuration;
+    protected \PDO $pdo;

+    public function __construct(
+        public string $name = "default",
+        protected array $configuration = [],
+        public bool $default = false,
+        public ? CacheInterface $cacheObject = null
+    ) {
        Ulmus::registerAdapter($this, $default);
    }

@@ -30,6 +25,10 @@ class ConnectionAdapter
        $connection = $this->configuration['connections'][$this->name] ?? [];

        if ( false !== ( $adapterName = $connection['adapter'] ?? false ) ) {
+            if (is_array($adapterName)) {
+                throw new \InvalidArgumentException(sprintf("Given adapter (%s) name is an array, not a string.. received : %s.", $this->name, json_encode($adapterName)));
+            }
+
            $this->adapter = $this->instanciateAdapter($adapterName);
        }
        else {
@@ -62,7 +61,7 @@ class ConnectionAdapter
        return $this->adapter;
    }
    
-    public function pdo() : PdoObject
+    public function pdo() : \PDO
    {
        return $this->pdo ?? $this->connect()->pdo;
    }
@@ -2,12 +2,27 @@

 namespace Ulmus\Container;

+use Ulmus\ConnectionAdapter;
+
 class AdapterProxy
 {
    public array $connections = [];

    public function __construct(...$arguments)
    {
-        $this->connections = $arguments;
+        $this->push(array_filter($arguments));
+    }
+
+    public function push(array|ConnectionAdapter $connection) : void
+    {
+        foreach((array) $connection as $adapter) {
+            foreach($this->connections as $existing) {
+                if ($adapter === $existing) {
+                    continue 2;
+                }
+            }
+
+            $this->connections[] = $adapter;
+        }
    }
 }
@@ -0,0 +1,27 @@
+<?php
+
+namespace Ulmus\Entity;
+
+use Ulmus\EntityCollection;
+
+class ArrayCollection extends EntityCollection implements JsonUnserializable
+{
+    public function jsonUnserialize(array $json): void
+    {
+        $this->fromArray($json);
+    }
+
+    public function jsonSerialize(): mixed
+    {
+        return $this->getArrayCopy();
+    }
+
+    public function fromArray(array $datasets, ? string /*stringable*/ $entityClass = null) : self
+    {
+        foreach($datasets as $dataset) {
+            \ArrayObject::append($dataset);
+        }
+
+        return $this;
+    }
+}
@@ -17,7 +17,7 @@ class DatasetHandler
        protected bool $entityStrictFieldsDeclaration = false,
    ) {}

-    public function pull(object $entity) : Generator
+    public function pull(object $entity, bool $nullable = true) : Generator
    {
        foreach($this->entityResolver->fieldList(EntityResolver::KEY_ENTITY_NAME, true) as $key => $field) {
            $attribute = $this->entityResolver->searchFieldAnnotation($key,[ Field::class ]);
@@ -25,7 +25,7 @@ class DatasetHandler
            if ( $entity->__isset($key) ) {
                yield $attribute->name ?? $key => $entity->$key;
            }
-            elseif ( $field->allowsNull() ) {
+            elseif ( $nullable && $field->allowsNull() ) {
                yield $attribute->name ?? $key => null;
            }
        }
@@ -56,7 +56,10 @@ class DatasetHandler
            }
            elseif ( $field->expectType('array') ) {
                if ( is_string($value)) {
-                    if (substr($value, 0, 1) === "a") {
+                    if (empty($value)) {
+                        yield $field->name => [];
+                    }
+                    elseif (substr($value, 0, 1) === "a") {

                        yield $field->name => unserialize($value);
                    }
@@ -75,7 +78,6 @@ class DatasetHandler
                }
            }
            elseif ( EntityField::isScalarType($type->type) ) {
-
                if ( $type->type === 'string' ) {
                    $attribute = $this->entityResolver->searchFieldAnnotation($field->name, [ Field::class ] );

@@ -99,8 +101,10 @@ class DatasetHandler
                try {
                    yield $field->name => Ulmus::instanciateObject($type->type, [ $value ]);
                }
-                catch(\Error $e) {
-                    throw new \Error(sprintf("%s for class '%s' on field '%s'", $e->getMessage(), get_class($this), $field->name));
+                catch(\Throwable $e) {
+                    $type = $e::class;
+
+                    throw new $type(sprintf("%s for class '%s' on field '%s'", $e->getMessage(), get_class($this), $field->name), 101, $e);
                }
            }
        }
@@ -108,15 +112,17 @@ class DatasetHandler
        return $unmatched;
    }

-    public function pullRelation(object $entity) : Generator
+    public function pullRelation(object $entity, bool $onlyPreviouslyLoaded = true) : Generator
    {
-        foreach($this->entityResolver->reflectedClass->getProperties(true) as $name => $field){
+        foreach($this->entityResolver->reflectedClass->getProperties(true) as $name => $field) {
            $relation = $this->entityResolver->searchFieldAnnotation($name, [ Relation::class ] );

            if ($relation) {
                $ignore = $this->entityResolver->searchFieldAnnotation($name, [ Relation\Ignore::class ] );

-                if ($ignore && $ignore->ignoreExport) {
+                $load = $onlyPreviouslyLoaded ? (new \ReflectionProperty($entity::class, $name))->isInitialized($entity) : true;
+
+                if ( ! $load || ( $ignore && $ignore->ignoreExport ) ) {
                    if ( $relation->isOneToOne() ) {
                        # @TODO TO INCLUDED INTO getTypes() RETURNED CLASS WHEN DONE !
                        yield $name => ( new \ReflectionClass($field->getTypes()[0]) )->newInstanceWithoutConstructor();
@@ -129,9 +135,10 @@ class DatasetHandler
                    continue;
                }

-                # @TODO Must fix recursive bug.. this last check is way too basic to work
                if ( $entity->__isset($name) && ($relation->entity ?? $relation->bridge) !== static::class ) {
-                    if ( null !== $value = $entity->__isset($name) ?? null ) {
+                    $value = $entity->$name ?? null;
+
+                    if ( null !== $value ) {
                        if ( is_iterable($value) ) {
                            $list = [];

@@ -3,18 +3,22 @@
 namespace Ulmus\Entity;

 use Ulmus\Common\{ EntityField, EntityResolver };
-use Ulmus\{ ConnectionAdapter, EntityCollection, QueryBuilder\QueryBuilderInterface, Repository };
+use Ulmus\{ConnectionAdapter,
+    EntityCollection,
+    QueryBuilder\QueryBuilderInterface,
+    Repository,
+    SearchRequest\SearchableInterface};

-interface EntityInterface /* extends \JsonSerializable */
+interface EntityInterface extends SearchableInterface /* extends \JsonSerializable */
 {
    public function fromArray(iterable $dataset) : static;
    public function entityGetDataset(bool $includeRelations = false, bool $returnSource = false) : array;
-    public function toArray($includeRelations = false, array $filterFields = null) : array;
+    public function toArray($includeRelations = false, array $filterFields = []) : array;
    public function toCollection() : EntityCollection;
    public function isLoaded() : bool;
    public function jsonSerialize() : mixed;
    public static function resolveEntity() : EntityResolver;
-    public static function repository(string $alias = Repository::DEFAULT_ALIAS, ConnectionAdapter $adapter = null) : Repository;
+    public static function repository(string $alias = Repository::DEFAULT_ALIAS, ?ConnectionAdapter $adapter = null) : Repository;
    public static function entityCollection(...$arguments) : EntityCollection;
    public static function queryBuilder() : QueryBuilderInterface;
    public static function field($name, null|string|false $alias = Repository::DEFAULT_ALIAS) : EntityField;
@@ -3,6 +3,6 @@
 namespace Ulmus\Entity;

 interface EntityObjectInterface {
-    public function load(...$arguments);
+    public function load(mixed ...$arguments);
    public function save();
 }
@@ -0,0 +1,8 @@
+<?php
+
+namespace Ulmus\Entity;
+
+interface EntityValueModifier {
+    public function push(mixed $value, \Notes\Common\ReflectedProperty $property) : mixed;
+    public function pull(mixed $value, \Notes\Common\ReflectedProperty $property) : mixed;
+}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Ulmus\Entity\Field;
+
+class Date extends DatetimeImmutable {
+    
+    public string $format = "Y-m-d";
+}
@@ -4,47 +4,6 @@ namespace Ulmus\Entity\Field;

 use Ulmus\Entity\EntityObjectInterface;

-class Datetime extends \DateTime implements EntityObjectInterface {
-
-    public string $format = "Y-m-d H:i:s";
-
-    public function load(...$arguments)
-    {
-        $value = $arguments[0];
-
-        try {
-            # From Timestamp
-            if ( is_numeric($value) ) {
-                $obj = new static("@$value");
-            }
-            else {
-                $obj = new static($value);
-            }
-        }
-        catch(\Throwable $ex) {
-            throw new \Exception(sprintf("An error occured trying to instanciate from '%s'. %s", $value, $ex->getMessage()), $ex->getCode(), $ex);
-        }
-
-        return $obj;
-    }
-
-    public function save()
-    {
-        return $this->__toString();
-    }
-
-    public function __toString()
-    {
-        return $this->format($this->format);
-    }
-
-    public function formatLocale(string $format) : string
-    {
-        return strftime($format, $this->getTimestamp());
-    }
-
-    public function ageAt(null|\DateTime $dateTime) : int
-    {
-        return (int) ( (int) ($dateTime ?: new DateTime())->format('Ymd') - (int) $this->format('Ymd') ) / 10000;
-    }
+class Datetime extends \DateTime implements EntityObjectInterface, \JsonSerializable {
+    use DatetimeTrait;
 }
@@ -0,0 +1,9 @@
+<?php
+
+namespace Ulmus\Entity\Field;
+
+use Ulmus\Entity\EntityObjectInterface;
+
+class DatetimeImmutable extends \DateTimeImmutable implements EntityObjectInterface {
+    use DatetimeTrait;
+}
@@ -0,0 +1,68 @@
+<?php
+
+namespace Ulmus\Entity\Field;
+
+trait DatetimeTrait
+{
+    public string $format = "Y-m-d H:i:s";
+
+    public function load(mixed ...$arguments)
+    {
+        $value = $arguments[0];
+
+        try {
+            # From Timestamp
+            if ( is_numeric($value) ) {
+                $obj = new static("@$value");
+            }
+            else {
+                $obj = new static($value);
+            }
+        }
+        catch(\Throwable $ex) {
+            throw new \Exception(sprintf("An error occured trying to instanciate from '%s'. %s", $value, $ex->getMessage()), $ex->getCode(), $ex);
+        }
+
+        return $obj;
+    }
+
+    public function setTime($hour, $minute, $second = 0, $microsecond = 0) : \DateTime
+    {
+        $fromParent = parent::setTime($hour, $minute, $second, $microsecond);
+
+        return new static($fromParent);
+    }
+
+    public function save()
+    {
+        return $this->__toString();
+    }
+
+    public function __toString()
+    {
+        return $this->format($this->format);
+    }
+
+    #[\Deprecated]
+    public function formatLocale(string $format) : string
+    {
+        return strftime($format, $this->getTimestamp());
+    }
+
+    public function formatLocaleIntl(int $dateFormatter = \IntlDateFormatter::LONG, int $timeFormatter = \IntlDateFormatter::NONE, ? string $pattern = null) : string
+    {
+        $formatter = new \IntlDateFormatter(\Locale::getDefault(), $dateFormatter, $timeFormatter, \date_default_timezone_get(), \IntlDateFormatter::GREGORIAN, $pattern);
+
+        return $formatter->format($this->getTimestamp());
+    }
+
+    public function ageAt(null|\DateTime $dateTime) : int
+    {
+        return (int) ( (int) ($dateTime ?: new DateTime())->format('Ymd') - (int) $this->format('Ymd') ) / 10000;
+    }
+
+    public function jsonSerialize(): mixed
+    {
+        return $this;
+    }
+}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Ulmus\Entity\Field;
+
+class Time extends DatetimeImmutable {
+    
+    public string $format = "H:i:s";
+}
@@ -5,17 +5,14 @@ namespace Ulmus\Entity\InformationSchema;
 use Notes\Common\ReflectedProperty;
 use Ulmus\Entity\Field\Datetime;

-use Ulmus\{Attribute\Obj\Table};
+use Ulmus\{Attribute\Obj\Table, Entity\EntityInterface};
 use Ulmus\Attribute\Property\{Field, Filter, FilterJoin, Relation, Join, Virtual, Where};

 #[Table(name: "columns", database: "information_schema")]
-class Column
+class Column implements EntityInterface
 {
    use \Ulmus\EntityTrait;

-    #[Field\Id]
-    public ? id $srs_id;
-
    #[Field(name: "TABLE_CATALOG", length: 512)]
    public string $tableCatalog;

@@ -64,36 +61,27 @@ class Column
 #    #[Field(name: "COLLATION_TYPE", type: "longtext")]
 #    public string $type;

-    #[Field(name: "COLUMN_KEY", length: 3)]
-    public string $key;
-
-    #[Field(name: "EXTRA", length: 30)]
-    public string $extra;
-
-    #[Field(name: "PRIVILEGES", length: 80)]
-    public string $privileges;
-
-    #[Field(name: "COLUMN_COMMENT", length: 1024)]
-    public string $comment;

 #    #[Field(name: "IS_GENERATED", length: 6)]
 #    public string $generated;

-    #[Field(name: "GENERATION_EXPRESSION", type: "longtext")]
-    public ? string $generationExpression;
-
    public function matchFieldDefinition(ReflectedProperty $definition) : bool
    {
-        if ($this->nullable === $definition->allowsNull()) {
+        $nullable = $this->nullable === 'YES';
+
+        $definitionValue = $this->getDefinitionValue($definition);
+
+        if ($nullable !== $definition->allowsNull()) {
            return false;
        }

-        if (isset($definition->value)) {
-            if ( $definition->value !== $this->defaultValue()) {
+        if ( isset($definitionValue) && $this->canHaveDefaultValue() ) {
+            if ( $definitionValue !== $this->defaultValue() ) {
+                # dump($definition->value, $this->defaultValue(), $definition->name);
                return false;
            }
        }
-        elseif (! isset($definition->value)) {
+        elseif (! isset($definitionValue)) {
            if ( ! $this->defaultValueIsNull() ) {
                return false;
            }
@@ -102,6 +90,12 @@ class Column
        return true;
    }

+    protected function getDefinitionValue(ReflectedProperty $definition) : mixed
+    {
+        # Attribute's value first, then defined in class value
+        return $definition->getAttribute(Field::class)->object->default ?? $definition->value ?? null;
+    }
+
    protected function defaultValueIsNull() : bool
    {
        return $this->defaultValue() === null;
@@ -115,4 +109,9 @@ class Column

        return $this->default;
    }
+
+    protected function canHaveDefaultValue() : bool
+    {
+        return true;
+    }
 }
@@ -5,11 +5,11 @@ namespace Ulmus\Entity\InformationSchema;
 use Ulmus\EntityCollection,
    Ulmus\Entity\Field\Datetime;

-use Ulmus\{Attribute\Obj\Table as TableObj};
+use Ulmus\{Attribute\Obj\Table as TableObj, Entity\EntityInterface};
 use Ulmus\Attribute\Property\{Field, Filter, FilterJoin, Relation, Join, Virtual, Where};

 #[TableObj(name: "tables", database: "information_schema")]
-class Table
+class Table implements EntityInterface
 {
    use \Ulmus\EntityTrait;

@@ -83,6 +83,12 @@ class Table
    public ? string $temporary;

    #[Relation(type: "oneToMany", key: "name", foreignKey: [ Column::class, 'tableName' ], entity: Column::class)]
-    #[Where('TABLE_SCHEMA', fieldValue: [ Column::class, 'tableSchema' ])]
+    #[Where(field: 'TABLE_SCHEMA', generateValue: [ Table::class, 'getSchema' ])]
    public EntityCollection $columns;
+
+    # Awaiting PHP 8.5 https://wiki.php.net/rfc/closures_in_const_expr
+    public static function getSchema(Table $entity) : string
+    {
+        return $entity->schema;
+    }
 }
@@ -0,0 +1,8 @@
+<?php
+
+namespace Ulmus\Entity;
+
+interface JsonUnserializable extends \JsonSerializable
+{
+    public function jsonUnserialize(array $json): void;
+}
@@ -0,0 +1,14 @@
+<?php
+
+namespace Ulmus\Entity\Mariadb;
+
+use Ulmus\Attribute\Property\Field;
+
+class Column extends \Ulmus\Entity\Mysql\Column
+{
+    #[Field\Id]
+    public ? id $srs_id;
+
+    #[Field(name: "GENERATION_EXPRESSION", type: "longtext")]
+    public ? string $generationExpression;
+}
@@ -0,0 +1,85 @@
+<?php
+
+namespace Ulmus\Entity\Mssql;
+
+use Ulmus\Attribute\Obj\Table as TableObj;
+use Ulmus\Attribute\Property\Field;
+use Ulmus\ConnectionAdapter;
+use Ulmus\Entity\Mysql\id;
+use Ulmus\Repository;
+use Ulmus\Ulmus;
+
+#[TableObj(name: "columns", schema: "information_schema")]
+class Column extends \Ulmus\Entity\InformationSchema\Column
+{
+    /*
+    public static function repository(string $alias = Repository::DEFAULT_ALIAS, ConnectionAdapter $adapter = null): Repository
+    {
+        $adapter = Ulmus::$registeredAdapters[$this->loadedFromAdapter];
+
+        return Ulmus::repository(static::class, $alias, $adapter);
+    }*/
+
+    # TODO ! Handle FUNCTIONAL default value
+    protected function canHaveDefaultValue(): bool
+    {
+        return ! in_array(strtoupper($this->dataType), [
+            # 'BLOB', 'TINYBLOB', 'MEDIUMBLOB', 'LONGBLOB', 'JSON', 'TEXT', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'GEOMETRY'
+        ]);
+    }
+
+    protected function defaultValue() : mixed
+    {
+        if ($this->default === null) {
+            return null;
+        }
+
+        # Removing first pairs of brackets
+        $default = $this->isBetween($this->default, '(', ')') ?  substr($this->default, 1, -1) : $this->default;
+
+        if ($default === "NULL") {
+            return null;
+        }
+
+        # Checking if another pairs of brackets surrounds the value
+        if ($this->isBetween($default, '(', ')')) {
+            $default = substr($default, 1, -1);
+
+            if (is_numeric($default)) {
+                return (int) $default;
+            }
+        }
+        elseif ($this->isBetween($default, "'", "'")) {
+            $default = new class($default) implements \Stringable {
+                public function __construct(
+                    private readonly string $default
+                ) {}
+
+                public function __toString(): string
+                {
+                    return substr($this->default, 1, -1);;
+                }
+            };
+        }
+        else {
+            $default = new class($default) implements \Stringable {
+                public function __construct(
+                    private readonly string $default
+                ) {}
+
+                public function __toString(): string
+                {
+                    return $this->default;
+                }
+            };
+        }
+
+        return (string) $default;
+    }
+
+    private function isBetween(string $str, string $first, string $last) : bool
+    {
+        return str_starts_with($str, $first) && str_ends_with($str, $last);
+    }
+
+}
@@ -0,0 +1,28 @@
+<?php
+
+namespace Ulmus\Entity\Mssql;
+
+use Ulmus\EntityCollection,
+    Ulmus\Entity\Field\Datetime;
+
+use Ulmus\{Attribute\Obj\Table as TableObj, Ulmus};
+use Ulmus\Attribute\Property\{Field, Filter, FilterJoin, Relation, Join, Virtual, Where};
+use Ulmus\Repository;
+
+#[TableObj(name: "tables", schema: "information_schema")]
+class Table extends \Ulmus\Entity\InformationSchema\Table
+{
+    #[Virtual(method: "filterColumns")]
+    public EntityCollection $columns;
+
+    public function filterColumns() : EntityCollection
+    {
+        $adapter = Ulmus::$registeredAdapters[$this->loadedFromAdapter];
+
+        return Column::repository(Repository\MssqlRepository::DEFAULT_ALIAS, $adapter)
+            ->select('*')
+            ->where('TABLE_NAME', $this->name )
+            ->and('TABLE_SCHEMA', $this->schema )
+            ->loadAll();
+    }
+}
@@ -0,0 +1,36 @@
+<?php
+
+namespace Ulmus\Entity\Mysql;
+
+use Ulmus\Attribute\Property\Field;
+
+class Column extends \Ulmus\Entity\InformationSchema\Column
+{
+    ##[Field\Id]
+    #public ? id $srs_id;
+
+    #[Field(name: "COLUMN_KEY", length: 3)]
+    public string $key;
+
+    #[Field(name: "EXTRA", length: 30)]
+    public string $extra;
+
+    #[Field(name: "PRIVILEGES", length: 80)]
+    public string $privileges;
+
+    #[Field(name: "COLUMN_COMMENT", length: 1024)]
+    public string $comment;
+
+    ##[Field(name: "GENERATION_EXPRESSION", type: "longtext")]
+    #public ? string $generationExpression;
+
+    # TODO ! Handle FUNCTIONAL default value
+    protected function canHaveDefaultValue(): bool
+    {
+        return ! in_array(strtoupper($this->dataType), [
+            'BLOB', 'TINYBLOB', 'MEDIUMBLOB', 'LONGBLOB', 'JSON', 'TEXT', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'GEOMETRY'
+        ]);
+    }
+
+
+}
@@ -0,0 +1,17 @@
+<?php
+
+namespace Ulmus\Entity\Mysql;
+
+use Ulmus\EntityCollection,
+    Ulmus\Entity\Field\Datetime;
+
+use Ulmus\{Attribute\Obj\Table as TableObj};
+use Ulmus\Attribute\Property\{Field, Filter, FilterJoin, Relation, Join, Virtual, Where};
+
+#[TableObj(name: "tables", database: "information_schema")]
+class Table extends \Ulmus\Entity\InformationSchema\Table
+{
+    #[Relation(type: "oneToMany", key: "name", foreignKey: [ Column::class, 'tableName' ], entity: Column::class)]
+    #[Where('TABLE_SCHEMA', generateValue: [ Table::class, 'getSchema' ])]
+    public EntityCollection $columns;
+}
@@ -8,14 +8,40 @@ class ObjectInstanciator {

    public function instanciate(string $type, array $arguments) : object
    {
-        if ( isset($this->objectCallbackDefinition[$type]) ) {
+        if (is_object($arguments[0]) && is_a($arguments[0], $type)) {
+            return $arguments[0];
+        }
+        elseif ( isset($this->objectCallbackDefinition[$type]) ) {
            return $this->objectCallbackDefinition[$type](...$arguments);
        }
-        elseif ( ($obj = new $type() ) instanceof EntityObjectInterface ) {
-            return $obj->load(...$arguments);
-        }
        else {
-            return new $type(...$arguments);
+            $reflect = new \ReflectionClass($type);
+
+            if ( is_a($type, EntityObjectInterface::class, true) ) {
+                try {
+                    $obj = $reflect->newInstance();
+                }
+                catch(\Throwable $t) {
+                    $obj = $reflect->newInstanceWithoutConstructor();
+                }
+
+                return $obj->load(...$arguments);
+            }
+            elseif ( is_a($type, JsonUnserializable::class, true)) {
+                try {
+                    $obj = $reflect->newInstance();
+                }
+                catch(\Throwable $t) {
+                    $obj = $reflect->newInstanceWithoutConstructor();
+                }
+
+                $obj->jsonUnserialize(json_decode($arguments[0], true));
+
+                return $obj;
+            }
+            else {
+                return new $type(...$arguments);
+            }
        }
    }
    
@@ -24,8 +50,14 @@ class ObjectInstanciator {
        if ( $obj instanceof EntityObjectInterface ) {
            return $obj->save();
        }
+        elseif ( $obj instanceof \JsonSerializable ) {
+            return json_encode($obj->jsonSerialize());
+        }
+        elseif ( $obj instanceof \Stringable ) {
+            return (string) $obj;
+        }

-        return (string) $obj;
+        throw new \InvalidArgumentException("Object %s could not be converted as an acceptable format.");
    }

    public function enum(\UnitEnum $obj)
@@ -5,11 +5,11 @@ namespace Ulmus\Entity\Sqlite;
 use Notes\Common\ReflectedProperty;
 use Ulmus\EntityCollection;

-use Ulmus\{Attribute\Obj\Table};
+use Ulmus\{Attribute\Obj\Table, Entity\EntityInterface};
 use Ulmus\Attribute\Property\{Field, Filter, FilterJoin, Relation, Join, Virtual, Where};

 #[Table]
-class Column
+class Column implements EntityInterface
 {
    use \Ulmus\EntityTrait;

@@ -4,11 +4,11 @@ namespace Ulmus\Entity\Sqlite;

 use Ulmus\EntityCollection;
 use Ulmus\Query\{From, Select};
-use Ulmus\{Attribute\Obj\Table, Repository, Ulmus};
+use Ulmus\{Attribute\Obj\Table, Entity\EntityInterface, Repository, Ulmus};
 use Ulmus\Attribute\Property\{Field, Filter, FilterJoin, Relation, Join, Virtual, Where};

 #[Table(name: "sqlite_master")]
-class Schema
+class Schema implements EntityInterface
 {
    use \Ulmus\EntityTrait;

@@ -9,7 +9,7 @@ use Ulmus\Repository;
 #[\Ulmus\Attribute\Obj\Table(name: "sqlite_master")]
 class Table extends Schema
 {
-    public static function repository(string $alias = Repository::DEFAULT_ALIAS, ConnectionAdapter $adapter = null): Repository
+    public static function repository(string $alias = Repository::DEFAULT_ALIAS, ?ConnectionAdapter $adapter = null): Repository
    {
        $repository = new class(static::class, $alias, $adapter) extends Repository\SqliteRepository
        {
@@ -11,11 +11,29 @@ class EntityCollection extends \ArrayObject implements \JsonSerializable {
    public static function instance(array $data = [], null|string $entityClass = null) : self
    {
        $instance = new static($data);
-        $instance->entityClass = $entityClass;
+
+        if ($entityClass) {
+            $instance->defineEntityClass($entityClass);
+        }

        return $instance;
    }

+    public function defineEntityClass(string $entityClass) : self
+    {
+        if ($this->entityClass !== null) {
+            throw new \LogicException("This methods should only be used to convert instantiated EntityCollection outside of entities.");
+        }
+
+        $this->entityClass = $entityClass;
+
+        foreach($this as &$arr) {
+            $arr = new $entityClass($arr);
+        }
+
+        return $this;
+    }
+
    public function filters(Callable $callback, bool $yieldValueOnly = false) : Generator
    {
        $idx = 0;
@@ -100,7 +118,7 @@ class EntityCollection extends \ArrayObject implements \JsonSerializable {
        return $this;
    }

-    public function removeOne($value, string $field, bool $strict = true) : ? object
+    public function removeOne($value, callable|string $field, bool $strict = true) : ? object
    {
        foreach($this->search($value, $field, $strict) as $key => $item) {
            $this->offsetUnset($key);
@@ -111,7 +129,7 @@ class EntityCollection extends \ArrayObject implements \JsonSerializable {
        return null;
    }

-    public function remove(/* mixed */ $value, string $field, bool $strict = true) : array
+    public function remove(/* mixed */ $value, callable|string $field, bool $strict = true) : array
    {
        $removed = [];

@@ -131,14 +149,21 @@ class EntityCollection extends \ArrayObject implements \JsonSerializable {
        return $this;
    }

-    public function search(mixed $value, string $field, bool $strict = true) : Generator
+    public function search(mixed $value, callable|string $field, bool $strict = true) : Generator
    {
-        foreach($this->filters(fn($v) => isset($v->$field) ? ( $strict ? $v->$field === $value : $v->$field == $value ) : false) as $key => $item) {
+        if (is_string($field)) {
+            $filtering = fn($v) => isset($v->$field) ? ($strict ? $v->$field === $value : $v->$field == $value) : false;
+        }
+        elseif (is_callable($field)) {
+            $filtering = fn($v) => ( $fieldValue = call_user_func($field, $v) ) !== null ? ($strict ? $fieldValue === $value : $fieldValue == $value) : false;
+        }
+
+        foreach($this->filters($filtering) as $key => $item) {
            yield $key => $item;
        }
    }

-    public function searchOne(mixed $value, string $field, bool $strict = true) : ? object
+    public function searchOne(mixed $value, callable|string $field, bool $strict = true) : ? object
    {
        # Returning first value only
        foreach($this->search($value, $field, $strict) as $item) {
@@ -148,7 +173,7 @@ class EntityCollection extends \ArrayObject implements \JsonSerializable {
        return null;
    }

-    public function searchAll(mixed $values, string $field, bool $strict = true, bool $compareArray = false) : self
+    public function searchAll(mixed $values, callable|string $field, bool $strict = true, bool $compareArray = false) : self
    {
        $collection = new static();

@@ -163,7 +188,7 @@ class EntityCollection extends \ArrayObject implements \JsonSerializable {
        return $collection;
    }

-    public function diffAll(mixed $values, string $field, bool $strict = true, bool $compareArray = false) : self
+    public function diffAll(mixed $values, callable|string $field, bool $strict = true, bool $compareArray = false) : self
    {
        $obj = new static($this->getArrayCopy());

@@ -343,7 +368,20 @@ class EntityCollection extends \ArrayObject implements \JsonSerializable {
            $list[] = $entity instanceof \JsonSerializable ? $entity->jsonSerialize() : $entity->toArray($includeRelations);
        }

-        return $list;
+        return $this->utf8ize($list, "UTF-8", "UTF-8");
+    }
+
+    protected function utf8ize(mixed $content) {
+        if (is_array($content)) {
+            foreach ($content as $key => $value) {
+                $content[$key] = $this->utf8ize($value);
+            }
+        }
+        elseif (is_string($content)) {
+            return mb_convert_encoding($content, "UTF-8", "UTF-8");
+        }
+
+        return $content;
    }

    public function fromArray(array $datasets, ? string /*stringable*/ $entityClass = null) : self
@@ -363,7 +401,7 @@ class EntityCollection extends \ArrayObject implements \JsonSerializable {

        $className = $entityClass ?: $this->entityClass;

-        return ( new $className() )->fromArray($dataset);
+        return new $className($dataset) ;
    }

    public function arrayToEntities(array $list, ? string /*stringable*/ $entityClass = null) : self
@@ -3,22 +3,18 @@
 namespace Ulmus;

 use Notes\Attribute\Ignore;
-use Psr\Http\Message\ServerRequestInterface;
-use Ulmus\{Attribute\Property\Join,
-    Attribute\Property\Relation,
+
+use Ulmus\{Attribute\Obj\JsonSerialize,
    Attribute\Property\ResettablePropertyInterface,
-    Attribute\Property\Virtual,
    Common\EntityResolver,
    Common\EntityField,
    Entity\DatasetHandler,
    Entity\EntityInterface,
    QueryBuilder\QueryBuilderInterface};
-use Ulmus\SearchRequest\{Attribute\SearchParameter,
-    SearchMethodEnum,
-    SearchRequestInterface,
-    SearchRequestFromRequestTrait,
-    SearchRequestPaginationTrait};

+use Ulmus\{Attribute\RegisterEntityEventInterface, Entity\EntityValueModifier, };
+
+#[JsonSerialize(includeRelations: true)]
 trait EntityTrait {
    use EventTrait;

@@ -32,7 +28,10 @@ trait EntityTrait {
    protected array $entityDatasetUnmatchedFields = [];

    #[Ignore]
-    protected DatasetHandler $datasetHandler;
+    public DatasetHandler $datasetHandler;
+
+    #[Ignore]
+    public string $loadedFromAdapter;

    #[Ignore]
    public function __construct(iterable|null $dataset = null)
@@ -43,27 +42,60 @@ trait EntityTrait {
    #[Ignore]
    public function initializeEntity(iterable|null $dataset = null) : void
    {
+        # Attributs can attach themselves on events thrown by this trait
+        $this->entityRegisterAttributes();
+
+        $this->datasetHandler = new DatasetHandler(static::resolveEntity(), $this->entityStrictFieldsDeclaration);
+
        if ($dataset) {
            $this->fromArray($dataset);
        }

-        $this->datasetHandler = new DatasetHandler(static::resolveEntity(), $this->entityStrictFieldsDeclaration);
-
        $this->resetVirtualProperties();
    }

+    #[Ignore]
+    public function entityRegisterAttributes() : void
+    {
+        foreach($this->resolveEntity()->reflectedClass->getProperties(true) as $field => $property) {
+            foreach($property->attributes as $tag) {
+                if ( $tag->object instanceof RegisterEntityEventInterface ) {
+                    $tag->object->attach($this, $field);
+                }
+            }
+        }
+    }
+
    #[Ignore]
    public function entityFillFromDataset(iterable $dataset, bool $overwriteDataset = false) : self
    {
+        $properties = $this->resolveEntity()->reflectedClass->getProperties(true);
        $loaded = $this->isLoaded();

-        $handler = $this->datasetHandler->push($dataset);
+        $generator = $this->datasetHandler->push($dataset);
+
+        foreach($generator as $field => $value) {
+            foreach($properties[$field]->attributes as $tag) {
+                if ( $tag->object instanceof EntityValueModifier ) {
+                    try {
+                        $value = $tag->object->push($value, $properties[$field]);
+                    }
+                    catch(\Throwable $ex) {
+                        throw new \LogicException(
+                            message: sprintf("An error occured trying to push an EntityValueModifier results : %s", $ex->getMessage()),
+                            code: $ex->getCode(),
+                            previous: $ex,
+                        );
+                    }
+                }
+            }

-        foreach($handler as $field => $value) {
            $this->$field = $value;
        }

-        $this->entityDatasetUnmatchedFields = $handler->getReturn();
+        $this->eventExecute(Event\Entity\DatasetFill::class, $generator, $this);
+
+        $this->entityDatasetUnmatchedFields = $generator->getReturn();

        # Keeping original data to diff on UPDATE query
        if ( ! $loaded ) {
@@ -83,19 +115,33 @@ trait EntityTrait {
            return $this->entityLoadedDataset;
        }

-        $dataset = [];
+        return iterator_to_array($this->entityYieldDataset($includeRelations, $rewriteValue));
+    }

+    #[Ignore]
+    protected function entityYieldDataset(bool $includeRelations = false, bool $rewriteValue = true) : \Generator
+    {
        foreach($this->datasetHandler->pull($this) as $field => $value) {
-            $dataset[$field] = $rewriteValue ? static::repository()->adapter->adapter()->writableValue($value) : $value;
+            yield $field => $rewriteValue ? static::repository()->adapter->adapter()->writableValue($value) : $value;
        }

        if ($includeRelations) {
            foreach($this->datasetHandler->pullRelation($this) as $field => $object) {
-                $dataset[$field] = $object;
+                yield $field => $object;
            }
        }
+    }

-        return $dataset;
+    #[Ignore]
+    public function entityGetDiffDataset() : array
+    {
+        $return = [];
+
+        foreach($this->datasetHandler->pull($this, false) as $field => $value) {
+             $return[$field] = static::repository()->adapter->adapter()->writableValue($value);
+        }
+
+        return $return;
    }

    #[Ignore]
@@ -103,7 +149,6 @@ trait EntityTrait {
    {
        foreach($this->resolveEntity()->reflectedClass->getProperties(true) as $field => $property) {
            foreach($property->attributes as $tag) {
-
                if ( $tag->object instanceof ResettablePropertyInterface ) {
                    unset($this->$field);
                }
@@ -124,7 +169,7 @@ trait EntityTrait {
    }

    #[Ignore]
-    public function toArray($includeRelations = false, array $filterFields = null, bool $rewriteValue = true) : array
+    public function toArray($includeRelations = false, array $filterFields = [], bool $rewriteValue = true) : array
    {
        $dataset = $this->entityGetDataset($includeRelations, false, $rewriteValue);

@@ -144,17 +189,31 @@ trait EntityTrait {
            return false;
        }

-        if ( null === $pkField = $this->resolveEntity()->getPrimaryKeyField($this) ) {
-            throw new Exception\EntityPrimaryKeyUnknown(sprintf("Entity %s has no field containing attributes 'primary_key'", static::class));
+        if ( null === $pkField = $this->resolveEntity()->getPrimaryKeyField() ) {
+            if ( null !== $compoundKeyFields = $this->resolveEntity()->getCompoundKeyFields() ) {
+                $loaded = false;
+
+                foreach ($compoundKeyFields->column as $column) {
+                    $field = $this->resolveEntity()->field($column);
+
+                    if (! $field->allowsNull() ) {
+                        $loaded |= isset($this->{$field->name});
+                    }
+                }
+
+                return $loaded;
+            };
+        }
+        else {
+            $key = key($pkField);
+            return isset($this->$key);
        }

-        $key = key($pkField);
-
-        return isset($this->$key);
+        throw new Exception\EntityPrimaryKeyUnknown(sprintf("Entity %s has no field containing attributes 'primary_key'", static::class));
    }

    #[Ignore]
-    public function __get(string $name)
+    public function __get(string $name) : mixed
    {
        $relation = new Repository\RelationBuilder($this);

@@ -170,11 +229,21 @@ trait EntityTrait {
    {
        $rel = static::resolveEntity()->searchFieldAnnotation($name, [ Attribute\Property\Relation::class ]);

-        if ( $this->isLoaded() && $rel ) {
+        if ( $rel && $this->isLoaded() ) {
            return true;
        }

-        return isset($this->$name);
+        if (isset($this->$name)) {
+            return true;
+        }
+
+        # Unexisting variable
+        if (! new \ReflectionClass($this)->hasProperty($name)) {
+            return false;
+        }
+
+        # Handling undefined 'nullable'
+        return new \ReflectionProperty($this, $name)->isInitialized($this);
    }

    #[Ignore]
@@ -199,10 +268,57 @@ trait EntityTrait {
        }
    }

+    #[Ignore]
+    public function __debugInfo() : array
+    {
+        try {
+            return $this->toArray(true) ;
+        }
+        catch (\Throwable $ex) {
+            return $this->entityGetDataset(false, true);
+        }
+
+        return [ "An error occured trying to export this dataset..." ];
+    }
+
    #[Ignore]
    public function jsonSerialize() : mixed
    {
-        return $this->entityGetDataset(true, false, false);
+        # Allows overridding of this method
+        return $this->_jsonSerialize();
+    }
+
+    #[Ignore]
+    public function _jsonSerialize() : mixed
+    {
+        $resolver = static::resolveEntity();
+        $objectAttribute = $resolver->getAttributeImplementing(JsonSerialize::class);
+
+        $dataset = [];
+
+        foreach($this->entityYieldDataset($objectAttribute->includeRelations ?? true, false, false) as $key => $value) {
+            $field = $resolver->searchField($key, EntityResolver::KEY_COLUMN_NAME); # ?: $resolver->relation($key, false);
+
+            if ($field) {
+                $jsonSerialize = $field->getAttribute(\Ulmus\Attribute\Property\JsonSerialize::class);
+
+                if ($jsonSerialize) {
+                    # Should we ignore the field ?
+                    if ($jsonSerialize->object->ignoreField) {
+                        continue;
+                    }
+                }
+            }
+
+            if (is_object($value) && ($value instanceof \JsonSerializable) ) {
+                $dataset[$key] = $value->jsonSerialize();
+            }
+            else {
+                $dataset[$key] = $value;
+            }
+        }
+
+        return $dataset;
    }

    #[Ignore]
@@ -212,7 +328,7 @@ trait EntityTrait {
    }

    #[Ignore]
-    public static function repository(string $alias = Repository::DEFAULT_ALIAS, ConnectionAdapter $adapter = null) : Repository
+    public static function repository(string $alias = Repository::DEFAULT_ALIAS, ?ConnectionAdapter $adapter = null) : Repository
    {
        return Ulmus::repository(static::class, $alias, $adapter);
    }
@@ -233,25 +349,25 @@ trait EntityTrait {
    }

    #[Ignore]
-    public static function field($name, null|string|false $alias = Repository::DEFAULT_ALIAS) : EntityField
+    public static function field($name, null|string|false $alias = Repository::DEFAULT_ALIAS, bool $select = false) : EntityField
    {
-        $default = ( $alias === false ? '' : Repository::DEFAULT_ALIAS ); # bw compatibility, to be deprecated
+        $default = ( $alias === false ? '' : static::repository()::DEFAULT_ALIAS ); # bw compatibility, to be deprecated

        $alias = $alias ? Ulmus::repository(static::class)->adapter->adapter()->escapeIdentifier($alias, Adapter\AdapterInterface::IDENTIFIER_FIELD) : $default;

-        return new EntityField(static::class, $name, $alias, Ulmus::resolveEntity(static::class));
+        return new EntityField(
+            name: $name, entityClass: static::class, alias: $alias, entityResolver: Ulmus::resolveEntity(static::class), select: $select
+        );
    }

    #[Ignore]
-    public static function fields(array $fields, null|string|false $alias = Repository::DEFAULT_ALIAS, string $separator = ', ') : string
+    public static function fields(array $fields, null|string|false $alias = Repository::DEFAULT_ALIAS, string $separator = ', ', bool $select = false) : string
    {
-        return implode($separator, array_map(function($item) use ($alias){
-            return static::field($item, $alias);
-        }, $fields));
+        return implode($separator, array_map(fn($e) => static::field($e, $alias, $select), $fields));
    }

    #[Ignore]
-    public static function searchRequest(...$arguments) : SearchRequestInterface
+    public static function searchRequest(...$arguments) : SearchRequest\SearchRequestInterface
    {
        return new /* #[SearchRequest\Attribute\SearchRequestParameter(YourEntityClass::class)] */ class(... $arguments) extends SearchRequest\SearchRequest {
            # Define searchable properties here, some ex:
@@ -0,0 +1,7 @@
+<?php
+
+namespace Ulmus\Event\Entity;
+
+interface DatasetFill {
+    public function execute(\Generator $generator, \Ulmus\Entity\EntityInterface $entity) : void;
+}
@@ -0,0 +1,7 @@
+<?php
+
+namespace Ulmus\Event\Entity;
+
+interface DatasetPull {
+    public function execute(\Generator $generator, \Ulmus\Entity\EntityInterface $entity) : void;
+}
@@ -0,0 +1,9 @@
+<?php
+
+namespace Ulmus\Event\Query;
+
+use Ulmus\Repository\RepositoryInterface;
+
+interface Alter {
+    public function execute(RepositoryInterface $repository, array $fields) : void;
+}
Author	SHA1	Message	Date
Dave Mc Nicoll	9507a1e596	- fixed a changed interface execute() event	2026-10-22 19:43:31 +00:00
mcndave	f197443871	- Fixed setTime return value	2026-10-22 17:28:00 +00:00
Dave Mc Nicoll	f6bbdda137	- Fixed PDO return value of connect() in mssql	2026-10-22 17:24:04 +00:00
mcndave	eb505f4772	- Error message now more verbose	2026-10-22 17:24:04 +00:00
mcndave	25ab845886	- Working on revamping Ulmus bases classes	2026-10-22 17:24:04 +00:00
Dave Mc Nicoll	c417b00ed4	- Moved withJoin() method of repository into a trait	2026-10-22 17:16:36 +00:00
mcndave	caf5bd9664	- Fixed some missing operators in Having query	2026-07-17 10:10:37 -04:00
mcndave	9062a73ee6	- WIP on package manager	2026-07-16 14:21:04 -04:00
Dave Mc Nicoll	e5a842a812	- Splitted Datetime and added Immutable versions too	2026-07-14 18:21:05 +00:00
mcndave	13b7cf06f1	- ArrayOf errors now catched in EntityTrait (event soon to be attached to it) - Fixed some non-nullable defaulted to null vars in functions - Added a new diff method for entities which skips nullable values if they are not defined.	2026-07-13 12:33:40 +00:00
mcndave	709ed63323	- Still working on SearchRequest for optimized and more advanced query manipulations - Minor bugfixes in DatasetHandler and ObjectInstanciator	2026-07-01 13:00:01 -04:00
Dave Mc Nicoll	5d32d9f635	- Fixed MsSQL entity and searchRequest which caused buggy searchs	2026-06-19 19:44:41 +00:00
Dave Mc Nicoll	1e4a528d39	- Merged	2026-06-15 19:58:46 +00:00
Dev	2d86adc3e1	- Added some more info on a bad connection error	2026-06-09 19:27:17 +00:00
Dave Mc Nicoll	2a03789e7c	- Defined nullable adapter	2026-06-01 15:11:07 +00:00
Dave Mc Nicoll	1af0063203	- WIP on php8.5 migration	2026-05-22 20:36:35 +00:00
Dave Mc Nicoll	7b35de3258	- Work done on search request mostly	2026-05-21 15:19:35 +00:00
Dave Mc Nicoll	f938e18572	- Added a 'select' attribute, WIP on ArrayCollection and ArrayOf also	2026-04-24 19:26:02 +00:00
Dave Mc Nicoll	b394b9348f	- Specified a bit more how debug arguments are printed	2026-04-23 18:11:31 +00:00
mcndave	009e30eb7e	- Added ArrayOf attributes and DatasetFill/DatasetPull events. ArrayCollection is also working with ArrayOf attributes	2026-04-13 17:00:29 +00:00
Dave Mc Nicoll	fd5d31fa17	- Merged getValue override	2026-02-25 20:09:28 +00:00
Dev	b0b3aca6d9	- Fixed error throwing while building relation	2026-01-16 21:28:40 +00:00
mcndave	36162c6486	-Empty dataset can not be saved	2026-01-05 12:37:55 +00:00
Dev	11e436236c	- Heavy rework on search request handling of entities	2025-12-02 00:15:54 +00:00
Dev	a9b9c2cce9	- Heavy rework on search request handling of entities	2025-12-02 00:15:26 +00:00
Dave Mc Nicoll	cb125545c7	- WIP on search request handling of operators	2025-11-11 18:22:44 +00:00
Dave Mc Nicoll	2271b0b034	- Added a Trim PropertyValueModifier	2025-10-15 15:03:09 +00:00
Dave Mc Nicoll	2e45eba520	- Added some more debug info, fixed missing interface on Entity	2025-09-17 20:30:22 +00:00
mcndave	033a183269	- Fixed a bug with an incorrect execute	2025-07-22 13:14:41 +00:00
mcndave	0192975f10	- Removed 'change' form sql migration alter column in sqlite	2025-07-17 18:35:27 +00:00
mcndave	b33c67b594	- WIP on locale formatting since strftime is deprecated - Added Limit and Offset attributes in RelationBuilder	2025-07-14 16:54:45 +00:00
Dave Mc Nicoll	2f482324b2	- Added callable field in search, searchOne, remove, removeOne, etc...	2025-06-26 14:34:12 +00:00
Dave Mc Nicoll	a5d65025f8	- Fixed a bug within mssql migration	2025-06-20 13:11:56 +00:00
mcndave	b53327a6ed	- Refactored PdoObject class a bit	2025-06-10 14:46:37 +00:00
Dave Mc Nicoll	fb644b0b0a	- Added withJoin from attributes in RelationBuilder (can't understand why it wasn't already..)	2025-06-03 20:27:15 +00:00
Dave Mc Nicoll	c719e4a6d1	- WIp on Migration for mssql	2025-05-26 18:21:37 +00:00
Dave Mc Nicoll	fb4985160a	- WIP on Migration of MsSQL	2025-05-21 18:46:34 +00:00
Dave Mc Nicoll	c54de30069	- Fixed evalClosure() missing type which converted EntityField into string	2025-05-16 12:59:31 +00:00
Dave Mc Nicoll	8fff21ecb0	- Fixed RelationBuilder problem whenever a field wasn't set	2025-05-15 18:09:52 +00:00
Dave Mc Nicoll	cc6048d4ee	- WIP on migration and some bug fixes linked to withJoin() select problems	2025-05-15 18:05:23 +00:00
Dave Mc Nicoll	761e0401b0	- Fixed SQLite truncate, added AdapterProxy autoloading	2025-05-12 15:11:00 +00:00
Dave Mc Nicoll	1ec582d1ac	- Comparison made before transforming to string was skipping nulls and not nulls but empty	2025-04-03 19:38:48 +00:00
Dave Mc Nicoll	9556dea849	- Fixed a bug where withJoin() would mess with previous select() done on querybuilding - Fixed a problem related with distinct in select whenever another select on fields was done	2025-03-20 17:31:19 +00:00
Dave Mc Nicoll	bfddf84564	- Added partial support for Index as primary keys	2025-03-11 19:36:00 +00:00
Dave Mc Nicoll	e0ec140661	- Sqlite now handles concurrency with transactions	2025-02-25 14:09:41 +00:00
Dave Mc Nicoll	0fd6889c6f	- ID attribute is now readonly by default (since autoincremented)	2025-02-03 19:56:35 +00:00
mcndave	bd0d928f35	- Added SearchableInterace as base of EntityInterface	2024-12-16 19:44:07 +00:00
mcndave	5a5d326d70	- Merging	2024-12-16 18:57:01 +00:00
mcndave	b5e96eb7e0	- WIP on Collation	2024-12-16 18:46:24 +00:00
Dave Mc Nicoll	7c589ab7b4	- Fixed forgotten return value form listColumns in SQLite driver	2024-12-09 20:42:37 +00:00
Dave Mc Nicoll	589524ca3a	- Added limitation on fixedValue in Where attribute	2024-12-09 16:40:50 +00:00
Dave Mc Nicoll	1fac12c928	- Added relation's shortcut attributes	2024-12-02 21:36:03 +00:00
Dave Mc Nicoll	9eed2fe1a8	- Added caching mechanism as an event listener	2024-12-02 15:22:30 -05:00
mcndave	b601939459	- Bugfixes in search request, WIP on JsonTrait	2024-11-21 19:16:40 -05:00
mcndave	e3314f40ac	- WIP on JsonConditionTrait for SQL flavors that supports it; fixed a bug within Entity initialization from a new method to instanciate it which was implemented	2024-11-16 16:05:26 +00:00
mcndave	4ad44f73d7	- Fixed month() and days() format which were prepending zero ; adjusted to make it's behaviour like MySQL method	2024-11-14 13:40:47 +00:00
mcndave	68a6636c06	- Fixed a bug where default value was set to empty instead of nothing	2024-11-13 20:48:38 -05:00
Dave Mc Nicoll	70c6cde603	- Latest commit into this branch, merging after	2024-11-13 14:02:03 -05:00
Dave Mc Nicoll	079a3fd110	Merge branch 'notes-2.x' of https://git.mcnd.ca/mcndave/ulmus into notes-2.x	2024-11-11 20:42:51 +00:00
Dave Mc Nicoll	ec4d02b9d9	- Removed 'description' property and moved it into an appropriate attribute from lean-api package	2024-11-11 20:42:29 +00:00
Dave Mc Nicoll	35ceb97241	- Added Exists method	2024-11-10 13:08:05 +00:00
Dave Mc Nicoll	83f673b37f	- Mostly bug fixes done on this code push	2024-11-01 16:14:14 -04:00
Dave Mc Nicoll	411992c7a8	- Added a new Field Mapper to SQLs Adapters. - Defined missing MySQL fields attributes - WIP on lean-console's migration methods	2024-10-21 18:12:24 +00:00
Dave Mc Nicoll	5f4f23a8e4	- Allowed a JOINed entity to be null if nothing is loaded from a query and it's field is nullable	2024-10-14 16:32:23 +00:00
Dave Mc Nicoll	2fda7e82d7	Merge branch 'notes-2.x' of https://git.mcnd.ca/mcndave/ulmus into notes-2.x	2024-10-14 16:07:28 +00:00
Dave Mc Nicoll	573d4cc06b	- RelationBuilder now returns NULL if no entity were found AND given field is nullable	2024-10-14 16:07:12 +00:00