feat: allow simple expressions for JsonExpression

- fixes #2181

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

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

@@ -5385,15 +5385,23 @@ Expression PrimaryExpression() #PrimaryExpression:
 
     // Check for JSON operands
     [
-         LOOKAHEAD(2) (
+        LOOKAHEAD(2) (
             LOOKAHEAD(2) (
-                ( token="->" | token=":" /*Snowflake GET_PATH Operator*/ ) expression=Expression()
+                token="->"
+                |
+                token=":"
+                |
+                token="->>"
                 |
-                token="->>" expression=Expression()
+                token="#>"
                 |
-                token="#>" expression=Expression()
+                token="#>>"
+            )
+
+            (
+                LOOKAHEAD({getAsBoolean(Feature.allowComplexParsing) && !interrupted }) expression=Expression()
                 |
-                token="#>>" expression=Expression()
+                expression=SimpleExpression()
             )
             {
                 jsonIdents.add(new AbstractMap.SimpleEntry<Expression, String>(expression, token.image ));
@@ -5641,7 +5649,7 @@ StructType StructType() #StruckType:
 JsonExpression JsonExpression(Expression expr, List<Map.Entry<Expression, String>> idents) : {
   JsonExpression result = new JsonExpression(expr, idents);
   Expression expression;
-  Token token;
+  Token token=null;
   ColDataType type = null;
   CastExpression castExpr = null;
 }
@@ -5666,19 +5674,27 @@ JsonExpression JsonExpression(Expression expr, List<Map.Entry<Expression, String
             result = new JsonExpression(expr);
         }
 
-        (
-             LOOKAHEAD(2) (
-                    ( token="->" | token=":" /*Snowflake GET_PATH Operator*/ ) expression=Expression()
-                    |
-                    token="->>" expression=Expression()
-                    |
-                    token="#>" expression=Expression()
-                    |
-                    token="#>>" expression=Expression()
-                )
-                {
-                    result.addIdent( expression, token.image );
-                }
+        LOOKAHEAD(2) (
+            LOOKAHEAD(2) (
+                token="->"
+                |
+                token=":"
+                |
+                token="->>"
+                |
+                token="#>"
+                |
+                token="#>>"
+            )
+
+            (
+                LOOKAHEAD({getAsBoolean(Feature.allowComplexParsing) && !interrupted}) expression=Expression()
+                |
+                expression=SimpleExpression()
+            )
+            {
+                result.addIdent( expression, token.image );
+            }
         )*
     )*
 

src/test/java/net/sf/jsqlparser/expression/JsonExpressionTest.java

@@ -149,4 +149,33 @@ void testParenthesedJsonExpressionsIssue1792() throws JSQLParserException {
     void testIssue2054(String sqlStr) throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(sqlStr, true);
     }
+
+    @Test
+    void testIssue2181() throws JSQLParserException {
+        String sqlStr =
+                "SELECT\n" +
+                        "  1\n" +
+                        "FROM\n" +
+                        "  public.tbl\n" +
+                        "WHERE\n" +
+                        "  fieldd ->> 'att1' = 1\n" +
+                        "  OR fieldd ->> 'att1' = 1\n" +
+                        "  OR fieldd ->> 'att1' = 1\n" +
+                        "  OR fieldd::jsonb -> 'att2' @> 1\n" +
+                        "  OR fieldd::jsonb -> 'att2' @> 1\n" +
+                        "  OR fieldd::jsonb -> 'att2' @> 1\n" +
+                        "  OR fieldd::jsonb -> 'att2' @> 1\n" +
+                        "  OR fieldd::jsonb -> 'att2' @> 1\n" +
+                        "  OR fieldd::jsonb -> 'att2' @> 1\n" +
+                        "  OR fieldd::jsonb -> 'att2' @> 1\n" +
+                        "  OR fieldd::jsonb -> 'att2' @> 1\n" +
+                        "  OR fieldd::jsonb -> 'att2' @> 1\n" +
+                        "  OR fieldd::jsonb -> 'att2' @> 1\n" +
+                        "  OR fieldd::jsonb -> 'att2' @> 1\n" +
+                        "ORDER BY\n" +
+                        "  att ASC\n" +
+                        "LIMIT\n" +
+                        "  1";
+        assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
 }