Changeset 1906 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Timestamp:

01/03/17 19:55:54 (8 years ago)

Author:

nanardon

Message:

When searching deference direct object aliases

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (6 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -997 +997 @@
     }
 
-    # We add to result aliases:
+    # We add to result aliases pointing to these object:
     if(keys %mresults && !$noalias) {
         my @alias = $class->_search_uniq_filter($base, 'oalias', '=', join('||', keys %mresults));
@@ -1022 +1022 @@
     return unless(@values);
 
-    $base->log(LA_DEBUG, "Uniq search for $attr $operator (%s)", join(' ', @values));
+    $base->log(LA_DEBUG, "Uniq search for " . $class->type . "->$attr $operator (%s)", join(' ', @values));
     
     # We detect if we can do a very quick search:
@@ -1028 +1028 @@
     if ($forRef) {
         # Improv perf
+
+        my @oaliases = ();
+        if ($attr ne 'oalias' && $attribute->reference) {
+            @oaliases = $base->search_objects($attribute->reference, "oalias=$value");
+            $base->log(LA_DEBUG, "Uniq search will match oaliases: %s", join(' ', @oaliases) || '(none)');
+        }
+
         if ($attribute->{inline}) {
             my $sql = sprintf(
@@ -1043 +1050 @@
             push(@attrsql, $sql);
         }
-        push(@attrbind, [ grep { $_ ne '||' } @values ]);
+        push(@attrbind, [ @oaliases, grep { $_ ne '||' } @values ]);
     } else {
 
@@ -1101 +1108 @@
                 push(@attrbind, $attribute->iname);
             } else {
+                my @oaliases = ();
+                if ($attr ne 'oalias' && $attribute->reference) {
+                    @oaliases = $base->search_objects($attribute->reference, "oalias=$val");
+                    $base->log(LA_DEBUG, "Uniq search will match oaliases for %s: %s", $val, join(' ', @oaliases) || '(none)');
+                }
+
                 $sql = sprintf(
                     q{select okey from %s where attr = ? %s},
@@ -1109 +1122 @@
                         ? ''
                         : $operator eq '~'
-                            ? q{and value::text ILIKE ?}
-                            : qq{and value $operator ?}
+                            ? q{and value::text ILIKE ANY(?)}
+                            : qq{and value $operator ANY (?)}
 
                 );
                 push(@attrbind, $attribute->iname);
-                push(@attrbind, $operator eq '~' ? '%' . $val . '%' : $val) unless($val eq '*');
+                my @vals = ( $val, @oaliases );
+                push(@attrbind, $operator eq '~'
+                    ? [ map { '%' . $_ . '%' } @vals ]
+                    : [ @vals ])
+                    unless($val eq '*');
             }
         }