PostgresSQL regular expression match operators

Author: wumpz

README.md

@@ -22,10 +22,13 @@ The generated hierarchy can be navigated using the Visitor Pattern.
 
 ## Extensions Version 0.8.7
 
-* Added support for PostgreSQL regular expression case sensitive match condition ~.
+* Added support for PostgreSQL regular expression match operators.
 
 ```sql
-SELECT a, b FROM foo WHERE a ~ '[help].*'
+SELECT a, b FROM foo WHERE a ~ '[help].*';
+SELECT a, b FROM foo WHERE a ~* '[help].*'
+SELECT a, b FROM foo WHERE a !~ '[help].*'
+SELECT a, b FROM foo WHERE a !~* '[help].*'
 ```
 
 ## Extensions Version 0.8.6

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java

@@ -44,7 +44,7 @@
 import net.sf.jsqlparser.expression.operators.relational.MinorThan;
 import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
 import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
-import net.sf.jsqlparser.expression.operators.relational.RegExpCaseSensitiveMatch;
+import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.SubSelect;
 
@@ -142,5 +142,5 @@ public interface ExpressionVisitor {
 
 	void visit(OracleHierarchicalExpression oexpr);
 
-	void visit(RegExpCaseSensitiveMatch rexpr);
+	void visit(RegExpMatchOperator rexpr);
 }

src/main/java/net/sf/jsqlparser/expression/operators/relational/RegExpMatchOperator.java

@@ -0,0 +1,61 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.expression.operators.relational;
+
+import net.sf.jsqlparser.expression.BinaryExpression;
+import net.sf.jsqlparser.expression.ExpressionVisitor;
+
+public class RegExpMatchOperator extends BinaryExpression {
+
+	private RegExpMatchOperatorType operatorType;
+
+	public RegExpMatchOperator(RegExpMatchOperatorType operatorType) {
+		if (operatorType == null) {
+			throw new NullPointerException();
+		}
+		this.operatorType = operatorType;
+	}
+
+	public RegExpMatchOperatorType getOperatorType() {
+		return operatorType;
+	}
+
+	@Override
+	public void accept(ExpressionVisitor expressionVisitor) {
+		expressionVisitor.visit(this);
+	}
+
+	@Override
+	public String getStringExpression() {
+		switch (operatorType) {
+			case MATCH_CASESENSITIVE:
+				return "~";
+			case MATCH_CASEINSENSITIVE:
+				return "~*";
+			case NOT_MATCH_CASESENSITIVE:
+				return "!~";
+			case NOT_MATCH_CASEINSENSITIVE:
+				return "!~*";
+		}
+		return null;
+	}
+}

…relational/RegExpCaseSensitiveMatch.java …/relational/RegExpMatchOperatorType.javasrc/main/java/net/sf/jsqlparser/expression/operators/relational/RegExpCaseSensitiveMatch.java renamed to src/main/java/net/sf/jsqlparser/expression/operators/relational/RegExpMatchOperatorType.java src/main/java/net/sf/jsqlparser/expression/operators/relational/RegExpCaseSensitiveMatch.java renamed to src/main/java/net/sf/jsqlparser/expression/operators/relational/RegExpMatchOperatorType.java

@@ -19,20 +19,16 @@
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
-package net.sf.jsqlparser.expression.operators.relational;
-
-import net.sf.jsqlparser.expression.BinaryExpression;
-import net.sf.jsqlparser.expression.ExpressionVisitor;
-
-public class RegExpCaseSensitiveMatch extends BinaryExpression {
 
-	@Override
-	public void accept(ExpressionVisitor expressionVisitor) {
-		expressionVisitor.visit(this);
-	}
+package net.sf.jsqlparser.expression.operators.relational;
 
-	@Override
-	public String getStringExpression() {
-		return "~";
-	}
+/**
+ * PostgresSQL match operators.
+ * @author toben
+ */
+public enum RegExpMatchOperatorType {
+	MATCH_CASESENSITIVE,
+	MATCH_CASEINSENSITIVE,
+	NOT_MATCH_CASESENSITIVE,
+	NOT_MATCH_CASEINSENSITIVE
 }

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -73,7 +73,7 @@
 import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
 import net.sf.jsqlparser.expression.operators.relational.MultiExpressionList;
 import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
-import net.sf.jsqlparser.expression.operators.relational.RegExpCaseSensitiveMatch;
+import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.delete.Delete;
@@ -509,7 +509,7 @@ public void visit(OracleHierarchicalExpression oexpr) {
 	}
 
 	@Override
-	public void visit(RegExpCaseSensitiveMatch rexpr) {
+	public void visit(RegExpMatchOperator rexpr) {
 		visitBinaryExpression(rexpr);
 	}
 }

src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java

@@ -489,7 +489,7 @@ public void visit(OracleHierarchicalExpression oexpr) {
 	}
 
 	@Override
-	public void visit(RegExpCaseSensitiveMatch rexpr) {
-		visitBinaryExpression(rexpr, " ~ ");
+	public void visit(RegExpMatchOperator rexpr) {
+		visitBinaryExpression(rexpr, " " + rexpr.getStringExpression() + " ");
 	}
 }

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -98,7 +98,8 @@ import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
 import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
-import net.sf.jsqlparser.expression.operators.relational.RegExpCaseSensitiveMatch;
+import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
+import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperatorType;
 import net.sf.jsqlparser.expression.operators.relational.InExpression;
 import net.sf.jsqlparser.expression.operators.relational.IsNullExpression;
 import net.sf.jsqlparser.expression.operators.relational.ItemsList;
@@ -1334,7 +1335,10 @@ Expression RegularCondition():
 	| "<=" { result = new MinorThanEquals(); }
 	| ("<>" | "!=") { result = new NotEqualsTo(); }
 	| "@@" { result = new Matches(); }
-	| "~" { result = new RegExpCaseSensitiveMatch(); }
+	| "~" { result = new RegExpMatchOperator(RegExpMatchOperatorType.MATCH_CASESENSITIVE); }
+	| "~*" { result = new RegExpMatchOperator(RegExpMatchOperatorType.MATCH_CASEINSENSITIVE); }
+	| "!~" { result = new RegExpMatchOperator(RegExpMatchOperatorType.NOT_MATCH_CASESENSITIVE); }
+	| "!~*" { result = new RegExpMatchOperator(RegExpMatchOperatorType.NOT_MATCH_CASEINSENSITIVE); }
 	)
 	rightExpression=ComparisonItem()
 

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

@@ -1153,4 +1153,19 @@ public void testPostgreSQLRegExpCaseSensitiveMatch() throws JSQLParserException
 		String stmt= "SELECT a, b FROM foo WHERE a ~ '[help].*'";
 		assertSqlCanBeParsedAndDeparsed(stmt);
 	}
+	
+	public void testPostgreSQLRegExpCaseSensitiveMatch2() throws JSQLParserException {
+		String stmt= "SELECT a, b FROM foo WHERE a ~* '[help].*'";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
+	
+	public void testPostgreSQLRegExpCaseSensitiveMatch3() throws JSQLParserException {
+		String stmt= "SELECT a, b FROM foo WHERE a !~ '[help].*'";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
+	
+	public void testPostgreSQLRegExpCaseSensitiveMatch4() throws JSQLParserException {
+		String stmt= "SELECT a, b FROM foo WHERE a !~* '[help].*'";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
 }