Skip to content

Commit dc14c4b

Browse files
nicky6snicky6s
authored
fix insert default values statements not parsing (#2050)
1 parent aca82f5 commit dc14c4b

File tree

7 files changed

+92
-4
lines changed

7 files changed

+92
-4
lines changed

‎src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public class ParserKeywordsUtils {
6060
{"CREATE", RESTRICTED_ALIAS},
6161
{"CROSS", RESTRICTED_SQL2016},
6262
{"CURRENT", RESTRICTED_JSQLPARSER},
63+
{"DEFAULT", RESTRICTED_ALIAS},
6364
{"DISTINCT", RESTRICTED_SQL2016},
6465
{"DOUBLE", RESTRICTED_ALIAS},
6566
{"ELSE", RESTRICTED_JSQLPARSER},

‎src/main/java/net/sf/jsqlparser/statement/insert/Insert.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class Insert implements Statement {
3737
private OracleHint oracleHint = null;
3838
private ExpressionList<Column> columns;
3939
private Select select;
40+
private boolean onlyDefaultValues = false;
4041
private List<UpdateSet> duplicateUpdateSets = null;
4142
private InsertModifierPriority modifierPriority = null;
4243
private boolean modifierIgnore = false;
@@ -162,7 +163,6 @@ public void setModifierIgnore(boolean modifierIgnore) {
162163
this.modifierIgnore = modifierIgnore;
163164
}
164165

165-
166166
@Deprecated
167167
public boolean isUseSet() {
168168
return setUpdateSets != null && !setUpdateSets.isEmpty();
@@ -176,6 +176,19 @@ public void setWithItemsList(List<WithItem> withItemsList) {
176176
this.withItemsList = withItemsList;
177177
}
178178

179+
public boolean isOnlyDefaultValues() {
180+
return onlyDefaultValues;
181+
}
182+
183+
public void setOnlyDefaultValues(boolean onlyDefaultValues) {
184+
this.onlyDefaultValues = onlyDefaultValues;
185+
}
186+
187+
public Insert withOnlyDefaultValues(boolean onlyDefaultValues) {
188+
this.setOnlyDefaultValues(onlyDefaultValues);
189+
return this;
190+
}
191+
179192
public InsertConflictTarget getConflictTarget() {
180193
return conflictTarget;
181194
}
@@ -230,6 +243,10 @@ public String toString() {
230243
sql.append("INTO ");
231244
sql.append(table).append(" ");
232245

246+
if (onlyDefaultValues) {
247+
sql.append("DEFAULT VALUES");
248+
}
249+
233250
if (columns != null) {
234251
sql.append("(");
235252
for (int i = 0; i < columns.size(); i++) {

‎src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ public void deParse(Insert insert) {
6464
buffer.append("INTO ");
6565

6666
buffer.append(insert.getTable().toString());
67+
68+
if (insert.isOnlyDefaultValues()) {
69+
buffer.append(" DEFAULT VALUES");
70+
}
71+
6772
if (insert.getColumns() != null) {
6873
buffer.append(" (");
6974
for (Iterator<Column> iter = insert.getColumns().iterator(); iter.hasNext();) {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,6 +1602,8 @@ Insert Insert( List<WithItem> with ):
16021602
[ outputClause = OutputClause() { insert.setOutputClause(outputClause); } ]
16031603

16041604
(
1605+
<K_DEFAULT> <K_VALUES> { insert.setOnlyDefaultValues(true); }
1606+
|
16051607
(
16061608
<K_SET> updateSets = UpdateSets() { insert.withSetUpdateSets(updateSets); }
16071609
)
@@ -1959,7 +1961,7 @@ String RelObjectNameWithoutValue() :
19591961
{ Token tk = null; }
19601962
{
19611963
( tk=<DATA_TYPE> | tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR> | tk=<K_TEXT_LITERAL>
1962-
| 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="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="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | 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="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | 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="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | 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="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRIMARY" | tk="PRIOR" | 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="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="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUE" | 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" )
1964+
| 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="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="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="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | 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="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | 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="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRIMARY" | tk="PRIOR" | 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="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="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUE" | 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" )
19631965
{ return tk.image; }
19641966
}
19651967

@@ -1973,7 +1975,7 @@ String RelObjectName() :
19731975
(result = RelObjectNameWithoutValue()
19741976
| tk=<K_GROUP> | tk=<K_INTERVAL> | tk=<K_ON> | tk=<K_START> | tk=<K_TOP> | tk=<K_VALUE>
19751977
| tk=<K_VALUES> | tk=<K_CREATE> | tk=<K_TABLES> | tk=<K_CONNECT> | tk=<K_IGNORE >
1976-
| tk=<K_QUALIFY>
1978+
| tk=<K_QUALIFY> | tk=<K_DEFAULT>
19771979
)
19781980

19791981
{ return tk!=null ? tk.image : result; }

‎src/site/sphinx/keywords.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ The following Keywords are **restricted** in JSQLParser-|JSQLPARSER_VERSION| and
3737
+----------------------+-------------+-----------+
3838
| CURRENT | Yes | Yes |
3939
+----------------------+-------------+-----------+
40-
| DISTINCT | Yes | Yes |
40+
| DEFAULT | Yes | |
41+
+----------------------+-------------+-----------+
42+
| DISTINCT | Yes | Yes |
4143
+----------------------+-------------+-----------+
4244
| DOUBLE | Yes | |
4345
+----------------------+-------------+-----------+

‎src/test/java/net/sf/jsqlparser/statement/insert/InsertTest.java

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package net.sf.jsqlparser.statement.insert;
1111

1212
import net.sf.jsqlparser.JSQLParserException;
13+
import net.sf.jsqlparser.expression.Alias;
1314
import net.sf.jsqlparser.expression.DoubleValue;
1415
import net.sf.jsqlparser.expression.Expression;
1516
import net.sf.jsqlparser.expression.JdbcParameter;
@@ -590,4 +591,55 @@ void testMultiColumnConflictTargetIssue955() throws JSQLParserException {
590591
+ "on conflict(xxx0, xxx1) do update set xxx1=?, update_time=?";
591592
assertSqlCanBeParsedAndDeparsed(sqlStr, true);
592593
}
594+
595+
@Test
596+
public void testDefaultValues() throws JSQLParserException {
597+
String statement = "INSERT INTO mytable DEFAULT VALUES";
598+
//assertSqlCanBeParsedAndDeparsed(statement);
599+
Insert insert = (Insert) parserManager.parse(new StringReader(statement));
600+
assertEquals("mytable", insert.getTable().getFullyQualifiedName());
601+
assertEquals("INSERT INTO MYTABLE DEFAULT VALUES", insert.toString().toUpperCase());
602+
assertTrue(insert.isOnlyDefaultValues());
603+
assertDeparse(new Insert()
604+
.withTable(new Table("mytable"))
605+
.withOnlyDefaultValues(true), statement);
606+
}
607+
608+
@Test
609+
public void testDefaultValuesWithAlias() throws JSQLParserException {
610+
String statement = "INSERT INTO mytable x DEFAULT VALUES";
611+
assertSqlCanBeParsedAndDeparsed(statement);
612+
Insert insert = (Insert) parserManager.parse(new StringReader(statement));
613+
assertEquals("mytable", insert.getTable().getFullyQualifiedName());
614+
assertEquals("INSERT INTO MYTABLE X DEFAULT VALUES", insert.toString().toUpperCase());
615+
assertEquals("x", insert.getTable().getAlias().getName());
616+
assertTrue(insert.isOnlyDefaultValues());
617+
assertDeparse(new Insert()
618+
.withTable(new Table("mytable")
619+
.withAlias(new Alias("x").withUseAs(false)))
620+
.withOnlyDefaultValues(true), statement);
621+
}
622+
623+
@Test
624+
public void testDefaultValuesWithAliasAndAs() throws JSQLParserException {
625+
String statement = "INSERT INTO mytable AS x DEFAULT VALUES";
626+
assertSqlCanBeParsedAndDeparsed(statement);
627+
Insert insert = (Insert) parserManager.parse(new StringReader(statement));
628+
assertEquals("mytable", insert.getTable().getFullyQualifiedName());
629+
assertEquals("INSERT INTO MYTABLE AS X DEFAULT VALUES", insert.toString().toUpperCase());
630+
assertEquals("x", insert.getTable().getAlias().getName());
631+
assertTrue(insert.isOnlyDefaultValues());
632+
assertDeparse(new Insert()
633+
.withTable(new Table("mytable")
634+
.withAlias(new Alias("x").withUseAs(true)))
635+
.withOnlyDefaultValues(true), statement);
636+
}
637+
638+
@Test
639+
public void throwsParseWhenDefaultKeyowrdUsedAsAlias() {
640+
String statement = "INSERT INTO mytable default DEFAULT VALUES";
641+
assertThrows(JSQLParserException.class,
642+
() -> parserManager.parse(new StringReader(statement)));
643+
}
644+
593645
}

‎src/test/java/net/sf/jsqlparser/statement/truncate/TruncateTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static net.sf.jsqlparser.test.TestUtils.assertDeparse;
1919
import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
2020
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertThrows;
2122

2223
import org.junit.jupiter.api.Test;
2324

@@ -104,4 +105,12 @@ public void testTruncateOnlyAndCascadeDeparse() throws JSQLParserException {
104105
.withCascade(true)
105106
.withOnly(true), statement);
106107
}
108+
109+
@Test
110+
public void throwsParseWhenOnlyUsedWithMultipleTables() {
111+
String statement = "TRUNCATE TABLE ONLY foo, bar";
112+
assertThrows(JSQLParserException.class,
113+
() -> parserManager.parse(new StringReader(statement)));
114+
}
115+
107116
}

0 commit comments

Comments
 (0)