Fix #10697 parsing of CQL ILIKE filter (#10698)

geosolutions-it · Dec 3, 2024 · 831eab5 · 831eab5
1 parent e0fbce0
commit 831eab5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/web/client/utils/ogc/Filter/CQL/__tests__/parser-test.js b/web/client/utils/ogc/Filter/CQL/__tests__/parser-test.js
@@ -60,6 +60,12 @@ const COMPARISON_TESTS = [
             args: [{type: "property", name: "PROP"}, {type: "literal", value: 'a'}],
             type: "like"
         }
+    }, {
+        cql: "PROP ilike 'a'",
+        expected: {
+            args: [{type: "property", name: "PROP"}, {type: "literal", value: 'a'}],
+            type: "ilike"
+        }
     },
     {
         cql: "INCLUDE",

diff --git a/web/client/utils/ogc/Filter/CQL/parser.js b/web/client/utils/ogc/Filter/CQL/parser.js
@@ -19,7 +19,7 @@ export const functionOperator = "func";
 export const patterns = {
     INCLUDE: /^INCLUDE$/,
     PROPERTY: /^"?[_a-zA-Z"]\w*"?/,
-    COMPARISON: /^(=|<>|<=|<|>=|>|LIKE)/i,
+    COMPARISON: /^(=|<>|<=|<|>=|>|LIKE|ILIKE)/i,
     IS_NULL: /^IS NULL/i,
     COMMA: /^,/,
     AND: /^(AND)/i,

diff --git a/web/client/utils/ogc/Filter/__tests__/fromObject-test.js b/web/client/utils/ogc/Filter/__tests__/fromObject-test.js
@@ -38,6 +38,10 @@ const COMPARISON_TESTS = [
         cql: "PROP like 'a'",
         expected: '<ogc:PropertyIsLike matchCase="true" wildCard="*" singleChar="." escapeChar="!"><ogc:PropertyName>PROP</ogc:PropertyName><ogc:Literal>a</ogc:Literal></ogc:PropertyIsLike>'
     },
+    {
+        cql: "PROP ilike 'a'",
+        expected: '<ogc:PropertyIsLike matchCase="false" wildCard="*" singleChar="." escapeChar="!"><ogc:PropertyName>PROP</ogc:PropertyName><ogc:Literal>a</ogc:Literal></ogc:PropertyIsLike>'
+    },
     {
         cql: "PROP between 1 and 3",
         expected: '<ogc:PropertyIsBetween><ogc:PropertyName>PROP</ogc:PropertyName><ogc:LowerBoundary><ogc:Literal>1</ogc:Literal></ogc:LowerBoundary><ogc:UpperBoundary><ogc:Literal>3</ogc:Literal></ogc:UpperBoundary></ogc:PropertyIsBetween>'