wip

Icinga · Jul 6, 2023 · ff1f992 · ff1f992
1 parent f8cd49c
commit ff1f992
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/src/Compat/FilterProcessor.php b/src/Compat/FilterProcessor.php
@@ -9,9 +9,10 @@
 use ipl\Orm\Query;
 use ipl\Orm\Relation;
 use ipl\Orm\UnionQuery;
-use ipl\Sql\Expression;
 use ipl\Sql\Filter\Exists;
+use ipl\Sql\Filter\In;
 use ipl\Sql\Filter\NotExists;
+use ipl\Sql\Filter\NotIn;
 use ipl\Stdlib\Contract\Filterable;
 use ipl\Stdlib\Filter\MetaDataProvider;
 use ipl\Stdlib\Filter;
@@ -82,7 +83,7 @@ public static function resolveFilter(Filter\Chain $filter, Query $query)
     protected function requireAndResolveFilterColumns(Filter\Rule $filter, Query $query, $forceOptimization = null)
     {
         if ($filter instanceof Filter\Condition) {
-            if ($filter instanceof Exists || $filter instanceof NotExists) {
+            if ($filter instanceof Exists || $filter instanceof NotExists || $filter instanceof In || $filter instanceof NotIn) {
                 return;
             }
 
@@ -284,8 +285,8 @@ protected function requireAndResolveFilterColumns(Filter\Rule $filter, Query $qu
                     }
 
                     $relation = $query->getResolver()->resolveRelation($relationPath);
-                    $subQuery = $query->createSubQuery($relation->getTarget(), $relationPath);
-                    $subQuery->columns([new Expression('1')]);
+                    $subQuery = $query->createSubQuery($relation->getTarget(), $relationPath, null, false);
+                    $subQuery->getResolver()->setAliasPrefix('sub_');
 
                     if ($count !== null && ($negate || $filter instanceof Filter\All)) {
                         $targetKeys = join(
@@ -303,10 +304,20 @@ protected function requireAndResolveFilterColumns(Filter\Rule $filter, Query $qu
 
                     $subQuery->filter($subQueryFilter);
 
+                    // TODO: Qualification is only necessary since the `In` and `NotIn` conditions are ignored by
+                    //       requireAndResolveFilterColumns(). In case it supports not only single columns but also
+                    //       multiple, this might be reduced to: $keyTuple = (array) $query->getModel()->getKeyName()
+                    $keyTuple = array_values(
+                        $query->getResolver()->qualifyColumns(
+                            (array) $query->getModel()->getKeyName(),
+                            $query->getModel()
+                        )
+                    );
+
                     if ($negate) {
-                        $filter->add(new NotExists($subQuery->assembleSelect()->resetOrderBy()));
+                        $filter->add(new NotIn($keyTuple, $subQuery->assembleSelect()->resetOrderBy()));
                     } else {
-                        $filter->add(new Exists($subQuery->assembleSelect()->resetOrderBy()));
+                        $filter->add(new In($keyTuple, $subQuery->assembleSelect()->resetOrderBy()));
                     }
                 }
             }

diff --git a/src/Query.php b/src/Query.php
@@ -586,30 +586,39 @@ public function derive($relation, Model $source)
      *
      * @param Model $target The model to query
      * @param string $targetPath The target's absolute relation path
-     * @param Model $from The source model
+     * @param ?Model $from The source model
+     * @param bool $link Whether the query should be linked to the parent query
      *
      * @return static
      */
-    public function createSubQuery(Model $target, $targetPath, Model $from = null)
+    public function createSubQuery(Model $target, $targetPath, Model $from = null, bool $link = true)
     {
         $subQuery = (new static())
             ->setDb($this->getDb())
             ->setModel($target);
 
-        $resolver = $this->getResolver();
         $sourceParts = array_reverse(explode('.', $targetPath));
         $sourceParts[0] = $target->getTableAlias();
 
         $subQueryResolver = $subQuery->getResolver();
         $sourcePath = join('.', $sourceParts);
+        $subQueryTarget = $subQueryResolver->resolveRelation($sourcePath)->getTarget();
+
         $subQuery->utilize($sourcePath); // TODO: Don't join if there's a matching foreign key
 
+        if (! $link) {
+            return $subQuery->columns(array_map(function ($keyName) use ($sourcePath) {
+                return "$sourcePath.$keyName";
+            }, (array) $subQueryTarget->getKeyName()));
+        }
+
         // TODO: Should be done by the caller. Though, that's not possible until we've got a filter abstraction
         //       which allows to post-pone filter column qualification.
         $subQueryResolver->setAliasPrefix('sub_');
 
+        $resolver = $this->getResolver();
         $baseAlias = $resolver->getAlias($this->getModel());
-        $sourceAlias = $subQueryResolver->getAlias($subQueryResolver->resolveRelation($sourcePath)->getTarget());
+        $sourceAlias = $subQueryResolver->getAlias($subQueryTarget);
 
         $subQueryConditions = [];
         foreach ((array) $this->getModel()->getKeyName() as $column) {