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

Timestamp:

01/27/16 13:05:25 (8 years ago)

Author:

nanardon

Message:

Support other operators in search than = and ~

File:

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

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

@@ -795 +795 @@
 
         # Invalid filter due to impossible value:
-        $attribute->checkinputformat($val) or do {
+        if (!$attribute->checkinputformat($val) && $mode ne '~') {
             $base->log(LA_ERR, "Invalid format value $val for attribute $attr");
             return;
-        };
+        }
 
         $val = $attribute->input($val);
@@ -813 +813 @@
         } elsif ($attribute->{inline}) {
             $sql = sprintf(
-                q{select ikey from %s where %s::text %s},
+                q{select ikey from %s where %s%s %s},
                 $base->db->quote_identifier($class->_object_table),
+                ($mode eq '~' ? '::text' : ''),
                 $base->db->quote_identifier($attribute->iname),
                 $val eq '*'
@@ -820 +821 @@
                     : $mode eq '~'
                         ? 'ILIKE ?'
-                        : '= ?' 
+                        : "$mode ?"
             );
             push(@{$attrbind{$attr}}, $mode eq '~' ? '%' . $val . '%' : $val) unless($val eq '*');
@@ -832 +833 @@
                     ? ''
                     : $mode eq '~'
-                        ? q{and value ILIKE ?}
-                        : q{and value = ?}
+                        ? q{and value::text ILIKE ?}
+                        : qq{and value $mode ?}
 
             );