Changeset 1776 for trunk/LATMOS-Accounts

Timestamp:

05/31/16 09:34:46 (8 years ago)

Author:

nanardon

Message:

Allow search for NULL value to any field (included not inline)

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (1 diff)

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

@@ -786 +786 @@
             push(@{$attrbind{$attr}}, $mode eq '~' ? '%' . $val . '%' : $val) unless($mode eq '=' && ($val eq '*' || $val eq 'NULL'));
         } else {
-            $sql = sprintf(
-                q{select okey from %s where attr = ? %s},
-                $base->db->quote_identifier(
-                    $class->_object_table . '_attributes'
-                ),
-                $val eq '*'
-                    ? ''
-                    : $mode eq '~'
-                        ? q{and value::text ILIKE ?}
-                        : qq{and value $mode ?}
-
-            );
-            push(@{$attrbind{$attr}}, $attribute->iname);
-            push(@{$attrbind{$attr}}, $mode eq '~' ? '%' . $val . '%' : $val) unless($val eq '*');
+            if ($mode eq '=' && $val eq 'NULL') {
+                $sql = sprintf(q{ select ikey from %s where ikey
+                          not in (select okey from %s where attr = ? and value is not NULL) },
+                          $base->db->quote_identifier($class->_object_table),
+                          $base->db->quote_identifier(
+                              $class->_object_table . '_attributes'
+                          ),
+                );
+                push(@{$attrbind{$attr}}, $attribute->iname);
+            } else {
+                $sql = sprintf(
+                    q{select okey from %s where attr = ? %s},
+                    $base->db->quote_identifier(
+                        $class->_object_table . '_attributes'
+                    ),
+                    $val eq '*'
+                        ? ''
+                        : $mode eq '~'
+                            ? q{and value::text ILIKE ?}
+                            : qq{and value $mode ?}
+
+                );
+                push(@{$attrbind{$attr}}, $attribute->iname);
+                push(@{$attrbind{$attr}}, $mode eq '~' ? '%' . $val . '%' : $val) unless($val eq '*');
+            }
         }