Added support for PostgreSQL JSON Functions and Operators.

Author: Peter Borissow

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

@@ -46,6 +46,7 @@
 import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
 import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
 import net.sf.jsqlparser.expression.operators.relational.RegExpMySQLOperator;
+import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.SubSelect;
 
@@ -150,6 +151,8 @@ public interface ExpressionVisitor {
 	void visit(RegExpMatchOperator rexpr);
 
     void visit(JsonExpression jsonExpr);
+    
+    void visit(JsonOperator jsonExpr);
 
 	void visit(RegExpMySQLOperator regExpMySQLOperator);
 

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

@@ -24,6 +24,7 @@
 import net.sf.jsqlparser.expression.operators.arithmetic.*;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
+import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
 import net.sf.jsqlparser.expression.operators.relational.*;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.AllColumns;
@@ -347,6 +348,11 @@ protected void visitBinaryExpression(BinaryExpression expr) {
     public void visit(JsonExpression jsonExpr) {
         visit(jsonExpr.getColumn());
     }
+    
+    @Override
+    public void visit(JsonOperator expr) {
+        visitBinaryExpression(expr);
+    }
 
     @Override
     public void visit(RegExpMySQLOperator expr) {

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

@@ -53,6 +53,7 @@ public class JsonExpression  implements Expression {
     private Column column;
 
     private List<String> idents = new ArrayList<String>();
+    private List<String> operators = new ArrayList<String>();
 
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
@@ -73,18 +74,27 @@ public List<String> getIdents() {
 
     public void setIdents(List<String> idents) {
         this.idents = idents;
+        operators = new ArrayList<String>();
+        for (String ident : idents) {
+            operators.add("->");
+        }
     }
 
     public void addIdent(String ident) {
+        addIdent(ident, "->");
+    }
+    
+    public void addIdent(String ident, String operator) {
         idents.add(ident);
+        operators.add(operator);
     }
 
     @Override
     public String toString() {
         StringBuilder b = new StringBuilder();
         b.append(column.toString());
-        for (String ident : idents) {
-            b.append("->").append(ident);
+        for (int i=0; i<idents.size(); i++){
+            b.append(operators.get(i)).append(idents.get(i));
         }
         return b.toString();
     }

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

@@ -0,0 +1,45 @@
+/*
+ * #%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 JsonOperator extends BinaryExpression {
+    
+    private String op; //"@>"
+    
+    public JsonOperator(String op){
+        this.op = op;
+    }
+
+	@Override
+	public void accept(ExpressionVisitor expressionVisitor) {
+		expressionVisitor.visit(this);
+	}
+
+	@Override
+	public String getStringExpression() {
+		return op;
+	}
+}
+

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

@@ -50,7 +50,7 @@
 import net.sf.jsqlparser.statement.execute.Execute;
 import net.sf.jsqlparser.statement.merge.Merge;
 import net.sf.jsqlparser.statement.truncate.Truncate;
-
+import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
 /**
  * Find all used tables within an select statement.
  */
@@ -447,6 +447,10 @@ public void visit(RegExpMySQLOperator rexpr) {
     public void visit(JsonExpression jsonExpr) {
     }
 
+    @Override
+    public void visit(JsonOperator jsonExpr) {
+    }
+    
     @Override
     public void visit(AllColumns allColumns) {
     }

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

@@ -29,7 +29,7 @@
 import net.sf.jsqlparser.schema.*;
 import net.sf.jsqlparser.statement.select.SelectVisitor;
 import net.sf.jsqlparser.statement.select.SubSelect;
-
+import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
 import java.util.Iterator;
 
 /**
@@ -529,6 +529,11 @@ public void visit(RegExpMySQLOperator rexpr) {
     public void visit(JsonExpression jsonExpr) {
         buffer.append(jsonExpr.toString());
     }
+    
+    @Override
+    public void visit(JsonOperator jsonExpr) {
+        visitBinaryExpression(jsonExpr, " " + jsonExpr.getStringExpression() + " ");
+    }
 
     @Override
     public void visit(WithinGroupExpression wgexpr) {

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -74,7 +74,6 @@ import net.sf.jsqlparser.statement.select.*;
 import net.sf.jsqlparser.statement.truncate.*;
 import net.sf.jsqlparser.statement.update.*;
 import net.sf.jsqlparser.statement.merge.*;
-
 import java.util.*;
 
 /**
@@ -1729,6 +1728,15 @@ Expression RegularCondition():
 	| "~*" { result = new RegExpMatchOperator(RegExpMatchOperatorType.MATCH_CASEINSENSITIVE); }
 	| "!~" { result = new RegExpMatchOperator(RegExpMatchOperatorType.NOT_MATCH_CASESENSITIVE); }
 	| "!~*" { result = new RegExpMatchOperator(RegExpMatchOperatorType.NOT_MATCH_CASEINSENSITIVE); }
+
+        | "@>" { result = new JsonOperator("@>"); }
+        | "<@" { result = new JsonOperator("<@"); }
+        | "?" { result = new JsonOperator("?"); }
+        | "?|" { result = new JsonOperator("?|"); }
+        | "?&" { result = new JsonOperator("?&"); }
+        | "||" { result = new JsonOperator("||"); }
+        | "-" { result = new JsonOperator("-"); }
+        | "-#" { result = new JsonOperator("-#"); }
 	)
 
 	( LOOKAHEAD(2) <K_PRIOR> rightExpression=ComparisonItem() { oraclePrior = EqualsTo.ORACLE_PRIOR_END; } 
@@ -2228,7 +2236,12 @@ JsonExpression JsonExpression() : {
   Token token;
 }
 {
-    column=Column() ("->" token=<S_CHAR_LITERAL> {result.addIdent(token.image);} )+
+    column=Column() (
+        "->" token=<S_CHAR_LITERAL> {result.addIdent(token.image,"->");} | 
+        "->>" token=<S_CHAR_LITERAL> {result.addIdent(token.image,"->>");} |
+        "#>" token=<S_CHAR_LITERAL> {result.addIdent(token.image,"#>");} |
+        "#>>" token=<S_CHAR_LITERAL> {result.addIdent(token.image,"#>>");}
+    )+
     { 
         result.setColumn(column);
         return result;