Merge branch 'master' of https://git.mcnd.ca/mcndave/ulmus

src/Adapter/AdapterInterface.php

@@ -15,20 +15,7 @@ interface AdapterInterface {
     public function connect() : object /* | PdoObject|mixed */;
     public function buildDataSourceName() : string;
     public function setup(array $configuration) : void;
-    public function escapeIdentifier(string $segment, int $type) : string;
-    public function defaultEngine() : ? string;
-
     public function writableValue(/* mixed */ $value); /*: mixed*/
-    
-    
-    /*   public function databaseName() : string;
-    public function mapFieldType(FieldDefinition $field) : string;
-    public function schemaTable(string $databaseName, string $tableName) /*: object|EntityCollection
-*/
     public function repositoryClass() : string;
     public function queryBuilderClass() : string;
-    public function tableSyntax() : array;
-    public function whitelistAttributes(array &$parameters) : void;
-    public function generateAlterColumn(FieldDefinition $definition, array $field) : string|\Stringable;
-    public function splitAlterQuery() : bool;
 }

src/Adapter/MsSQL.php

@@ -9,10 +9,10 @@ use Ulmus\Exception\AdapterConfigurationException;
 use Ulmus\Ulmus;
 
 use Ulmus\Migration\FieldDefinition;
-use Ulmus\{Entity\InformationSchema\Table, Repository, QueryBuilder};
+use Ulmus\{Entity\InformationSchema\Table, Migration\MigrateInterface, Repository, QueryBuilder};
 
