[feat] JSON_OBJECT support for AllColumns and AllTableColumns

ANeumann82 · ANeumann82 · commit a87f797abad5 · 2025-10-07T22:11:09.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -131,7 +131,13 @@ configurations.configureEach {
 }
 
 compileJavacc {
-    arguments = [grammar_encoding: 'UTF-8', static: 'false', java_template_type: 'modern']
+    arguments = [
+            grammar_encoding: 'UTF-8',
+            static: 'false',
+            java_template_type: 'modern',
+            // Comment this in to build the parser with tracing. Setting it to false does NOT disable it
+            DEBUG_PARSER: 'false'
+    ]
 }
 
 java {
diff --git a/src/main/java/net/sf/jsqlparser/expression/JsonFunction.java b/src/main/java/net/sf/jsqlparser/expression/JsonFunction.java
@@ -25,6 +25,8 @@ public class JsonFunction extends ASTNodeAccessImpl implements Expression {
     private JsonAggregateOnNullType onNullType;
     private JsonAggregateUniqueKeysType uniqueKeysType;
 
+    private boolean isStrict = false;
+
     public ArrayList<JsonKeyValuePair> getKeyValuePairs() {
         return keyValuePairs;
     }
@@ -114,6 +116,19 @@ public JsonFunction withType(String typeName) {
         return this;
     }
 
+    public boolean isStrict() {
+        return isStrict;
+    }
+
+    public void setStrict(boolean strict) {
+        isStrict = strict;
+    }
+
+    public JsonFunction withStrict(boolean strict) {
+        this.setStrict(strict);
+        return this;
+    }
+
     @Override
     public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
         return expressionVisitor.visit(this, context);
@@ -164,19 +179,33 @@ public StringBuilder appendObject(StringBuilder builder) {
             i++;
         }
 
+        appendOnNullType(builder);
+        if (isStrict) {
+            builder.append(" STRICT");
+        }
+        appendUniqueKeys(builder);
+
+        builder.append(" ) ");
+
+        return builder;
+    }
+
+    private void appendOnNullType(StringBuilder builder) {
         if (onNullType != null) {
             switch (onNullType) {
                 case NULL:
                     builder.append(" NULL ON NULL");
                     break;
                 case ABSENT:
-                    builder.append(" ABSENT On NULL");
+                    builder.append(" ABSENT ON NULL");
                     break;
                 default:
                     // this should never happen
             }
         }
+    }
 
+    private void appendUniqueKeys(StringBuilder builder) {
         if (uniqueKeysType != null) {
             switch (uniqueKeysType) {
                 case WITH:
@@ -189,10 +218,6 @@ public StringBuilder appendObject(StringBuilder builder) {
                     // this should never happen
             }
         }
-
-        builder.append(" ) ");
-
-        return builder;
     }
 
 
@@ -205,6 +230,13 @@ public StringBuilder appendPostgresObject(StringBuilder builder) {
                 builder.append(", ").append(keyValuePair.getValue());
             }
         }
+
+        appendOnNullType(builder);
+        if (isStrict) {
+            builder.append(" STRICT");
+        }
+        appendUniqueKeys(builder);
+
         builder.append(" ) ");
 
         return builder;
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -6967,9 +6967,13 @@ JsonFunction JsonFunction() : {
                         "KEY" { usingKeyKeyword = true; } ( keyToken = <S_CHAR_LITERAL> { key = keyToken.image; } | key = Column() )
                     )
                     |
-                    keyToken = <S_CHAR_LITERAL> { key = keyToken.image; }
+                    LOOKAHEAD(2) ( key = AllTableColumns() )
+                    |
+                    key = AllColumns()
                     |
                     key = Column()
+                    |
+                    keyToken = <S_CHAR_LITERAL> { key = keyToken.image; }
                 )
 
                 ( LOOKAHEAD(2)
@@ -6998,9 +7002,12 @@ JsonFunction JsonFunction() : {
                             "KEY" { usingKeyKeyword = true; } ( keyToken = <S_CHAR_LITERAL> { key = keyToken.image; } | key = Column() )
                         )
                         |
-                        keyToken = <S_CHAR_LITERAL> { key = keyToken.image; }
+                        LOOKAHEAD(2) ( key = AllTableColumns() )
                         |
                         key = Column()
+                        |
+                        keyToken = <S_CHAR_LITERAL> { key = keyToken.image; }
+
                     )
                     ( ":" | ","  { result.setType( JsonFunctionType.MYSQL_OBJECT ); } | "VALUE" { usingValueKeyword = true; } )
                     expression = Expression() { keyValuePair = new JsonKeyValuePair( key, expression, usingKeyKeyword, usingValueKeyword ); result.add(keyValuePair); }
@@ -7017,7 +7024,9 @@ JsonFunction JsonFunction() : {
                   <K_ABSENT> <K_ON> <K_NULL> { result.setOnNullType(  JsonAggregateOnNullType.ABSENT ); }
               )
             ]
