From d624175bd9a272384bf91b0ae6370d4945fb7744 Mon Sep 17 00:00:00 2001 From: tw Date: Wed, 1 Jan 2025 23:15:34 +0100 Subject: [PATCH 001/104] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 188eb3b57..a9e17115d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.github.jsqlparser jsqlparser - 5.1 + 5.2-SNAPSHOT JSQLParser library 2004 @@ -106,7 +106,7 @@ scm:git:https://github.com/JSQLParser/JSqlParser.git scm:git:ssh://git@github.com:JSQLParser/JSqlParser.git https://github.com/JSQLParser/JSqlParser.git - jsqlparser-5.1 + HEAD From f1dee4c43a9a3003d0447ca389e98898496e466d Mon Sep 17 00:00:00 2001 From: tt20061904 <152828296+tt20061904@users.noreply.github.com> Date: Mon, 6 Jan 2025 14:07:23 +0800 Subject: [PATCH 002/104] #2119 add support INSERT OVERWRITE PARTITION (#2135) * #2119 add support INSERT OVERWRITE PARTITION * #2119 fix test case * #2119 add reserved keyword * run spotlessApply --- pom.xml | 2 +- .../parser/ParserKeywordsUtils.java | 1 + .../net/sf/jsqlparser/schema/Partition.java | 66 +++++++++++++++++++ .../jsqlparser/statement/insert/Insert.java | 43 +++++++++++- .../util/deparser/InsertDeParser.java | 16 ++++- .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 45 ++++++++++++- .../statement/insert/InsertTest.java | 34 +++++++++- 7 files changed, 200 insertions(+), 7 deletions(-) create mode 100644 src/main/java/net/sf/jsqlparser/schema/Partition.java diff --git a/pom.xml b/pom.xml index a9e17115d..d0496cde3 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ commons-io commons-io - [2.15.1,) + 2.18.0 test diff --git a/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java b/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java index 2ac33fbd3..f9e8767c1 100644 --- a/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java +++ b/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java @@ -114,6 +114,7 @@ public class ParserKeywordsUtils { {"OUTER", RESTRICTED_JSQLPARSER}, {"OUTPUT", RESTRICTED_JSQLPARSER}, {"OPTIMIZE ", RESTRICTED_JSQLPARSER}, + {"OVERWRITE ", RESTRICTED_JSQLPARSER}, {"PIVOT", RESTRICTED_JSQLPARSER}, {"PLUS", RESTRICTED_JSQLPARSER}, {"PREFERRING", RESTRICTED_JSQLPARSER}, diff --git a/src/main/java/net/sf/jsqlparser/schema/Partition.java b/src/main/java/net/sf/jsqlparser/schema/Partition.java new file mode 100644 index 000000000..2666a6e81 --- /dev/null +++ b/src/main/java/net/sf/jsqlparser/schema/Partition.java @@ -0,0 +1,66 @@ +/*- + * #%L + * JSQLParser library + * %% + * Copyright (C) 2004 - 2025 JSQLParser + * %% + * Dual licensed under GNU LGPL 2.1 or Apache License 2.0 + * #L% + */ +package net.sf.jsqlparser.schema; + +import net.sf.jsqlparser.expression.Expression; + +import java.util.Collection; +import java.util.Objects; + +public class Partition { + protected Column column; + protected Expression value; + + public Partition() { + + } + + public Partition(Column column, Expression value) { + this.column = column; + this.value = value; + } + + public static void appendPartitionsTo(StringBuilder builder, + Collection partitions) { + int j = 0; + for (Partition partition : partitions) { + partition.appendTo(builder, j); + j++; + } + } + + public Column getColumn() { + return column; + } + + public void setColumn(Column column) { + this.column = Objects.requireNonNull(column); + } + + public Expression getValue() { + return value; + } + + public void setValue(Expression value) { + this.value = Objects.requireNonNull(value); + } + + + @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPath"}) + void appendTo(StringBuilder builder, int j) { + if (j > 0) { + builder.append(", "); + } + builder.append(column.getColumnName()); + if (value != null) { + builder.append(" = ").append(value); + } + } +} diff --git a/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java b/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java index 4d52a5864..3351c7077 100644 --- a/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java +++ b/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java @@ -12,6 +12,7 @@ import net.sf.jsqlparser.expression.OracleHint; import net.sf.jsqlparser.expression.operators.relational.ExpressionList; import net.sf.jsqlparser.schema.Column; +import net.sf.jsqlparser.schema.Partition; import net.sf.jsqlparser.schema.Table; import net.sf.jsqlparser.statement.OutputClause; import net.sf.jsqlparser.statement.ReturningClause; @@ -36,11 +37,14 @@ public class Insert implements Statement { private Table table; private OracleHint oracleHint = null; private ExpressionList columns; + private List partitions; private Select select; private boolean onlyDefaultValues = false; private List duplicateUpdateSets = null; private InsertModifierPriority modifierPriority = null; private boolean modifierIgnore = false; + private boolean overwrite = false; + private boolean tableKeyword = false; private ReturningClause returningClause; private List setUpdateSets = null; private List> withItemsList; @@ -103,6 +107,14 @@ public void setColumns(ExpressionList list) { columns = list; } + public List getPartitions() { + return partitions; + } + + public void setPartitions(List list) { + partitions = list; + } + @Deprecated public boolean isUseValues() { return select != null && select instanceof Values; @@ -163,6 +175,22 @@ public void setModifierIgnore(boolean modifierIgnore) { this.modifierIgnore = modifierIgnore; } + public boolean isOverwrite() { + return overwrite; + } + + public void setOverwrite(boolean overwrite) { + this.overwrite = overwrite; + } + + public boolean isTableKeyword() { + return tableKeyword; + } + + public void setTableKeyword(boolean tableKeyword) { + this.tableKeyword = tableKeyword; + } + @Deprecated public boolean isUseSet() { return setUpdateSets != null && !setUpdateSets.isEmpty(); @@ -240,7 +268,14 @@ public String toString() { if (modifierIgnore) { sql.append("IGNORE "); } - sql.append("INTO "); + if (overwrite) { + sql.append("OVERWRITE "); + } else { + sql.append("INTO "); + } + if (tableKeyword) { + sql.append("TABLE "); + } sql.append(table).append(" "); if (onlyDefaultValues) { @@ -259,6 +294,12 @@ public String toString() { sql.append(") "); } + if (partitions != null) { + sql.append(" PARTITION ("); + Partition.appendPartitionsTo(sql, partitions); + sql.append(") "); + } + if (outputClause != null) { sql.append(outputClause); } diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java index b9aa7bb65..5d30f4ec9 100644 --- a/src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java +++ b/src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java @@ -11,6 +11,7 @@ import net.sf.jsqlparser.expression.ExpressionVisitor; import net.sf.jsqlparser.schema.Column; +import net.sf.jsqlparser.schema.Partition; import net.sf.jsqlparser.statement.insert.Insert; import net.sf.jsqlparser.statement.select.Select; import net.sf.jsqlparser.statement.select.SelectVisitor; @@ -62,7 +63,14 @@ public void deParse(Insert insert) { if (insert.isModifierIgnore()) { buffer.append("IGNORE "); } - buffer.append("INTO "); + if (insert.isOverwrite()) { + buffer.append("OVERWRITE "); + } else { + buffer.append("INTO "); + } + if (insert.isTableKeyword()) { + buffer.append("TABLE "); + } buffer.append(insert.getTable().toString()); @@ -82,6 +90,12 @@ public void deParse(Insert insert) { buffer.append(")"); } + if (insert.getPartitions() != null) { + buffer.append(" PARTITION ("); + Partition.appendPartitionsTo(buffer, insert.getPartitions()); + buffer.append(")"); + } + if (insert.getOutputClause() != null) { buffer.append(insert.getOutputClause().toString()); } diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index efb7fe444..55a041ffd 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -384,6 +384,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -1602,6 +1603,33 @@ List UpdateSets(): } } +List Partitions(): +{ + List partitions = new ArrayList(); + Column tableColumn; + Expression valueExpression = null; +} +{ + ( + ( + tableColumn=Column() [ "=" valueExpression=Expression() ] + { partitions.add( new Partition (tableColumn, valueExpression)); } + ) + ) + + ( + LOOKAHEAD(2) ( + "," + tableColumn=Column() [ "=" valueExpression=Expression() ] + { partitions.add( new Partition (tableColumn, valueExpression)); } + ) + )* + + { + return partitions; + } +} + Insert InsertWithWithItems( List> withItems ): { Insert insert; @@ -1619,6 +1647,7 @@ Insert Insert(): List> with = null; Column tableColumn = null; ExpressionList columns = new ExpressionList(); + List partitions = new ArrayList(); Expression exp = null; ReturningClause returningClause; Select select = null; @@ -1626,6 +1655,8 @@ Insert Insert(): Token tk = null; InsertModifierPriority modifierPriority = null; boolean modifierIgnore = false; + boolean overwrite = false; + boolean tableKeyword = false; List updateSets; List duplicateUpdateSets; @@ -1648,11 +1679,16 @@ Insert Insert(): } ] [ LOOKAHEAD(2) { modifierIgnore = true; }] - [ LOOKAHEAD(2) ] table=Table() + [ LOOKAHEAD(2) ( + { insert.setOverwrite(true); insert.setTableKeyword(true); } + | [ LOOKAHEAD(2) { insert.setTableKeyword(true); }] + ) + ] table=Table() + [ LOOKAHEAD(2) "(" partitions=Partitions() ")" ] [ LOOKAHEAD(2) [ { useAs = true; } ] name=RelObjectNameWithoutValue() { table.setAlias(new Alias(name,useAs)); }] - [LOOKAHEAD(2) "(" columns=ColumnList() ")" ] + [ LOOKAHEAD(2) "(" columns=ColumnList() ")" ] [ outputClause = OutputClause() { insert.setOutputClause(outputClause); } ] @@ -1682,6 +1718,9 @@ Insert Insert(): if (!columns.isEmpty()) { insert.setColumns(columns); } + if (!partitions.isEmpty()) { + insert.setPartitions(partitions); + } return insert.withWithItemsList(with) .withSelect(select) .withTable(table) @@ -2045,7 +2084,7 @@ String RelObjectNameWithoutValue() : { Token tk = null; } { ( tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= - | tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="COSTS" | tk="COUNT" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCRYPTION" | tk="END" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATCH_ALL" | tk="MATCH_ANY" | tk="MATCH_PHRASE" | tk="MATCH_PHRASE_PREFIX" | tk="MATCH_REGEXP" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THAN" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" ) + | tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="COSTS" | tk="COUNT" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCRYPTION" | tk="END" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATCH_ALL" | tk="MATCH_ANY" | tk="MATCH_PHRASE" | tk="MATCH_PHRASE_PREFIX" | tk="MATCH_REGEXP" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="OVERWRITE" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THAN" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" ) { return tk.image; } } diff --git a/src/test/java/net/sf/jsqlparser/statement/insert/InsertTest.java b/src/test/java/net/sf/jsqlparser/statement/insert/InsertTest.java index 421f6b629..97093502f 100644 --- a/src/test/java/net/sf/jsqlparser/statement/insert/InsertTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/insert/InsertTest.java @@ -401,7 +401,7 @@ public void testInsertSetWithDuplicateEliminationInDeparsing() throws JSQLParser @Test public void testInsertTableWithAliasIssue526() throws JSQLParserException { assertSqlCanBeParsedAndDeparsed( - "INSERT INTO account t (name, addr, phone) SELECT * FROM user"); + "INSERT INTO account AS t (name, addr, phone) SELECT * FROM user"); } @Test @@ -837,4 +837,36 @@ void testSelectAndInsertWithin2Ctes() throws JSQLParserException { assertEquals(" inserted", withItems.get(1).getAlias().toString()); } + @Test + void testInsertOverwrite() throws JSQLParserException { + String sqlStr = "INSERT OVERWRITE TABLE t SELECT * FROM a"; + Insert insert = (Insert) assertSqlCanBeParsedAndDeparsed(sqlStr); + assertEquals("t", insert.getTable().getName()); + assertTrue(insert.isOverwrite()); + + sqlStr = "INSERT OVERWRITE TABLE t PARTITION (pt1, pt2) SELECT * FROM a"; + insert = (Insert) assertSqlCanBeParsedAndDeparsed(sqlStr); + assertEquals("t", insert.getTable().getName()); + assertEquals(2, insert.getPartitions().size()); + assertEquals("pt1", insert.getPartitions().get(0).getColumn().getColumnName()); + assertNull(insert.getPartitions().get(0).getValue()); + assertTrue(insert.isOverwrite()); + + sqlStr = "INSERT OVERWRITE\nTABLE t PARTITION (pt1 = 'pt1', pt2 = 'pt2') SELECT * FROM a"; + insert = (Insert) assertSqlCanBeParsedAndDeparsed(sqlStr); + assertEquals("t", insert.getTable().getName()); + assertEquals(2, insert.getPartitions().size()); + assertEquals("pt2", insert.getPartitions().get(1).getColumn().getColumnName()); + assertEquals("'pt2'", insert.getPartitions().get(1).getValue().toString()); + assertTrue(insert.isOverwrite()); + + sqlStr = "INSERT INTO\tTABLE t PARTITION (pt1 = 'pt1', pt2 = 'pt2') SELECT * FROM a"; + insert = (Insert) assertSqlCanBeParsedAndDeparsed(sqlStr); + assertEquals("t", insert.getTable().getName()); + assertEquals(2, insert.getPartitions().size()); + assertEquals("pt1", insert.getPartitions().get(0).getColumn().getColumnName()); + assertEquals("'pt1'", insert.getPartitions().get(0).getValue().toString()); + assertFalse(insert.isOverwrite()); + } + } From f9b1cbd8a8e1c8d6ebcf25e9ae33ab56973c3d7e Mon Sep 17 00:00:00 2001 From: nicky6s Date: Tue, 7 Jan 2025 05:23:59 +0000 Subject: [PATCH 003/104] fix: allowing skyline keywords as columns, tables, etc. (#2137) * fix: allowing skyline keywords as columns, tables, etc. * fix: adding test clause * fix: tweak * fix: removing preferring * fix: clean up formatting * fix: updating keyword to allow low, high, inverse and plus again * fix: addressing review comment * fix: minor revert --- .../jsqlparser/parser/ParserKeywordsUtils.java | 4 ---- .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 13 ++++++++----- src/site/sphinx/keywords.rst | 16 ++++------------ .../jsqlparser/statement/delete/DeleteTest.java | 10 ++++++++++ .../jsqlparser/statement/select/SelectTest.java | 13 ++++++++++++- .../jsqlparser/statement/update/UpdateTest.java | 16 ++++++++++++++++ 6 files changed, 50 insertions(+), 22 deletions(-) diff --git a/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java b/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java index f9e8767c1..9c6dc52d9 100644 --- a/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java +++ b/src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java @@ -81,7 +81,6 @@ public class ParserKeywordsUtils { {"GROUPING", RESTRICTED_ALIAS}, {"QUALIFY", RESTRICTED_ALIAS}, {"HAVING", RESTRICTED_SQL2016}, - {"HIGH", RESTRICTED_JSQLPARSER}, {"IF", RESTRICTED_SQL2016}, {"IIF", RESTRICTED_ALIAS}, {"IGNORE", RESTRICTED_ALIAS}, @@ -92,14 +91,12 @@ public class ParserKeywordsUtils { {"INTERSECT", RESTRICTED_SQL2016}, {"INTERVAL", RESTRICTED_SQL2016}, {"INTO", RESTRICTED_JSQLPARSER}, - {"INVERSE", RESTRICTED_JSQLPARSER}, {"IS", RESTRICTED_SQL2016}, {"JOIN", RESTRICTED_JSQLPARSER}, {"LATERAL", RESTRICTED_SQL2016}, {"LEFT", RESTRICTED_SQL2016}, {"LIKE", RESTRICTED_SQL2016}, {"LIMIT", RESTRICTED_SQL2016}, - {"LOW", RESTRICTED_JSQLPARSER}, {"MINUS", RESTRICTED_SQL2016}, {"NATURAL", RESTRICTED_SQL2016}, {"NOCYCLE", RESTRICTED_JSQLPARSER}, @@ -116,7 +113,6 @@ public class ParserKeywordsUtils { {"OPTIMIZE ", RESTRICTED_JSQLPARSER}, {"OVERWRITE ", RESTRICTED_JSQLPARSER}, {"PIVOT", RESTRICTED_JSQLPARSER}, - {"PLUS", RESTRICTED_JSQLPARSER}, {"PREFERRING", RESTRICTED_JSQLPARSER}, {"PRIOR", RESTRICTED_ALIAS}, {"PROCEDURE", RESTRICTED_ALIAS}, diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index 55a041ffd..d1a23a81d 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -2084,7 +2084,7 @@ String RelObjectNameWithoutValue() : { Token tk = null; } { ( tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= - | tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="COSTS" | tk="COUNT" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCRYPTION" | tk="END" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATCH_ALL" | tk="MATCH_ANY" | tk="MATCH_PHRASE" | tk="MATCH_PHRASE_PREFIX" | tk="MATCH_REGEXP" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="OVERWRITE" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THAN" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" ) + | tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="COSTS" | tk="COUNT" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCRYPTION" | tk="END" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="INVERSE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATCH_ALL" | tk="MATCH_ANY" | tk="MATCH_PHRASE" | tk="MATCH_PHRASE_PREFIX" | tk="MATCH_REGEXP" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="OVERWRITE" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PLUS" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THAN" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" ) { return tk.image; } } @@ -3497,10 +3497,13 @@ Expression PreferenceTermTerminal(): } { ( - retval=HighExpression() - | retval=LowExpression() - | retval=Inverse() - | retval=Condition() + LOOKAHEAD(2) retval=HighExpression() + | + LOOKAHEAD(2) retval=LowExpression() + | + LOOKAHEAD(2) retval=Inverse() + | + retval=Condition() ) { diff --git a/src/site/sphinx/keywords.rst b/src/site/sphinx/keywords.rst index 8e890215e..d301f23e6 100644 --- a/src/site/sphinx/keywords.rst +++ b/src/site/sphinx/keywords.rst @@ -77,9 +77,7 @@ The following Keywords are **restricted** in JSQLParser-|JSQLPARSER_VERSION| and +----------------------+-------------+-----------+ | QUALIFY | Yes | | +----------------------+-------------+-----------+ -| HAVING | Yes | Yes | -+----------------------+-------------+-----------+ -| HIGH | Yes | Yes | +| HAVING | Yes | Yes | +----------------------+-------------+-----------+ | IF | Yes | Yes | +----------------------+-------------+-----------+ @@ -99,9 +97,7 @@ The following Keywords are **restricted** in JSQLParser-|JSQLPARSER_VERSION| and +----------------------+-------------+-----------+ | INTERVAL | Yes | Yes | +----------------------+-------------+-----------+ -| INTO | Yes | Yes | -+----------------------+-------------+-----------+ -| INVERSE | Yes | Yes | +| INTO | Yes | Yes | +----------------------+-------------+-----------+ | IS | Yes | Yes | +----------------------+-------------+-----------+ @@ -113,9 +109,7 @@ The following Keywords are **restricted** in JSQLParser-|JSQLPARSER_VERSION| and +----------------------+-------------+-----------+ | LIKE | Yes | Yes | +----------------------+-------------+-----------+ -| LIMIT | Yes | Yes | -+----------------------+-------------+-----------+ -| LOW | Yes | Yes | +| LIMIT | Yes | Yes | +----------------------+-------------+-----------+ | MINUS | Yes | Yes | +----------------------+-------------+-----------+ @@ -145,9 +139,7 @@ The following Keywords are **restricted** in JSQLParser-|JSQLPARSER_VERSION| and +----------------------+-------------+-----------+ | OPTIMIZE | Yes | Yes | +----------------------+-------------+-----------+ -| PIVOT | Yes | Yes | -+----------------------+-------------+-----------+ -| PLUS | Yes | Yes | +| PIVOT | Yes | Yes | +----------------------+-------------+-----------+ | PREFERRING | Yes | Yes | +----------------------+-------------+-----------+ diff --git a/src/test/java/net/sf/jsqlparser/statement/delete/DeleteTest.java b/src/test/java/net/sf/jsqlparser/statement/delete/DeleteTest.java index aaa7e57cc..7981cc819 100644 --- a/src/test/java/net/sf/jsqlparser/statement/delete/DeleteTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/delete/DeleteTest.java @@ -387,4 +387,14 @@ public void testPreferringClause(String sqlStr) throws JSQLParserException { assertSqlCanBeParsedAndDeparsed(sqlStr); } + @Test + public void testDeleteWithSkylineKeywords() throws JSQLParserException { + String statement = + "DELETE FROM mytable WHERE low = 1 AND high = 2 AND inverse = 3 AND plus = 4"; + Delete delete = (Delete) assertSqlCanBeParsedAndDeparsed(statement); + assertEquals("mytable", delete.getTable().toString()); + assertEquals("low = 1 AND high = 2 AND inverse = 3 AND plus = 4", + delete.getWhere().toString()); + } + } diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java index 7964118f6..4164f1cbc 100644 --- a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java @@ -58,7 +58,8 @@ import net.sf.jsqlparser.expression.operators.relational.GreaterThan; import net.sf.jsqlparser.expression.operators.relational.InExpression; import net.sf.jsqlparser.expression.operators.relational.LikeExpression; -import net.sf.jsqlparser.parser.*; +import net.sf.jsqlparser.parser.CCJSqlParserManager; +import net.sf.jsqlparser.parser.CCJSqlParserUtil; import net.sf.jsqlparser.schema.Column; import net.sf.jsqlparser.schema.Database; import net.sf.jsqlparser.schema.Server; @@ -6131,4 +6132,14 @@ void testSelectAndInsertWithin2Ctes() throws JSQLParserException { insert.toString()); assertEquals(" inserted", withItems.get(1).getAlias().toString()); } + + @Test + public void testSelectWithSkylineKeywords() throws JSQLParserException { + String statement = "SELECT low, high, inverse, plus FROM mytable"; + Select select = (Select) assertSqlCanBeParsedAndDeparsed(statement); + assertEquals("mytable", select.getPlainSelect().getFromItem().toString()); + assertEquals("[low, high, inverse, plus]", + select.getPlainSelect().getSelectItems().toString()); + } + } diff --git a/src/test/java/net/sf/jsqlparser/statement/update/UpdateTest.java b/src/test/java/net/sf/jsqlparser/statement/update/UpdateTest.java index 127b4cfb7..85a31bf16 100644 --- a/src/test/java/net/sf/jsqlparser/statement/update/UpdateTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/update/UpdateTest.java @@ -15,6 +15,7 @@ import net.sf.jsqlparser.expression.JdbcParameter; import net.sf.jsqlparser.expression.LongValue; import net.sf.jsqlparser.expression.StringValue; +import net.sf.jsqlparser.expression.operators.relational.EqualsTo; import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals; import net.sf.jsqlparser.parser.CCJSqlParserManager; import net.sf.jsqlparser.parser.CCJSqlParserUtil; @@ -566,4 +567,19 @@ public void testUpdateWithBoolean() throws JSQLParserException { assertTrue(((BooleanValue) update.getUpdateSets().get(1).getValues().get(0)).getValue()); assertInstanceOf(GreaterThanEquals.class, update.getWhere()); } + + @Test + public void testUpdateWithSkylineKeywords() throws JSQLParserException { + String statement = + "UPDATE mytable SET low = 1, high = 2, inverse = 3, plus = 4 WHERE id = 6"; + Update update = (Update) PARSER_MANAGER.parse(new StringReader(statement)); + assertEquals("mytable", update.getTable().toString()); + assertEquals(4, update.getUpdateSets().size()); + assertEquals("low", update.getUpdateSets().get(0).getColumns().get(0).getColumnName()); + assertEquals("high", update.getUpdateSets().get(1).getColumns().get(0).getColumnName()); + assertEquals("inverse", update.getUpdateSets().get(2).getColumns().get(0).getColumnName()); + assertEquals("plus", update.getUpdateSets().get(3).getColumns().get(0).getColumnName()); + assertInstanceOf(EqualsTo.class, update.getWhere()); + } + } From 183917062ec67a3791befe776ba58dcb19e05e05 Mon Sep 17 00:00:00 2001 From: manticore-projects Date: Tue, 7 Jan 2025 16:33:16 +0700 Subject: [PATCH 004/104] build: github stack overflow Signed-off-by: Andreas Reichel Signed-off-by: manticore-projects --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0496cde3..e09512f26 100644 --- a/pom.xml +++ b/pom.xml @@ -446,7 +446,9 @@ 2g 800m none - + + -J-Xss2m + @@ -364,7 +361,7 @@ org.jacoco jacoco-maven-plugin - 0.8.10 + 0.8.11 @@ -383,7 +380,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.28.0 + 2.43.0 origin/master diff --git a/src/test/java/net/sf/jsqlparser/expression/OracleHierarchicalExpressionTest.java b/src/test/java/net/sf/jsqlparser/expression/OracleHierarchicalExpressionTest.java index d4b5ed86c..2e17ad1f0 100644 --- a/src/test/java/net/sf/jsqlparser/expression/OracleHierarchicalExpressionTest.java +++ b/src/test/java/net/sf/jsqlparser/expression/OracleHierarchicalExpressionTest.java @@ -1,3 +1,12 @@ +/*- + * #%L + * JSQLParser library + * %% + * Copyright (C) 2004 - 2025 JSQLParser + * %% + * Dual licensed under GNU LGPL 2.1 or Apache License 2.0 + * #L% + */ package net.sf.jsqlparser.expression; import net.sf.jsqlparser.JSQLParserException; From 560e4076f70a97b82ef6289b7a013143a1a2f5ea Mon Sep 17 00:00:00 2001 From: tw Date: Sun, 4 May 2025 23:43:23 +0200 Subject: [PATCH 099/104] reintroduced forked compiling --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ef519381..7e930064e 100644 --- a/pom.xml +++ b/pom.xml @@ -192,13 +192,15 @@ maven-compiler-plugin - 3.13.0 + 3.14.0 11 11 true ${project.build.sourceEncoding} true + 2000m + true From 849167cf9da0730e89f0527ce13909d274a9eeab Mon Sep 17 00:00:00 2001 From: tw Date: Sun, 4 May 2025 23:52:09 +0200 Subject: [PATCH 100/104] [maven-release-plugin] prepare release jsqlparser-5.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7e930064e..9fe4a57aa 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.github.jsqlparser jsqlparser - 5.2-SNAPSHOT + 5.2 JSQLParser library 2004 @@ -106,7 +106,7 @@ scm:git:https://github.com/JSQLParser/JSqlParser.git scm:git:ssh://git@github.com:JSQLParser/JSqlParser.git https://github.com/JSQLParser/JSqlParser.git - HEAD + jsqlparser-5.2 From 4bf50ec5d19dc424c463f80ca43c917cbd663374 Mon Sep 17 00:00:00 2001 From: tw Date: Sun, 4 May 2025 23:52:12 +0200 Subject: [PATCH 101/104] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9fe4a57aa..da18b6e55 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.github.jsqlparser jsqlparser - 5.2 + 5.3-SNAPSHOT JSQLParser library 2004 @@ -106,7 +106,7 @@ scm:git:https://github.com/JSQLParser/JSqlParser.git scm:git:ssh://git@github.com:JSQLParser/JSqlParser.git https://github.com/JSQLParser/JSqlParser.git - jsqlparser-5.2 + HEAD From 7be59ab74a7a3e0b1555575837fb9556df7a172f Mon Sep 17 00:00:00 2001 From: tw Date: Mon, 5 May 2025 00:01:29 +0200 Subject: [PATCH 102/104] [maven-release-plugin] rollback the release of jsqlparser-5.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index da18b6e55..7e930064e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.github.jsqlparser jsqlparser - 5.3-SNAPSHOT + 5.2-SNAPSHOT JSQLParser library 2004 From a3d5f908bdc704f6670f42d51a33f2cfd0fbb68a Mon Sep 17 00:00:00 2001 From: tw Date: Mon, 5 May 2025 00:05:13 +0200 Subject: [PATCH 103/104] added more stackmemory to compiler --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 7e930064e..b293789f8 100644 --- a/pom.xml +++ b/pom.xml @@ -200,6 +200,9 @@ ${project.build.sourceEncoding} true 2000m + + -J-Xss4M + true From 838c834e40d98353870cbf4ea72d75760b43f4a1 Mon Sep 17 00:00:00 2001 From: tw Date: Mon, 5 May 2025 00:11:11 +0200 Subject: [PATCH 104/104] [maven-release-plugin] prepare release jsqlparser-5.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b293789f8..d9e5832e0 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.github.jsqlparser jsqlparser - 5.2-SNAPSHOT + 5.2 JSQLParser library 2004 @@ -106,7 +106,7 @@ scm:git:https://github.com/JSQLParser/JSqlParser.git scm:git:ssh://git@github.com:JSQLParser/JSqlParser.git https://github.com/JSQLParser/JSqlParser.git - HEAD + jsqlparser-5.2