WIP

Author: yhabteab

etc/schema/postgresql.schema.sql

@@ -12,10 +12,24 @@ CREATE OR REPLACE FUNCTION UNIX_TIMESTAMP()
     PARALLEL SAFE
     AS $$
 BEGIN
-RETURN EXTRACT(EPOCH FROM now());
+    RETURN EXTRACT(EPOCH FROM now());
 END;
 $$;
 
+-- IPL ORM renders SQL queries with LIKE operators for all suggestions in the search bar,
+-- which fails for numeric and enum types on PostgreSQL. Just like in Icinga DB Web!!
+CREATE OR REPLACE FUNCTION anynonarrayliketext(anynonarray, text)
+  RETURNS bool
+  LANGUAGE plpgsql
+  IMMUTABLE
+  PARALLEL SAFE
+  AS $$
+BEGIN
+    RETURN $1::TEXT LIKE $2;
+END;
+$$;
+CREATE OPERATOR ~~ (LEFTARG=anynonarray, RIGHTARG=text, PROCEDURE=anynonarrayliketext);
+
 CREATE TABLE x509_certificate (
   id serial PRIMARY KEY,
   subject varchar(255) NOT NULL,

library/X509/Web/Control/SearchBar/ObjectSuggestions.php

@@ -11,7 +11,6 @@
 use ipl\Orm\Resolver;
 use ipl\Orm\UnionModel;
 use ipl\Stdlib\Filter;
-use ipl\Stdlib\Seq;
 use ipl\Stdlib\Str;
 use ipl\Web\Control\SearchBar\SearchException;
 use ipl\Web\Control\SearchBar\Suggestions;
@@ -45,7 +44,12 @@ protected function shouldShowRelationFor(string $column): bool
     {
         $columns = Str::trimSplit($column, '.');
 
-        return $columns[0] !== $this->model->getTableName();
+        switch (count($columns)) {
+            case 2:
+                return $columns[0] !== $this->model->getTableName();
+            default:
+                return true;
+        }
     }
 
     protected function createQuickSearchFilter($searchTerm)
@@ -69,54 +73,40 @@ protected function fetchValueSuggestions($column, $searchTerm, Filter\Chain $sea
         $query = $model::on($this->getDb());
         $query->limit(self::DEFAULT_LIMIT);
 
-        if (strpos($column, ' ') !== false) {
-            // $column may be a label
-            list($path, $_) = Seq::find(
-                self::collectFilterColumns($query->getModel(), $query->getResolver()),
-                $column,
-                false
-            );
-
-            if ($path !== null) {
-                $column = $path;
-            }
-        }
-
         $columnPath = $query->getResolver()->qualifyPath($column, $model->getTableName());
         $inputFilter = Filter::like($columnPath, $searchTerm);
 
-        $query->columns($columnPath);
+        $query->columns([$columnPath]);
         $query->orderBy($columnPath);
 
         if ($searchFilter instanceof Filter\None) {
             $query->filter($inputFilter);
         } elseif ($searchFilter instanceof Filter\All) {
             $searchFilter->add($inputFilter);
-
-            $searchFilter->metaData()->set('forceOptimization', true);
-            $inputFilter->metaData()->set('forceOptimization', false);
         } else {
             $searchFilter = $inputFilter;
         }
 
         $query->filter($searchFilter);
+        // Not to suggest something like Port=443,443,443....
+        $query->getSelectBase()->distinct();
 
         try {
             foreach ($query as $item) {
-                try {
-                    $columns = Str::trimSplit($column, '.');
-                    if ($columns[0] === $model->getTableName()) {
-                        array_shift($columns);
-                    }
+                $columns = Str::trimSplit($column, '.');
+                if ($columns[0] === $model->getTableName()) {
+                    array_shift($columns);
+                }
 
-                    $value = null;
+                $value = $item;
 
+                try {
                     do {
                         $col = array_shift($columns);
-                        $value = $item->$col;
+                        $value = $value->$col;
                     } while (! empty($columns));
 
-                    if ($value !== '' && ! ctype_print($value)) { // Is binary
+                    if ($value && ! ctype_print($value)) { // Is binary
                         $value = sprintf('\\x%s', bin2hex($value));
                     }
 
@@ -171,7 +161,7 @@ protected static function collectRelations(Resolver $resolver, Model $subject, a
             $relationPath = [$name];
 
             if (! isset($models[$name]) && ! in_array($name, $path, true)) {
-                if ($isHasOne) {
+                if ($isHasOne || empty($path)) {
                     array_unshift($relationPath, $subject->getTableName());
                 }
 
@@ -183,6 +173,8 @@ protected static function collectRelations(Resolver $resolver, Model $subject, a
                     self::collectRelations($resolver, $relation->getTarget(), $models, $relationPath);
                     return;
                 }
+            } else {
+                $path = [];
             }
         }
     }