bugfix

Core/Objects/DatabaseEntity/Controller/DatabaseEntity.class.php

@@ -124,6 +124,7 @@ abstract class DatabaseEntity implements ArrayAccess, JsonSerializable {
 
   public function preInsert(array &$row) { }
   public function postFetch(SQL $sql, array $row) { }
+  public function postUpdate() { }
   public static function getPredefinedValues(): array { return []; }
   public function postDelete() { }
 

Core/Objects/DatabaseEntity/Controller/DatabaseEntityHandler.php

@@ -578,7 +578,7 @@ class DatabaseEntityHandler implements Persistable {
         $otherHandler = $nmRelation->getRelHandler();
         $thisIdColumn = $otherHandler->getColumnName($nmRelation->getThisProperty(), false);
         $relIdColumn  = $otherHandler->getColumnName($nmRelation->getRefProperty(), false);
-
+        if (!empty($entityIds)) {
           $relEntityQuery = DatabaseEntityQuery::fetchAll($otherHandler)
             ->where(new CondIn(new Column($thisIdColumn), $entityIds));
 
@@ -603,6 +603,7 @@ class DatabaseEntityHandler implements Persistable {
             $targetArray[$row[$relIdColumn]] = $relEntity;
             $property->setValue($thisEntity, $targetArray);
           }
+        }
       } else {
         $this->logger->error("fetchNMRelations for type '" . get_class($nmRelation) . "' is not implemented");
         continue;
@@ -785,6 +786,7 @@ class DatabaseEntityHandler implements Persistable {
       $res = $this->updateNM($entity, $properties);
     }
 
+    $entity->postUpdate();
     return $res;
   }
 

Core/Objects/DatabaseEntity/Controller/DatabaseEntityQuery.class.php

@@ -103,6 +103,11 @@ class DatabaseEntityQuery extends Select {
   private function fetchRelation(string $propertyName, string $tableName, DatabaseEntityHandler $src, DatabaseEntityHandler $relationHandler,
                                  int &$relIndex = 1, bool $recursive = false, string $relationColumnPrefix = "") {
 
+    // TODO: fix recursion here...
+    if ($src === $relationHandler && $recursive) {
+      return;
+    }
+
     $columns = $src->getColumns();
 
     $foreignColumn = $columns[$propertyName];