-
+            [
+                <K_STRICT> { result.setStrict(true); }
+            ]
             [
               (
                   <K_WITH> <K_UNIQUE> <K_KEYS> { result.setUniqueKeysType( JsonAggregateUniqueKeysType.WITH ); }
diff --git a/src/test/java/net/sf/jsqlparser/expression/JsonFunctionTest.java b/src/test/java/net/sf/jsqlparser/expression/JsonFunctionTest.java
@@ -164,6 +164,25 @@ public void testObject() throws JSQLParserException {
         TestUtils.assertExpressionCanBeParsedAndDeparsed("json_object()", true);
     }
 
+    @Test
+    void testObjectOracle() throws JSQLParserException {
+        TestUtils.assertSqlCanBeParsedAndDeparsed("SELECT JSON_OBJECT(*) FROM employees", true);
+
+        TestUtils.assertSqlCanBeParsedAndDeparsed("SELECT JSON_OBJECT(* ABSENT ON NULL) FROM employees", true);
+
+        TestUtils.assertSqlCanBeParsedAndDeparsed("SELECT JSON_OBJECT(e.*) FROM employees e", true);
+
+        TestUtils.assertSqlCanBeParsedAndDeparsed("SELECT JSON_OBJECT(e.*, d.* NULL ON NULL) FROM employees e, departments d", true);
+
+        TestUtils.assertSqlCanBeParsedAndDeparsed("SELECT JSON_OBJECT(e.* WITH UNIQUE KEYS) FROM employees e", true);
+
+        TestUtils.assertSqlCanBeParsedAndDeparsed(
+                "SELECT JSON_OBJECT( 'foo':bar, 'fob':baz FORMAT JSON STRICT ) FROM dual ", true);
+
+        TestUtils.assertSqlCanBeParsedAndDeparsed(
+                "SELECT JSON_OBJECT( 'foo':bar, 'fob':baz NULL ON NULL STRICT WITH UNIQUE KEYS) FROM dual ", true);
+    }
+
     @Test
     public void testObjectWithExpression() throws JSQLParserException {
         TestUtils.assertSqlCanBeParsedAndDeparsed(

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,13 @@ configurations.configureEach {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`compileJavacc {`
`134`		`- arguments = [grammar_encoding: 'UTF-8', static: 'false', java_template_type: 'modern']`
	`134`	`+ arguments = [`
	`135`	`+ grammar_encoding: 'UTF-8',`
	`136`	`+ static: 'false',`
	`137`	`+ java_template_type: 'modern',`
	`138`	`+ // Comment this in to build the parser with tracing. Setting it to false does NOT disable it`
	`139`	`+ DEBUG_PARSER: 'false'`
	`140`	`+ ]`
`135`	`141`	`}`
`136`	`142`
`137`	`143`	`java {`
Original file line number	Diff line number	Diff line change
`@@ -6967,9 +6967,13 @@ JsonFunction JsonFunction() : {`
`6967`	`6967`	`"KEY" { usingKeyKeyword = true; } ( keyToken = <S_CHAR_LITERAL> { key = keyToken.image; } \| key = Column() )`
`6968`	`6968`	`)`
`6969`	`6969`	`\|`
`6970`		`- keyToken = <S_CHAR_LITERAL> { key = keyToken.image; }`
	`6970`	`+ LOOKAHEAD(2) ( key = AllTableColumns() )`
	`6971`	`+ \|`
	`6972`	`+ key = AllColumns()`
`6971`	`6973`	`\|`
`6972`	`6974`	`key = Column()`
	`6975`	`+ \|`
	`6976`	`+ keyToken = <S_CHAR_LITERAL> { key = keyToken.image; }`
`6973`	`6977`	`)`
`6974`	`6978`
`6975`	`6979`	`( LOOKAHEAD(2)`
`@@ -6998,9 +7002,12 @@ JsonFunction JsonFunction() : {`
`6998`	`7002`	`"KEY" { usingKeyKeyword = true; } ( keyToken = <S_CHAR_LITERAL> { key = keyToken.image; } \| key = Column() )`
`6999`	`7003`	`)`
`7000`	`7004`	`\|`
`7001`		`- keyToken = <S_CHAR_LITERAL> { key = keyToken.image; }`
	`7005`	`+ LOOKAHEAD(2) ( key = AllTableColumns() )`
`7002`	`7006`	`\|`
`7003`	`7007`	`key = Column()`
	`7008`	`+ \|`
	`7009`	`+ keyToken = <S_CHAR_LITERAL> { key = keyToken.image; }`
	`7010`	`+`
`7004`	`7011`	`)`
`7005`	`7012`	`( ":" \| "," { result.setType( JsonFunctionType.MYSQL_OBJECT ); } \| "VALUE" { usingValueKeyword = true; } )`
`7006`	`7013`	`expression = Expression() { keyValuePair = new JsonKeyValuePair( key, expression, usingKeyKeyword, usingValueKeyword ); result.add(keyValuePair); }`
`@@ -7017,7 +7024,9 @@ JsonFunction JsonFunction() : {`
`7017`	`7024`	`<K_ABSENT> <K_ON> <K_NULL> { result.setOnNullType( JsonAggregateOnNullType.ABSENT ); }`
`7018`	`7025`	`)`
`7019`	`7026`	`]`
`7020`		`-`
	`7027`	`+ [`
	`7028`	`+ <K_STRICT> { result.setStrict(true); }`
	`7029`	`+ ]`
`7021`	`7030`	`[`
`7022`	`7031`	`(`
`7023`	`7032`	`<K_WITH> <K_UNIQUE> <K_KEYS> { result.setUniqueKeysType( JsonAggregateUniqueKeysType.WITH ); }`