fix: DuckDB STRUCT

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

Author: manticore-projects

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

@@ -6902,12 +6902,13 @@ StructType StructType() #StruckType:
         |
         (
             <OPENING_CURLY_BRACKET> { arguments= new  ArrayList<SelectItem<?>>(); dialect = StructType.Dialect.DUCKDB;}
-
-            id = RelObjectName() <DOUBLE_COLON> expression = Expression() { arguments.add( new SelectItem( expression, id) ); }
+            ( id = RelObjectNameExt2() | tk1=<S_CHAR_LITERAL> { id = tk1.image; } )
+            <DOUBLE_COLON> expression = Expression() { arguments.add( new SelectItem( expression, id) ); }
 
             (
                 ","
-                id = RelObjectName() <DOUBLE_COLON> expression = Expression() { arguments.add( new SelectItem( expression, id) ); }
+                ( id = RelObjectNameExt2() | tk1=<S_CHAR_LITERAL> { id = tk1.image; } )
+                <DOUBLE_COLON> expression = Expression() { arguments.add( new SelectItem( expression, id) ); }
             )*
             <CLOSING_CURLY_BRACKET>
 

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

@@ -39,7 +39,6 @@ void testStructTypeBigQuery() throws JSQLParserException {
 
     @Test
     void testStructTypeDuckDB() throws JSQLParserException {
-        // @todo: check why the white-space after the "{" is needed?!
         String sqlStr = "SELECT { t:'abc',len:5}";
         TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
 
@@ -64,6 +63,12 @@ void testStructTypeConstructorDuckDB() throws JSQLParserException {
         TestUtils.assertStatementCanBeDeparsedAs(select, sqlStr, true);
     }
 
+    @Test
+    void testStructTypeConstructorDuckDBWithQuotesAndTypes() throws JSQLParserException {
+        String sqlStr = "SELECT {'t':'abc'::STRING,'len':5::INT}";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
+
     @Test
     void testStructTypeWithArgumentsDuckDB() throws JSQLParserException {
         // @todo: check why the white-space after the "{" is needed?!