Merge pull request #357 from jeffbrennan/feat/add-rlike

feat: add support for rlike and regexp

Author: DerekStride

grammar/expressions.js

@@ -262,6 +262,8 @@ export default {
       [$.is_not, 'binary_is'],
       [$.keyword_like, 'pattern_matching'],
       [$.not_like, 'pattern_matching'],
+      [$.keyword_rlike, 'pattern_matching'],
+      [$.not_rlike, 'pattern_matching'],
       [$.similar_to, 'pattern_matching'],
       [$.not_similar_to, 'pattern_matching'],
       // binary_is precedence disambiguates `(is not distinct from)` from an

grammar/keywords.js

@@ -177,6 +177,7 @@ export default {
   keyword_gin:  _ => make_keyword("gin"),
   keyword_brin: _ => make_keyword("brin"),
   keyword_like: _ => choice(make_keyword("like"),make_keyword("ilike")),
+  keyword_rlike: _ => choice(make_keyword("rlike"),make_keyword("regexp")),
   keyword_similar: _ => make_keyword("similar"),
   keyword_unsigned: _ => make_keyword("unsigned"),
   keyword_zerofill: _ => make_keyword("zerofill"),
@@ -325,6 +326,7 @@ export default {
   // Operators
   is_not: $ => prec.left(seq($.keyword_is, $.keyword_not)),
   not_like: $ => seq($.keyword_not, $.keyword_like),
+  not_rlike: $ => seq($.keyword_not, $.keyword_rlike),
   similar_to: $ => seq($.keyword_similar, $.keyword_to),
   not_similar_to: $ => seq($.keyword_not, $.keyword_similar, $.keyword_to),
   distinct_from: $ => seq($.keyword_is, $.keyword_distinct, $.keyword_from),

queries/highlights.scm

@@ -183,6 +183,7 @@
   (keyword_transaction)
   (keyword_only)
   (keyword_like)
+  (keyword_rlike)
   (keyword_similar)
   (keyword_over)
   (keyword_change)

test/corpus/expressions.txt

@@ -571,6 +571,66 @@ WHERE
               (keyword_to))
             right: (literal)))))))
 
+================================================================================
+Where with RLIKE pattern matching
+================================================================================
+
+SELECT
+    *
+FROM
+    a
+WHERE
+        a RLIKE '^pattern'
+    AND a NOT RLIKE '^pattern'
+    AND a rlike '^pattern'
+    AND a REGEXP '^pattern';
+
+
+--------------------------------------------------------------------------------
+
+(program
+  (statement
+    (select
+      (keyword_select)
+      (select_expression
+        (term
+          value: (all_fields))))
+    (from
+      (keyword_from)
+      (relation
+        (object_reference
+          name: (identifier)))
+      (where
+        (keyword_where)
+        predicate: (binary_expression
+          left: (binary_expression
+            left: (binary_expression
+              left: (binary_expression
+                left: (field
+                  name: (identifier))
+                operator: (keyword_rlike)
+                right: (literal))
+              operator: (keyword_and)
+              right: (binary_expression
+                left: (field
+                  name: (identifier))
+                operator: (not_rlike
+                  (keyword_not)
+                  (keyword_rlike))
+                right: (literal)))
+            operator: (keyword_and)
+            right: (binary_expression
+              left: (field
+                name: (identifier))
+              operator: (keyword_rlike)
+              right: (literal)))
+          operator: (keyword_and)
+          right: (binary_expression
+            left: (field
+              name: (identifier))
+            operator: (keyword_rlike)
+            right: (literal)))))))
+
 ================================================================================
 NOT EQUAL <> OPERATOR
 ================================================================================