Query: Determine omitted & target columns correctly

Icinga · Sep 20, 2024 · d9bd9fb · d9bd9fb
1 parent e9d6117
commit d9bd9fb
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/Query.php b/src/Query.php
@@ -454,7 +454,21 @@ public function assembleSelect()
         foreach ($resolved as $target) {
             $targetColumns = $resolved[$target]->getArrayCopy();
             if (isset($omitted[$target])) {
-                $targetColumns = array_diff($targetColumns, $omitted[$target]->getArrayCopy());
+                $targetColumns = array_udiff(
+                    $targetColumns,
+                    $omitted[$target]->getArrayCopy(),
+                    function ($a, $b) {
+                        if (! is_string($a)) {
+                            return 1;
+                        }
+
+                        if (! is_string($b)) {
+                            return -1;
+                        }
+
+                        return strcmp($a, $b);
+                    }
+                );
             }
 
             if (! empty($customAliases)) {