-class MsSQL implements AdapterInterface {
-    use DefaultAdapterTrait;
+class MsSQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
+    use SqlAdapterTrait;
 
     const ALLOWED_ATTRIBUTES = [
         'default', 'primary_key', 'auto_increment',

src/Adapter/MySQL.php

@@ -3,6 +3,7 @@
 namespace Ulmus\Adapter;
 
 use Ulmus\Entity\InformationSchema\Table;
+use Ulmus\Migration\MigrateInterface;
 use Ulmus\QueryBuilder;
 use Ulmus\Repository;
 use Ulmus\Common\PdoObject;
@@ -11,8 +12,8 @@ use Ulmus\Exception\AdapterConfigurationException;
 use Ulmus\Ulmus;
 use Ulmus\Migration\FieldDefinition;
 
-class MySQL implements AdapterInterface {
-    use DefaultAdapterTrait;
+class MySQL implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
+    use SqlAdapterTrait;
 
     const ALLOWED_ATTRIBUTES = [
         'default', 'primary_key', 'auto_increment', 'update',
@@ -21,13 +22,13 @@ class MySQL implements AdapterInterface {
     const DSN_PREFIX = "mysql";
 
     public string $hostname;
-    
+
     public string $database;
-    
-    public string $username;
-    
-    public string $password;
-    
+
+    protected string $username;
+
+    protected string $password;
+
     public string $charset = "utf8mb4";
 
     public ? string $socket;

src/Adapter/SQLite.php

@@ -8,10 +8,11 @@ use Ulmus\ConnectionAdapter;
 use Ulmus\Entity\Sqlite\Table;
 use Ulmus\Exception\AdapterConfigurationException;
 use Ulmus\Migration\FieldDefinition;
-use Ulmus\{Repository, QueryBuilder, Ulmus};
+use Ulmus\{Migration\MigrateInterface, Repository, QueryBuilder, Ulmus};
+
+class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface {
+    use SqlAdapterTrait;
 
-class SQLite implements AdapterInterface {
-    use DefaultAdapterTrait;
     const ALLOWED_ATTRIBUTES = [
         'default', 'primary_key', 'auto_increment'
     ];

src/Adapter/SqlAdapterInterface.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Ulmus\Adapter;
+
+interface SqlAdapterInterface
+{
+    public function escapeIdentifier(string $segment, int $type) : string;
+    public function defaultEngine() : ? string;
+}

src/Adapter/SqlAdapterTrait.php

@@ -2,14 +2,15 @@
 
 namespace Ulmus\Adapter;
 
-use Ulmus\{ConnectionAdapter,
+use Ulmus\{Common\Sql,
+    ConnectionAdapter,
     Entity\InformationSchema\Table,
     Migration\FieldDefinition,
     Repository,
     QueryBuilder,
     Ulmus};
 
-trait DefaultAdapterTrait
+trait SqlAdapterTrait
 {
     public function repositoryClass() : string
     {
@@ -133,7 +134,7 @@ trait DefaultAdapterTrait
             case is_object($value):
                 return Ulmus::convertObject($value);
 
-            case is_array($value):
+                case is_array($value):
                 return json_encode($value);
 
             case is_bool($value):

src/Attribute/Obj/AdapterAttributeInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Ulmus\Attribute\Obj;
+
+interface AdapterAttributeInterface
+{
+    public function adapter() : false|string;
+}

src/Attribute/Obj/Table.php

@@ -3,7 +3,7 @@
 namespace Ulmus\Attribute\Obj;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class Table {
+class Table implements AdapterAttributeInterface {
     public function __construct(
         public ? string $name = null,
         public ? string $database = null,
@@ -11,4 +11,9 @@ class Table {
         public ? string $adapter = null,
         public ? string $engine = null,
     ) {}
+
+    public function adapter() : false|string
+    {
+        return $this->adapter ?: false;
+    }
 }

src/Common/EntityResolver.php

@@ -61,16 +61,7 @@ class EntityResolver {
 
     public function searchField($name) : null|array
     {
-        try{
-            return $this->field($name, self::KEY_ENTITY_NAME, false) ?: $this->field($name, self::KEY_COLUMN_NAME, false);
-        }
-        catch(\Throwable $e) {
-            if ( $throwException) {
-                throw new \InvalidArgumentException("Can't find entity field's column named `$name` from entity {$this->entityClass}");
-            }
-        }
-
-        return null;
+        return $this->field($name, self::KEY_ENTITY_NAME, false) ?: $this->field($name, self::KEY_COLUMN_NAME, false);
     }
 
     public function fieldList($fieldKey = self::KEY_ENTITY_NAME, bool $skipVirtual = false) : array
@@ -173,7 +164,7 @@ class EntityResolver {
         return $table->name ?? "";
     }
 
-    public function tableAnnotation($required = false) : Table|Attribute\Obj\Table
+    public function tableAnnotation($required = false) : null|Table|Attribute\Obj\Table
     {
         if ( null === $table = $this->getTableAttribute() ) {
             if ($required) {
@@ -191,10 +182,10 @@ class EntityResolver {
 
     public function sqlAdapter() : \Ulmus\ConnectionAdapter
     {
-        if ( null !== $table = $this->getTableAttribute() ) {
-            if ( $table->adapter ?? null ) {
-                if ( null === ( $adapter = \Ulmus\Ulmus::$registeredAdapters[$table->adapter] ?? null ) ) {
-                    throw new \Exception("Requested database adapter `{$table->adapter}` is not registered.");
+        if ( $adapterObj = $this->getAdapterInterfaceAttribute()) {
+            if ( false !== $adapterName = $adapterObj->adapter() ) {
+                if ( null === ( $adapter = \Ulmus\Ulmus::$registeredAdapters[$adapterName] ?? null ) ) {
+                    throw new \Exception("Requested database adapter `$adapterName` is not registered.");
                 }
                 else {
                     return $adapter;
@@ -250,6 +241,11 @@ class EntityResolver {
         return null;
     }
 
+    protected function getAdapterInterfaceAttribute() : null|object
+    {
+        return $this->getAttributeImplementing(Attribute\Obj\AdapterAttributeInterface::class);
+    }
+
     protected function getTableAttribute()
     {
         return $this->getAnnotationFromClassname(Attribute\Obj\Table::class, false) ?: $this->getAnnotationFromClassname( Table::class, false );
@@ -294,6 +290,17 @@ class EntityResolver {
         return null;
     }
 
+    public function getAttributeImplementing(string $interface) : ? object
+    {
+        foreach (array_reverse($this->class['tags']) as $item) {
+            if ($item['object'] instanceof $interface) {
+                return $item['object'];
+            }
+        }
+
+        return null;
+    }
+
     public function instanciateAnnotationObject(array|\ReflectionAttribute $tagDefinition) : object
     {
         if ($tagDefinition instanceof \ReflectionAttribute) {

src/Common/Sql.php

@@ -68,7 +68,7 @@ abstract class Sql {
         return static::identifier($sql);
     }
 
-    public static function escape($value)
+    public static function escape($value) : mixed
     {
         switch(true) {
             case is_object($value):

src/ConnectionAdapter.php

@@ -53,7 +53,7 @@ class ConnectionAdapter
     public function connect() : self
     {
         $this->pdo = $this->adapter->connect();
-        
+
         return $this;
     }
     

src/EntityCollection.php

@@ -346,6 +346,18 @@ class EntityCollection extends \ArrayObject implements \JsonSerializable {
         return ( new $className() )->fromArray($dataset);
     }
 
+    public function arrayToEntities(array $list, ? string /*stringable*/ $entityClass = null) : self
+    {
+        $collection = new static();
+        $collection->entityClass = $entityClass ?? $this->entityClass;
+
+        foreach($list as $dataset) {
+            $collection->append($this->arrayToEntity($dataset, $entityClass));
+        }
+
+        return $collection;
+    }
+
     public function jsonSerialize(): mixed
     {
         return $this->toArray();

src/EntityTrait.php

@@ -27,7 +27,7 @@ trait EntityTrait {
     public array $entityLoadedDataset = [];
 
     #[Ignore]
-    public function __construct() {
+    public function __construct(array $dataset = null) {
         $this->resetVirtualProperties();
     }
 

src/Migration/MigrateInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Ulmus\Migration;
+
+interface MigrateInterface
+{
+    public function tableSyntax() : array;
+    public function whitelistAttributes(array &$parameters) : void;
+    public function generateAlterColumn(FieldDefinition $definition, array $field) : string|\Stringable;
+    public function splitAlterQuery() : bool;
+
+    /*   public function databaseName() : string;
+    public function mapFieldType(FieldDefinition $field) : string;
+    public function schemaTable(string $databaseName, string $tableName) /*: object|EntityCollection */
+}

src/Query/OrderBy.php

@@ -16,7 +16,7 @@ class OrderBy extends Fragment {
         return $this;
     }
 
-    public function add(string $field, ? string $direction = null) : self
+    public function add(object|string $field, ? string $direction = null) : self
     {
         $this->validateFieldType($field);
 

src/Query/QueryBuilderInterface.php

@@ -2,6 +2,8 @@
 
 namespace Ulmus\Query;
 
+use Ulmus\Query;
+
 interface QueryBuilderInterface
 {
     public function push(Fragment $queryFragment) : self;
@@ -9,5 +11,5 @@ interface QueryBuilderInterface
     public function render(bool $skipToken = false) /* mixed */;
     public function reset() : void;
     public function getFragment(string $class, int $index = 0) : ? Fragment;
-    public function removeFragment(Fragment $fragment) : void;
+    public function removeFragment(Query\Fragment|array|\Stringable|string $fragment) : void;
 }

src/QueryBuilder.php

@@ -278,7 +278,7 @@ class QueryBuilder implements Query\QueryBuilderInterface
         return $this;
     }
 
-    public function groupBy(string|\Stringable $field, ? string $direction = null) : self
+    public function groupBy(string|object $field, ? string $direction = null) : self
     {
         if ( null === $groupBy = $this->getFragment(Query\GroupBy::class) ) {
             $groupBy = new Query\GroupBy();

src/Repository.php

@@ -65,7 +65,7 @@ class Repository
         return $primaryKey ? $this->loadOneFromField($primaryKey, $value) : $this->wherePrimaryKey($value)->loadOne();
     }
 
-    public function loadAll() : EntityCollection
+    public function loadAll () : EntityCollection
     {
         return $this->selectSqlQuery()->collectionFromQuery();
     }
@@ -541,7 +541,7 @@ class Repository
         return $this;
     }
 
-    public function orderBy(string|\Stringable $field, ? string $direction = null) : self
+    public function orderBy(string|object $field, ? string $direction = null) : self
     {
         $this->queryBuilder->orderBy($field, $direction);
 
@@ -559,7 +559,13 @@ class Repository
     public function orders(array $orderList) : self
     {
         foreach($orderList as $field => $direction) {
-            $this->orderBy($field, $direction);
+            if (is_numeric($field)) {
+                $this->orderBy($direction);
+            }
+            else {
+                # Associative array with direction
+                $this->orderBy($field, $direction);
+            }
         }
 
         return $this;
@@ -599,7 +605,7 @@ class Repository
 
         $pkField = key($primaryKeyField);
 
-        return $this->where($primaryKeyField[$pkField]->name ?? $pkField, $value);
+        return $this->where($this->entityClass::field($primaryKeyField[$pkField]->name ?? $pkField), $value);
     }
 
     public function withJoin(string|array $fields, array $options = []) : self

src/Repository/RelationBuilder.php

@@ -187,7 +187,7 @@ class RelationBuilder
                 return $relation->bridgeField ?? false ? $relation->bridge::entityCollection() : $relationRelation->entity::entityCollection();
         }
 
-        return new $class();
+        throw new \InvalidArgumentException("Unknown or no relation was provided as relation type.");
     }
 
     protected function fetchFromDataset($name, ? array $data = null) : object|bool
@@ -227,6 +227,9 @@ class RelationBuilder
                 elseif ( substr($key, 0, $len ) === sprintf(static::JOIN_FIELD_SEPARATOR, strtolower($name)) ) {
                     $vars[substr($key, $len)] = $value;
                 }
+                else {
+                    # load here for API objects !
+                }
             }
 
             if ($vars) {