Fix $not:null not working in filters - resolves #483 (#490)

pimcore · Mar 16, 2022 · 1561fa5 · 1561fa5
1 parent c9e20a8
commit 1561fa5
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/GraphQL/Helper.php b/src/GraphQL/Helper.php
@@ -126,10 +126,15 @@ public static function buildSqlCondition($defaultTable, $q, $op = null, $subject
                         if (array_search(strtolower($objectVar), $ops) !== false) {
                             $innerOp = $mappingTable[strtolower($objectVar)];
                             if ($innerOp == 'NOT') {
-                                if (is_null($objectValue)) {
-                                    $parts[] = '( NOT ' . self::quoteAbsoluteColumnName($defaultTable, $key) . ' IS NULL)';
+                                $valuePart = ' IS NULL';
+                                if (!is_null($objectValue)) {
+                                    $valuePart = ' =' . $db->quote($objectValue) . ')';
+                                }
+
+                                if (isset($fieldMappingTable, $key)) {
+                                    $parts[] = '( NOT ' . $db->quoteIdentifier($key) . $valuePart . ')';
                                 } else {
-                                    $parts[] = '( NOT ' . self::quoteAbsoluteColumnName($defaultTable, $key) . ' =' . $db->quote($objectValue) . ')';
+                                    $parts[] = '( NOT ' . self::quoteAbsoluteColumnName($defaultTable, $key) . $valuePart . ')';
                                 }
                             } else {
                                 $parts[] = '(' . self::quoteAbsoluteColumnName($defaultTable, $key) . ' ' . $innerOp . ' ' . $db->quote($objectValue) . ')';