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

src/Common/PdoObject.php

@@ -9,6 +9,8 @@ class PdoObject extends PDO {
     
     public static ? string $dump = null;
 
+    public bool $executionStatus;
+
     public function select(string $sql, array $parameters = []): PDOStatement 
     {
         static::$dump && call_user_func_array(static::$dump, [ $sql, $parameters ]);
@@ -29,7 +31,7 @@ class PdoObject extends PDO {
     public function runQuery(string $sql, array $parameters = []): ? PDOStatement 
     {
         static::$dump && call_user_func_array(static::$dump, [ $sql, $parameters ]);
-        # \debogueur([ $sql, $parameters ]);
+
         try {
             if (false !== ( $statement = $this->prepare($sql) )) {
                 return $this->execute($statement, $parameters, true);
@@ -59,12 +61,16 @@ class PdoObject extends PDO {
 
     public function execute(PDOStatement $statement, array $parameters = [], bool $commit = true): ? PDOStatement
     {
+        $this->executionStatus = false;
+
         try {
             if ( ! $this->inTransaction() ) {
                 $this->beginTransaction();
             }
 
-            if (empty($parameters) ? $statement->execute() : $statement->execute($parameters)) {
+            $this->executionStatus = empty($parameters) ? $statement->execute() : $statement->execute($parameters);
+
+            if ( $this->executionStatus  ) {
                 $statement->lastInsertId = $this->lastInsertId();
 
                 if ( $commit ) {

src/EntityTrait.php

@@ -8,7 +8,7 @@ use Ulmus\Repository,
     Ulmus\Common\EntityField;
 
 use Ulmus\Annotation\Classes\{ Method, Table, Collation, };
-use Ulmus\Annotation\Property\{ Field, Filter, Relation, OrderBy, Where, Join, Virtual, On, WithJoin, };
+use Ulmus\Annotation\Property\{ Field, Filter, FilterJoin, Relation, OrderBy, Where, OrWhere, Join, Virtual, On, WithJoin, };
 use Ulmus\Annotation\Property\Field\{ Id, ForeignKey, CreatedAt, UpdatedAt, Datetime as DateTime, Date, Time, Bigint, Tinyint, Text, Mediumtext, Longtext, };
 use Ulmus\Annotation\Property\Relation\{ Ignore as RelationIgnore };
 

src/Repository.php

@@ -2,7 +2,7 @@
 
 namespace Ulmus;
 
-use Ulmus\Annotation\Property\{Field, Where, Having, Relation, Join, WithJoin, Relation\Ignore as RelationIgnore};
+use Ulmus\Annotation\Property\{Field, Where, Having, Relation, Filter, Join, FilterJoin, WithJoin, Relation\Ignore as RelationIgnore};
 use Ulmus\Common\EntityResolver;
 
 class Repository
@@ -56,19 +56,19 @@ class Repository
         return $this->collectionFromQuery();
     }
 
-    public function loadAllFromField($field, $value) : EntityCollection
+    public function loadAllFromField($field, $value, $operator= Query\Where::OPERATOR_EQUAL) : EntityCollection
     {
-        return $this->loadFromField($field, $value);
+        return $this->loadFromField($field, $value, $operator);
     }
 
-    public function loadFromField($field, $value) : EntityCollection
+    public function loadFromField($field, $value, $operator= Query\Where::OPERATOR_EQUAL) : EntityCollection
     {
-        return $this->where($field, $value)->collectionFromQuery();
+        return $this->where($field, $value, $operator)->collectionFromQuery();
     }
 
     public function count() : int
     {
-        $this->removeQueryFragment($this->queryBuilder->getFragment(Query\Select::class));
+        $this->removeQueryFragment(Query\Select::class);
 
         if ( $this->queryBuilder->getFragment(Query\GroupBy::class) ) {
             $this->select( "DISTINCT COUNT(*) OVER ()" );
@@ -84,12 +84,12 @@ class Repository
         return Ulmus::runSelectQuery($this->queryBuilder, $this->adapter)->fetchColumn(0);
     }
 
-    protected function deleteOne()
+    public function deleteOne()
     {
         return $this->limit(1)->deleteSqlQuery()->runDeleteQuery();
     }
 
-    protected function deleteAll()
+    public function deleteAll()
     {
         return $this->deleteSqlQuery()->runDeleteQuery();
     }
@@ -145,6 +145,8 @@ class Repository
         $primaryKeyDefinition = Ulmus::resolveEntity($this->entityClass)->getPrimaryKeyField();
 
         if ( ! $entity->isLoaded() ) {
+            # $dataset = array_filter($dataset, fn($item, $field) => ! ($this->entityResolver->searchFieldAnnotation($field, new Field, false)->readonly ?? false), \ARRAY_FILTER_USE_BOTH);
+
             $statement = $this->insertSqlQuery($fieldsAndValue ?? $dataset, $replace)->runInsertQuery();
             
             if ( ( 0 !== $statement->lastInsertId ) && 
@@ -155,6 +157,8 @@ class Repository
             }
 
             $entity->entityFillFromDataset($dataset, true);
+
+            return (bool) $statement->lastInsertId;
         }
         else {
             if ( $primaryKeyDefinition === null ) {
@@ -179,11 +183,16 @@ class Repository
         return false;
     }
 
-    public function saveAll(/*EntityCollection|array*/ $collection) : void
+    public function saveAll(EntityCollection $collection) : int
     {
+        $changed = 0;
+
         foreach ($collection as $entity) {
-            $this->save($entity);
+            $this->save($entity) && $changed++;
         }
+
+        return $changed;
+
     }
 
     public function loadCollectionRelation(EntityCollection $collection, /*array|string*/ $fields) : void
@@ -312,7 +321,7 @@ class Repository
         }
     }
 
-    public function removeQueryFragment(? Query\Fragment $fragment) : self
+    public function removeQueryFragment(/*? Query\Fragment|string*/ $fragment) : self
     {
         $fragment && $this->queryBuilder->removeFragment($fragment);
 
@@ -568,13 +577,10 @@ class Repository
                     $this->having(is_object($condition->field) ? $condition->field : $entity::field($condition->field), $condition->value, $condition->operator);
                 }
 
-<<<<<<< HEAD
-=======
                 foreach($this->entityResolver->searchFieldAnnotationList($item, new Filter() ) as $filter) {
                     call_user_func_array([ $this->entityClass, $filter->method ], [ $this, $item, true ]);
                 }
 
->>>>>>> dc5e0885512a39387b59e8a2af37c87ff0269931
                 $this->close();
 
                 $key = is_string($annotation->key) ? $this->entityClass::field($annotation->key) : $annotation->key;
@@ -596,13 +602,10 @@ class Repository
                             $join->where(is_object($field) ? $field : $entity::field($field, $alias), $condition->value, $condition->operator);
                         }
                     }
-<<<<<<< HEAD
-=======
 
                     foreach($this->entityResolver->searchFieldAnnotationList($item, new FilterJoin() ) as $filter) {
                         call_user_func_array([ $this->entityClass, $filter->method ], [ $join, $item, true ]);
                     }
->>>>>>> dc5e0885512a39387b59e8a2af37c87ff0269931
                 });
             }
             else {
@@ -816,7 +819,7 @@ class Repository
     public function createSqlQuery() : self
     {
         if ( null === $this->queryBuilder->getFragment(Query\Create::class) ) {
-            $this->queryBuilder->create($this->escapeFieldList($this->entityResolver->fieldList()), $this->escapeTable($this->entityResolver->tableName()), $this->entityResolver->schemaName());
+            $this->queryBuilder->create($this->escapeFieldList($this->entityResolver->fieldList(EntityResolver::KEY_ENTITY_NAME, true)), $this->escapeTable($this->entityResolver->tableName()), $this->entityResolver->schemaName());
         }
 
         if ( null === $this->queryBuilder->getFragment(Query\Engine::class) ) {
@@ -828,6 +831,16 @@ class Repository
         return $this;
     }
 
+    public function alterSqlQuery(array $fields) : self
+    {
+        if ( null === $this->queryBuilder->getFragment(Query\Alter::class) ) {
+            $this->queryBuilder->create($this->escapeFieldList($this->entityResolver->fieldList(EntityResolver::KEY_ENTITY_NAME, true)), $this->escapeTable($this->entityResolver->tableName()), $this->entityResolver->schemaName());
+        }
+
+
+        return $this;
+    }
+
     protected function fromRow($row) : self
     {
 

src/Repository/RelationBuilder.php

@@ -9,6 +9,10 @@ use Closure;
 
 class RelationBuilder
 {
+    const SUBQUERY_FIELD_SUFFIX = "%s\$collection";
+
+    const JOIN_FIELD_SEPARATOR = "%s\$";
+
     protected Repository $repository;
 
     protected /*object|string*/ $entity;