multi-instance relation fields; empty/notempty querying - part2

Author: i-just

src/fields/BaseRelationField.php

@@ -142,9 +142,9 @@ public static function queryCondition(array $instances, mixed $value, array &$pa
         if (isset($value[0]) && in_array($value[0], [':notempty:', ':empty:', 'not :empty:'])) {
             $emptyCondition = array_shift($value);
             if (in_array($emptyCondition, [':notempty:', 'not :empty:'])) {
-                $conditions[] = static::existsQueryCondition($field);
+                $conditions[] = static::existsQueryCondition($field, instances: $instances);
             } else {
-                $conditions[] = ['not', static::existsQueryCondition($field)];
+                $conditions[] = ['not', static::existsQueryCondition($field, instances: $instances)];
             }
         }
 
@@ -181,10 +181,28 @@ public static function queryCondition(array $instances, mixed $value, array &$pa
      * @return array
      * @since 5.2.0
      */
-    public static function existsQueryCondition(self $field, bool $enabledOnly = true, bool $inTargetSiteOnly = true): array
+    public static function existsQueryCondition(self $field, bool $enabledOnly = true, bool $inTargetSiteOnly = true, array $instances = []): array
     {
         $ns = sprintf('%s_%s', $field->handle, StringHelper::randomString(5));
 
+        if (count($instances) > 1) {
+            $instanceQuery = [];
+            foreach ($instances as $instance) {
+                $instanceQuery[] = [
+                    'and',
+                    ['not', [$instance->getValueSql() => null]],
+                    ['not', [$instance->getValueSql() => '[]']],
+                ];
+            }
+            array_unshift($instanceQuery, 'or');
+        } else {
+            $instanceQuery = [
+                'and',
+                ['not', [$field->getValueSql() => null]],
+                ['not', [$field->getValueSql() => '[]']],
+            ];
+        }
+
         $query = (new Query())
             ->from(["relations_$ns" => DbTable::RELATIONS])
             ->innerJoin(["elements_$ns" => DbTable::ELEMENTS], "[[elements_$ns.id]] = [[relations_$ns.targetId]]")
@@ -193,8 +211,10 @@ public static function existsQueryCondition(self $field, bool $enabledOnly = tru
                 'and',
                 "[[relations_$ns.sourceId]] = [[elements.id]]",
                 [
-                    "relations_$ns.fieldId" => $field->id,
-                    "elements_$ns.dateDeleted" => null,
+                    'and',
+                    ["relations_$ns.fieldId" => $field->id],
+                    $instanceQuery,
+                    ["elements_$ns.dateDeleted" => null],
                 ],
                 [
                     'or',