Improve handling of case in attribute mappings (CO-1778)

COmanage · Jul 23, 2019 · 29c027b · 29c027b
1 parent 7498f51
commit 29c027b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/src/Lib/Match/MatchService.php b/app/src/Lib/Match/MatchService.php
@@ -515,14 +515,15 @@ protected function search(string $mode,
             $andclause = $colclause . "=?";
             break;
           case SearchTypeEnum::Mapping:
+            $qclause = (!$ruleattr->attribute->case_sensitive ? "LOWER(query)" : "query");
             $andclause = "(" . $colclause . "
                           IN (SELECT value
                               FROM attribute_mappings
                               WHERE attribute_map_id=" . $ruleattr->attribute->attribute_map_id ."
-                              AND query=LOWER(?))
+                              AND " . $qclause . "=?)
                           OR " . $colclause . "=?)";
-            // We need to copies of $val in the param list
-            $vals[] = $val;
+            // We need two copies of $val in the param list
+            $vals[] = (!$ruleattr->attribute->case_sensitive ? strtolower($val) : $val);
             break;
           case SearchTypeEnum::Substring:
             $andclause = "SUBSTRING("