From 8027dbf2cbf9163524105b67fae45f07c0cadd5f Mon Sep 17 00:00:00 2001 From: Andreas Reichel Date: Fri, 2 Jun 2023 14:05:30 +0700 Subject: [PATCH] feat: T-SQL `FOR ...` clause - fixes #1800 --- .../jsqlparser/expression/TrimFunction.java | 2 +- .../jsqlparser/parser/ASTNodeAccessImpl.java | 11 ++ .../statement/select/ForClause.java | 29 +++ .../jsqlparser/statement/select/Select.java | 16 ++ .../util/deparser/ExpressionDeParser.java | 4 +- .../util/deparser/SelectDeParser.java | 4 + .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 181 +++++++++++++----- .../statement/select/ForClauseTest.java | 93 +++++++++ .../statement/select/SelectTest.java | 3 +- 9 files changed, 296 insertions(+), 47 deletions(-) create mode 100644 src/main/java/net/sf/jsqlparser/statement/select/ForClause.java create mode 100644 src/test/java/net/sf/jsqlparser/statement/select/ForClauseTest.java diff --git a/src/main/java/net/sf/jsqlparser/expression/TrimFunction.java b/src/main/java/net/sf/jsqlparser/expression/TrimFunction.java index 40c4678af..def6ec3d1 100644 --- a/src/main/java/net/sf/jsqlparser/expression/TrimFunction.java +++ b/src/main/java/net/sf/jsqlparser/expression/TrimFunction.java @@ -96,7 +96,7 @@ public void accept(ExpressionVisitor expressionVisitor) { expressionVisitor.visit(this); } - StringBuilder appendTo(StringBuilder builder) { + public StringBuilder appendTo(StringBuilder builder) { builder.append("Trim("); if (trimSpecification != null) { diff --git a/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java b/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java index b03858982..e13ec6ff6 100644 --- a/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java +++ b/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java @@ -23,4 +23,15 @@ public void setASTNode(SimpleNode node) { this.node = node; } + public StringBuilder appendTo(StringBuilder builder) { + SimpleNode simpleNode = getASTNode(); + Token token = simpleNode.jjtGetFirstToken(); + Token lastToken = simpleNode.jjtGetLastToken(); + while (token.next != null && token.absoluteEnd <= lastToken.absoluteEnd) { + builder.append(" ").append(token.image); + token = token.next; + } + return builder; + } + } diff --git a/src/main/java/net/sf/jsqlparser/statement/select/ForClause.java b/src/main/java/net/sf/jsqlparser/statement/select/ForClause.java new file mode 100644 index 000000000..e06ff248b --- /dev/null +++ b/src/main/java/net/sf/jsqlparser/statement/select/ForClause.java @@ -0,0 +1,29 @@ +package net.sf.jsqlparser.statement.select; + +import net.sf.jsqlparser.parser.ASTNodeAccessImpl; + +public class ForClause extends ASTNodeAccessImpl { + public enum ForOption { + BROWSE, XML, JSON; + + public static ForOption from(String option) { + return Enum.valueOf(ForOption.class, option.toUpperCase()); + } + } + + private ForOption forOption; + + public ForOption getForOption() { + return forOption; + } + + public ForClause setForOption(String forOption) { + this.forOption = ForOption.from(forOption); + return this; + } + + @Override + public String toString() { + return appendTo(new StringBuilder()).toString(); + } +} diff --git a/src/main/java/net/sf/jsqlparser/statement/select/Select.java b/src/main/java/net/sf/jsqlparser/statement/select/Select.java index 757adb5b4..2216fada9 100644 --- a/src/main/java/net/sf/jsqlparser/statement/select/Select.java +++ b/src/main/java/net/sf/jsqlparser/statement/select/Select.java @@ -30,6 +30,9 @@ public abstract class Select extends ASTNodeAccessImpl implements Statement, Exp Fetch fetch; WithIsolation isolation; boolean oracleSiblings = false; + + ForClause forClause = null; + List orderByElements; public static String orderByToString(List orderByElements) { @@ -154,6 +157,15 @@ public Select withOracleSiblings(boolean oracleSiblings) { return this; } + public ForClause getForClause() { + return forClause; + } + + public Select setForClause(ForClause forClause) { + this.forClause = forClause; + return this; + } + public List getOrderByElements() { return orderByElements; } @@ -261,6 +273,10 @@ public StringBuilder appendTo(StringBuilder builder) { appendSelectBodyTo(builder); + if (forClause != null) { + forClause.appendTo(builder); + } + builder.append(orderByToString(oracleSiblings, orderByElements)); if (limitBy != null) { diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java index e49fcf0f0..bcfd5fdd4 100644 --- a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java +++ b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java @@ -820,12 +820,12 @@ public void visit(IntervalExpression intervalExpression) { if (intervalExpression.isUsingIntervalKeyword()) { buffer.append("INTERVAL "); } - if (intervalExpression.getExpression()!=null) { + if (intervalExpression.getExpression() != null) { intervalExpression.getExpression().accept(this); } else { buffer.append(intervalExpression.getParameter()); } - if (intervalExpression.getIntervalType()!=null) { + if (intervalExpression.getIntervalType() != null) { buffer.append(" ").append(intervalExpression.getIntervalType()); } } diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java index 09f46dfdc..b1a5ab42b 100644 --- a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java +++ b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java @@ -272,6 +272,10 @@ public void visit(PlainSelect plainSelect) { buffer.append(" SKIP LOCKED"); } } + if (plainSelect.getForClause() != null) { + plainSelect.getForClause().appendTo(buffer); + } + if (plainSelect.getOrderByElements() != null) { new OrderByDeParser(expressionVisitor, buffer).deParse(plainSelect.isOracleSiblings(), plainSelect.getOrderByElements()); diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index a346a0604..8c365cdc3 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -148,11 +148,13 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | | | +| | | | @@ -209,6 +211,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -220,6 +223,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -254,6 +258,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -345,6 +350,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -364,6 +370,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -443,12 +450,16 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | | | +| +| | +| | | | @@ -1718,7 +1729,7 @@ String RelObjectNameWithoutValue() : { Token tk = null; } { ( 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="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="BEGIN" | tk="BINARY" | tk="BIT" | 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="CONFLICT" | tk="CONVERT" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATABASE" | 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="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GLOBAL" | tk="GRANT" | tk="GUARD" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MEMBER" | tk="MERGE" | 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="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="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGISTER" | tk="RENAME" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRIGGER" | tk="TRUE" | tk="TRUNCATE" | 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="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLTEXT" | 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="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="BEGIN" | tk="BINARY" | tk="BIT" | 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="CONFLICT" | tk="CONVERT" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATABASE" | 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="GLOBAL" | tk="GRANT" | tk="GUARD" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MEMBER" | tk="MERGE" | 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="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="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGISTER" | tk="RENAME" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRIGGER" | tk="TRUE" | tk="TRUNCATE" | 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="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" ) { return tk.image; } } @@ -1826,24 +1837,22 @@ Select Select() #Select: WithIsolation withIsolation = null; } { + [ with=WithList() ] ( - [ with=WithList() ] - ( - LOOKAHEAD(3) select = PlainSelect() - | - LOOKAHEAD(3) select = Values() - | - LOOKAHEAD(3) select = ParenthesedSelect() - ) - [ LOOKAHEAD(2) select = SetOperationList(select) ] + LOOKAHEAD(3) select = PlainSelect() + | + LOOKAHEAD(3) select = Values() + | + LOOKAHEAD(3) select = ParenthesedSelect() + ) + [ LOOKAHEAD(2) select = SetOperationList(select) ] - [ LOOKAHEAD( ) orderByElements = OrderByElements() { select.setOrderByElements(orderByElements); } ] + [ LOOKAHEAD( ) orderByElements = OrderByElements() { select.setOrderByElements(orderByElements); } ] - [ LOOKAHEAD() limit=LimitWithOffset() {select.setLimit(limit);} ] - [ LOOKAHEAD() offset = Offset() { select.setOffset(offset);} ] - [ LOOKAHEAD() fetch = Fetch() { select.setFetch(fetch);} ] - [ LOOKAHEAD( ) withIsolation = WithIsolation() { select.setIsolation(withIsolation);} ] - ) + [ LOOKAHEAD() limit=LimitWithOffset() {select.setLimit(limit);} ] + [ LOOKAHEAD() offset = Offset() { select.setOffset(offset);} ] + [ LOOKAHEAD() fetch = Fetch() { select.setFetch(fetch);} ] + [ LOOKAHEAD( ) withIsolation = WithIsolation() { select.setIsolation(withIsolation);} ] { linkAST(select, jjtThis); @@ -1896,6 +1905,80 @@ LateralView LateralView() #LateralView: } } +ForClause ForClause() #ForClause: +{ + Token token = null; + ForClause forClause = new ForClause(); +} +{ + + ( + token = + | + token = + ( + ( + ( [ LOOKAHEAD(2) "(" ")" ] | ) + ( + LOOKAHEAD(2) "," + ( + + | + | [ LOOKAHEAD(2) "(" ")" ] + | + | [ LOOKAHEAD(2) "(" ")" ] + | [ LOOKAHEAD(2) ( | ) ] + ) + )* + ) + | + ( + + ( + LOOKAHEAD(2) "," + ( + + | + | [ LOOKAHEAD(2) "(" ")" ] + | + ) + )* + ) + | + ( + [ LOOKAHEAD(2) "(" ")" ] + ( + LOOKAHEAD(2) "," + ( + + | + | [ LOOKAHEAD(2) "(" ")" ] + | [ LOOKAHEAD(2) ( | ) ] + ) + )* + ) + ) + | + ( + token = ( | ) + ( + LOOKAHEAD(2) "," + ( + [ LOOKAHEAD(2) "(" ")" ] + | + | + ) + )* + ) + ) + { + forClause.setForOption(token.image); + linkAST(forClause,jjtThis); + return forClause; + } +} + + List LateralViews(): { ArrayList lateralViews = new ArrayList(); @@ -1932,6 +2015,7 @@ PlainSelect PlainSelect() #PlainSelect: List joins = null; List> distinctOn = null; Expression where = null; + ForClause forClause = null; List orderByElements; GroupByElement groupBy = null; Expression having = null; @@ -2005,6 +2089,7 @@ PlainSelect PlainSelect() #PlainSelect: [ LOOKAHEAD(2) having=Having() { plainSelect.setHaving(having); }] [ LOOKAHEAD(2) groupBy=GroupByColumnReferences() { plainSelect.setGroupByElement(groupBy); }] [ LOOKAHEAD(2) having=Having() { plainSelect.setHaving(having); }] + [ LOOKAHEAD(2) forClause = ForClause() {plainSelect.setForClause(forClause);} ] [ LOOKAHEAD( ) orderByElements = OrderByElements() { plainSelect.setOracleSiblings(true); plainSelect.setOrderByElements(orderByElements); } ] [ LOOKAHEAD(2) windowName = RelObjectName() winDef = windowDefinition() { List winDefs = new ArrayList(); winDefs.add(winDef.withWindowName(windowName)); } @@ -2027,9 +2112,6 @@ PlainSelect PlainSelect() #PlainSelect: ] [ LOOKAHEAD() optimize = OptimizeFor() { plainSelect.setOptimizeFor(optimize); } ] - - [ LOOKAHEAD(3) "(" token = ")" { plainSelect.setForXmlPath(token.image); } ] - { plainSelect.setSelectItems(selectItems); plainSelect.setFromItem(fromItem); @@ -2858,8 +2940,9 @@ Limit LimitBy(): } { limit = LimitWithOffset() - byExpressions = ExpressionList() { limit.setByExpressions(byExpressions); } + byExpressions = ExpressionList() { + limit.setByExpressions(byExpressions); return limit; } } @@ -2926,8 +3009,9 @@ OptimizeFor OptimizeFor(): LongValue value; } { - token= { value = new LongValue(token.image); } + token= { + value = new LongValue(token.image); return new OptimizeFor(value.getValue()); } } @@ -2951,9 +3035,12 @@ Top Top(): ":" { top.setExpression(new JdbcNamedParameter()); } [ LOOKAHEAD(2) token = { ((JdbcNamedParameter)top.getExpression()).setName(token.image); } ] | "(" - expr=AdditiveExpression() { top.setExpression(expr); } - { top.setParenthesis(true);} - ")" + expr=AdditiveExpression() + { + top.setExpression(expr); + top.setParenthesis(true); + } + ")" ) [ LOOKAHEAD(2) { top.setPercentage(true); } ] [ LOOKAHEAD(2) { top.setWithTies(true); }] { @@ -4398,8 +4485,9 @@ IntervalExpression IntervalExpressionWithoutInterval(Expression expr) : { interval = new IntervalExpression(false); interval.setExpression(expr); } - token = { interval.setIntervalType(token.image); } + token = { + interval.setIntervalType(token.image); return interval; } } @@ -5396,8 +5484,11 @@ AlterView AlterView(boolean useReplace): view=Table() { alterView.setView(view); alterView.setUseReplace(useReplace); } [ columnNames = ColumnsNamesList() { alterView.setColumnNames(columnNames); } ] - select=Select() { alterView.setSelect(select); } - { return alterView; } + select=Select() + { + alterView.setSelect(select); + return alterView; + } } List CreateParameter(): @@ -6287,9 +6378,9 @@ Wait Wait(): { // sqlserver-oracle-> WAIT (TIMEOUT) // https://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_10002.htm#i2126016 - token= { wait.setTimeout(Long.parseLong(token.image)); } - + token= { + wait.setTimeout(Long.parseLong(token.image)); return wait; } } @@ -6299,10 +6390,11 @@ SavepointStatement SavepointStatement(): SavepointStatement savepointStatement; } { - token= { savepointStatement = new SavepointStatement(token.image); } - { - return savepointStatement; - } + token= + { + savepointStatement = new SavepointStatement(token.image); + return savepointStatement; + } } RollbackStatement RollbackStatement(): @@ -6364,8 +6456,9 @@ Comment Comment(): view = Table() { result.setView(view); } ) ) - comment= { result.setComment(new StringValue(comment.image)); } + comment= { + result.setComment(new StringValue(comment.image)); return result; } } @@ -6544,10 +6637,11 @@ CreateSequence CreateSequence(): } { sequence=Sequence() { createSequence.setSequence(sequence); } - sequenceParameters = SequenceParameters() { sequence.setParameters(sequenceParameters); } - { - return createSequence; - } + sequenceParameters = SequenceParameters() + { + sequence.setParameters(sequenceParameters); + return createSequence; + } } AlterSequence AlterSequence(): @@ -6557,11 +6651,12 @@ AlterSequence AlterSequence(): List sequenceParameters; } { - sequence=Sequence() { alterSequence.setSequence(sequence); } - sequenceParameters = SequenceParameters() { sequence.setParameters(sequenceParameters); } - { - return alterSequence; - } + sequence=Sequence() { alterSequence.setSequence(sequence); } + sequenceParameters = SequenceParameters() + { + sequence.setParameters(sequenceParameters); + return alterSequence; + } } Statement Create(): diff --git a/src/test/java/net/sf/jsqlparser/statement/select/ForClauseTest.java b/src/test/java/net/sf/jsqlparser/statement/select/ForClauseTest.java new file mode 100644 index 000000000..c4b59d797 --- /dev/null +++ b/src/test/java/net/sf/jsqlparser/statement/select/ForClauseTest.java @@ -0,0 +1,93 @@ +package net.sf.jsqlparser.statement.select; + +import net.sf.jsqlparser.JSQLParserException; +import net.sf.jsqlparser.test.TestUtils; +import org.junit.jupiter.api.Test; + +class ForClauseTest { + + @Test + void testForBrowse() throws JSQLParserException { + String sqlStr = "SELECT * FROM table FOR BROWSE"; + TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); + } + + @Test + void testForXMLPath() throws JSQLParserException { + String sqlStr = + "SELECT * " + + " FROM table " + + " FOR XML PATH('something'), ROOT('trkseg'), TYPE, BINARY BASE64, ELEMENTS ABSENT "; + TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); + } + + @Test + void testForXMLRaw() throws JSQLParserException { + String sqlStr = + "SELECT * " + + " FROM table " + + " FOR XML RAW('something'), ROOT('trkseg'), TYPE, BINARY BASE64, XMLDATA "; + TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); + } + + @Test + void testForXMLAuto() throws JSQLParserException { + String sqlStr = + "SELECT * " + + " FROM table " + + " FOR XML AUTO, ROOT('trkseg'), TYPE, BINARY BASE64, XMLDATA "; + TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); + } + + @Test + void testForXMLExplicit() throws JSQLParserException { + String sqlStr = + "SELECT * " + + " FROM table " + + " FOR XML EXPLICIT, ROOT('trkseg'), TYPE, BINARY BASE64, XMLDATA "; + TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); + } + + @Test + void testForXML() throws JSQLParserException { + String sqlStr = + "SELECT * " + + " FROM table " + + " FOR XML EXPLICIT, ROOT('trkseg'), TYPE, BINARY BASE64, XMLDATA " + + "UNION ALL " + + "SELECT * " + + " FROM table " + + " FOR XML EXPLICIT, ROOT('trkseg'), TYPE, BINARY BASE64, XMLDATA " + + "UNION ALL " + + "SELECT * " + + " FROM table " + + " FOR XML AUTO, ROOT('trkseg'), TYPE, BINARY BASE64, XMLDATA " + + "UNION ALL " + + "SELECT * " + + " FROM table " + + " FOR XML RAW('something'), ROOT('trkseg'), TYPE, BINARY BASE64, XMLDATA "; + TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); + } + + @Test + void testForJSON() throws JSQLParserException { + String sqlStr = + "SELECT * " + + " FROM table " + + " FOR JSON AUTO, ROOT('trkseg'), WITHOUT_ARRAY_WRAPPER, INCLUDE_NULL_VALUES " + + + "UNION ALL " + + "SELECT * " + + " FROM table " + + " FOR JSON PATH, ROOT('trkseg'), INCLUDE_NULL_VALUES, WITHOUT_ARRAY_WRAPPER "; + TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); + } + + @Test + void testIssue1800() throws JSQLParserException { + String sqlStr = + "SELECT (SELECT '1.0' AS '@Version', (SELECT 'Test' AS 'name', (SELECT (SELECT DISTINCT 51.64315 AS '@lat', 14.31709 AS '@lon' FOR XML PATH('trkpt'), TYPE) FOR XML PATH(''), ROOT('trkseg'), TYPE) FOR XML PATH('trk'), TYPE) FOR XML PATH('gpx'), TYPE) FOR XML PATH('')"; + TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); + } + +} 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 0bea90afa..4fafed7e1 100644 --- a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java @@ -4213,7 +4213,8 @@ public void testSqlContainIsNullFunctionShouldBeParsed3() throws JSQLParserExcep @Test public void testForXmlPath() throws JSQLParserException { assertSqlCanBeParsedAndDeparsed( - "SELECT '|' + person_name FROM person JOIN person_group ON person.person_id = person_group.person_id WHERE person_group.group_id = 1 FOR XML PATH('')"); + "SELECT '|' + person_name FROM person JOIN person_group ON person.person_id = person_group.person_id WHERE person_group.group_id = 1 FOR XML PATH('')", + true); } // @Test