- Added some SearchRequest attributes ; now it's even simpler to add searchable fields

- Began decoupling of QueryBuilder from native MySQL method ; some works needs to be done on for the Repository object splitting also.

src/Adapter/DefaultAdapterTrait.php

@@ -0,0 +1,121 @@
+<?php
+
+namespace Ulmus\Adapter;
+
+use Ulmus\{ConnectionAdapter, Entity\InformationSchema\Table, Migration\FieldDefinition, Repository, QueryBuilder\MysqlQueryBuilder};
+
+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,
+        ]);
+    }
+}

src/Adapter/MsSQL.php

@@ -230,6 +230,6 @@ class MsSQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
 
     public function queryBuilderClass() : string
     {
-        return QueryBuilder\MssqlQueryBuilder::class;
+        return QueryBuilder\SqlQueryBuilder\MssqlQueryBuilder::class;
     }
 }

src/Adapter/MySQL.php

@@ -2,15 +2,11 @@
 
 namespace Ulmus\Adapter;
 
-use Ulmus\Entity\InformationSchema\Table;
 use Ulmus\Migration\MigrateInterface;
-use Ulmus\QueryBuilder;
-use Ulmus\Repository;
+use Ulmus\QueryBuilder\Sql;
 use Ulmus\Common\PdoObject;
 
 use Ulmus\Exception\AdapterConfigurationException;
-use Ulmus\Ulmus;
-use Ulmus\Migration\FieldDefinition;
 
 class MySQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
     use SqlAdapterTrait;
@@ -157,4 +153,10 @@ class MySQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
     {
         return "InnoDB";
     }
+
+    public function queryBuilderClass() : string
+    {
+        return Sql\MysqlQueryBuilder::class;
+    }
+
 }

src/Adapter/SQLite.php

@@ -5,10 +5,9 @@ namespace Ulmus\Adapter;
 use Ulmus\Common\PdoObject;
 use Ulmus\ConnectionAdapter;
 
-use Ulmus\Entity\Sqlite\Table;
-use Ulmus\Exception\AdapterConfigurationException;
+use Ulmus\Entity;
 use Ulmus\Migration\FieldDefinition;
-use Ulmus\{Migration\MigrateInterface, Repository, QueryBuilder, Ulmus};
+use Ulmus\{Migration\MigrateInterface, Repository, QueryBuilder};
 
 class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
     use SqlAdapterTrait;
@@ -90,9 +89,9 @@ class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface
 
     public function schemaTable(ConnectionAdapter $adapter, string $databaseName, string $tableName) : null|object
     {
-        return Table::repository(Repository::DEFAULT_ALIAS, $adapter)
+        return Entity\Sqlite\Table::repository(Repository::DEFAULT_ALIAS, $adapter)
             ->select(\Ulmus\Common\Sql::raw('this.*'))
-            ->loadOneFromField(Table::field('tableName'), $tableName);
+            ->loadOneFromField(Entity\Sqlite\Table::field('tableName'), $tableName);
     }
 
     public function mapFieldType(FieldDefinition $field, bool $typeOnly = false) : string
@@ -150,7 +149,7 @@ class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface
 
     public function queryBuilderClass() : string
     {
-        return QueryBuilder\SqliteQueryBuilder::class;
+        return QueryBuilder\Sql\SqliteQueryBuilder::class;
     }
 
     public function exportFunctions(PdoObject $pdo) : void
@@ -192,7 +191,7 @@ class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface
 
     public static function registerPragma(PdoObject $pdo, array $pragmaList) : void
     {
-        $builder = new QueryBuilder\SqliteQueryBuilder();
+        $builder = new QueryBuilder\Sql\SqliteQueryBuilder();
 
         foreach($pragmaList as $pragma) {
             list($key, $value) = explode('=', $pragma) + [ null, null ];

src/Adapter/SqlAdapterTrait.php

@@ -7,7 +7,7 @@ use Ulmus\{Common\Sql,
     Entity\InformationSchema\Table,
     Migration\FieldDefinition,
     Repository,
-    QueryBuilder,
+    QueryBuilder\SqlQueryBuilder,
     Ulmus};
 
 trait SqlAdapterTrait
@@ -19,7 +19,7 @@ trait SqlAdapterTrait
 
     public function queryBuilderClass() : string
     {
-        return QueryBuilder::class;
+        return SqlQueryBuilder::class;
     }
 
     public function tableSyntax() : array