Skip to content

Commit f63a456

Browse files
denglimingdengliming
committed
fix(parser): parse SEARCH BREADTH/DEPTH FIRST in recursive CTEs
1 parent c3b1531 commit f63a456

File tree

5 files changed

+203
-8
lines changed

5 files changed

+203
-8
lines changed

‎src/main/java/net/sf/jsqlparser/statement/select/WithItem.java‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@
99
*/
1010
package net.sf.jsqlparser.statement.select;
1111

12-
import net.sf.jsqlparser.expression.Alias;
13-
import net.sf.jsqlparser.statement.ParenthesedStatement;
14-
import net.sf.jsqlparser.statement.StatementVisitor;
15-
import net.sf.jsqlparser.statement.delete.ParenthesedDelete;
16-
import net.sf.jsqlparser.statement.insert.ParenthesedInsert;
17-
import net.sf.jsqlparser.statement.update.ParenthesedUpdate;
18-
1912
import java.io.Serializable;
2013
import java.util.ArrayList;
2114
import java.util.Collection;
2215
import java.util.Collections;
2316
import java.util.List;
2417
import java.util.Optional;
18+
import net.sf.jsqlparser.expression.Alias;
19+
import net.sf.jsqlparser.statement.ParenthesedStatement;
20+
import net.sf.jsqlparser.statement.StatementVisitor;
21+
import net.sf.jsqlparser.statement.delete.ParenthesedDelete;
22+
import net.sf.jsqlparser.statement.insert.ParenthesedInsert;
23+
import net.sf.jsqlparser.statement.update.ParenthesedUpdate;
2524

2625
public class WithItem<K extends ParenthesedStatement> implements Serializable {
2726
private K statement;
2827
private Alias alias;
2928
private List<SelectItem<?>> withItemList;
3029
private WithFunctionDeclaration withFunctionDeclaration;
30+
private WithSearchClause searchClause;
3131
private boolean recursive = false;
3232
private boolean usingNot = false;
3333
private boolean materialized = false;
@@ -136,6 +136,19 @@ public WithItem<K> withWithFunctionDeclaration(
136136
return this;
137137
}
138138

139+
public WithSearchClause getSearchClause() {
140+
return searchClause;
141+
}
142+
143+
public void setSearchClause(WithSearchClause searchClause) {
144+
this.searchClause = searchClause;
145+
}
146+
147+
public WithItem<K> withSearchClause(WithSearchClause searchClause) {
148+
this.setSearchClause(searchClause);
149+
return this;
150+
}
151+
139152
@Override
140153
public String toString() {
141154
StringBuilder builder = new StringBuilder();
@@ -161,6 +174,9 @@ public String toString() {
161174
: "MATERIALIZED ");
162175
}
163176
builder.append(statement);
177+
if (searchClause != null) {
178+
builder.append(" ").append(searchClause);
179+
}
164180
}
165181
return builder.toString();
166182
}

‎src/main/java/net/sf/jsqlparser/statement/select/WithSearchClause.java‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
/*-
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2026 JSQLParser
6+
* %%
7+
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
8+
* #L%
9+
*/
10+
package net.sf.jsqlparser.statement.select;
11+
12+
import java.io.Serializable;
13+
import java.util.ArrayList;
14+
import java.util.Collection;
15+
import java.util.Collections;
16+
import java.util.List;
17+
import java.util.Optional;
18+
import net.sf.jsqlparser.schema.Column;
19+
20+
public class WithSearchClause implements Serializable {
21+
public enum SearchOrder {
22+
BREADTH, DEPTH
23+
}
24+
25+
private SearchOrder searchOrder;
26+
private List<Column> searchColumns;
27+
private String sequenceColumnName;
28+
29+
public WithSearchClause() {}
30+
31+
public WithSearchClause(SearchOrder searchOrder, List<Column> searchColumns,
32+
String sequenceColumnName) {
33+
this.searchOrder = searchOrder;
34+
this.searchColumns = searchColumns;
35+
this.sequenceColumnName = sequenceColumnName;
36+
}
37+
38+
public SearchOrder getSearchOrder() {
39+
return searchOrder;
40+
}
41+
42+
public void setSearchOrder(SearchOrder searchOrder) {
43+
this.searchOrder = searchOrder;
44+
}
45+
46+
public WithSearchClause withSearchOrder(SearchOrder searchOrder) {
47+
this.setSearchOrder(searchOrder);
48+
return this;
49+
}
50+
51+
public List<Column> getSearchColumns() {
52+
return searchColumns;
53+
}
54+
55+
public void setSearchColumns(List<Column> searchColumns) {
56+
this.searchColumns = searchColumns;
57+
}
58+
59+
public WithSearchClause withSearchColumns(List<Column> searchColumns) {
60+
this.setSearchColumns(searchColumns);
61+
return this;
62+
}
63+
64+
public WithSearchClause addSearchColumns(Column... searchColumns) {
65+
List<Column> collection = Optional.ofNullable(getSearchColumns()).orElseGet(ArrayList::new);
66+
Collections.addAll(collection, searchColumns);
67+
return this.withSearchColumns(collection);
68+
}
69+
70+
public WithSearchClause addSearchColumns(Collection<? extends Column> searchColumns) {
71+
List<Column> collection = Optional.ofNullable(getSearchColumns()).orElseGet(ArrayList::new);
72+
collection.addAll(searchColumns);
73+
return this.withSearchColumns(collection);
74+
}
75+
76+
public String getSequenceColumnName() {
77+
return sequenceColumnName;
78+
}
79+
80+
public void setSequenceColumnName(String sequenceColumnName) {
81+
this.sequenceColumnName = sequenceColumnName;
82+
}
83+
84+
public WithSearchClause withSequenceColumnName(String sequenceColumnName) {
85+
this.setSequenceColumnName(sequenceColumnName);
86+
return this;
87+
}
88+
89+
@Override
90+
public String toString() {
91+
return new StringBuilder()
92+
.append("SEARCH ")
93+
.append(searchOrder)
94+
.append(" FIRST BY ")
95+
.append(Select.getStringList(searchColumns))
96+
.append(" SET ")
97+
.append(sequenceColumnName)
98+
.toString();
99+
}
100+
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,9 @@ public <S> StringBuilder visit(WithItem<?> withItem, S context) {
755755
StatementDeParser statementDeParser =
756756
new StatementDeParser((ExpressionDeParser) expressionVisitor, this, builder);
757757
statementDeParser.deParse(withItem.getParenthesedStatement());
758+
if (withItem.getSearchClause() != null) {
759+
builder.append(" ").append(withItem.getSearchClause());
760+
}
758761
} else {
759762
builder.append(withItem.getWithFunctionDeclaration().toString());
760763
}

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

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
276276
| <K_BLOCK: "BLOCK">
277277
| <K_BOOLEAN:"BOOLEAN">
278278
| <K_BOTH:"BOTH">
279+
| <K_BREADTH:"BREADTH">
279280
| <K_BRANCH:"BRANCH">
280281
| <K_BROWSE:"BROWSE">
281282
| <K_BY:"BY">
@@ -328,6 +329,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
328329
| <K_DBA_RECYCLEBIN: "DBA_RECYCLEBIN">
329330
| <K_DEFAULT : "DEFAULT">
330331
| <K_DEFAULTS: "DEFAULTS">
332+
| <K_DEPTH: "DEPTH">
331333
| <K_DEFERRABLE : "DEFERRABLE">
332334
| <K_DELAYED : "DELAYED">
333335
| <K_DELETE:"DELETE">
@@ -593,6 +595,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
593595
| <K_SAMPLE: "SAMPLE">
594596
| <K_SAVEPOINT: "SAVEPOINT">
595597
| <K_SCHEMA: "SCHEMA">
598+
| <K_SEARCH:"SEARCH">
596599
| <K_SCRIPT: "SCRIPT">
597600
| <K_SECURE: "SECURE">
598601
| <K_SECURITY:"SECURITY">
@@ -3470,7 +3473,7 @@ String RelObjectNameWithoutValue() :
34703473
{ Token tk = null; }
34713474
{
34723475
( 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>
3473-
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="AGGREGATE" | tk="ALGORITHM" | tk="ALIGN" | tk="ALTER" | tk="ALWAYS" | tk="ANALYZE" | tk="APPEND_ONLY" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="ASYMMETRIC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="AZURE" | tk="BASE64" | tk="BEFORE" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOBSTORAGE" | tk="BLOCK" | tk="BOOLEAN" | tk="BRANCH" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CERTIFICATE" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="CLOUD" | tk="COALESCE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMENTS" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="CORRESPONDING" | tk="COSTS" | tk="COUNT" | tk="CREATED" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFAULTS" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DELIMIT" | tk="DELIMITER" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCARD" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DRIVER" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCODING" | tk="ENCRYPTION" | tk="END" | tk="ENFORCED" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXA" | tk="EXCHANGE" | tk="EXCLUDE" | tk="EXCLUDING" | tk="EXCLUSIVE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXPORT" | 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="IDENTIFIED" | tk="IDENTITY" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCLUDING" | tk="INCREMENT" | tk="INDEX" | tk="INFORMATION" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="INVERSE" | tk="INVISIBLE" | tk="ISNULL" | tk="JDBC" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="KEY_BLOCK_SIZE" | tk="KILL" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LEVEL" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW" | tk="LOW_PRIORITY" | tk="LTRIM" | 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="MODE" | tk="MODIFY" | tk="MOVEMENT" | tk="NAME" | tk="NAMES" | tk="NEVER" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NONE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="ORA" | tk="ORDINALITY" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="OVERRIDING" | tk="OVERWRITE" | tk="PADDING" | tk="PARALLEL" | tk="PARENT" | tk="PARSER" | tk="PARTITION" | tk="PARTITIONING" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PLUS" | tk="POLICY" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="REBUILD" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REJECT" | tk="REMOTE" | tk="REMOVE" | tk="RENAME" | tk="REORGANIZE" | tk="REPAIR" | 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="RTRIM" | tk="SAFE_CAST" | tk="SAFE_CONVERT" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SECURITY" | 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="SPATIAL" | tk="STORED" | tk="STREAM" | tk="STRICT" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYMMETRIC" | tk="SYNONYM" | tk="SYSTEM" | tk="SYSTEM_TIME" | tk="SYSTEM_TIMESTAMP" | tk="SYSTEM_VERSION" | 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="TRY_CONVERT" | tk="TUMBLING" | tk="TYPE" | tk="UNLIMITED" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VALIDATION" | tk="VERBOSE" | tk="VERSION" | tk="VIEW" | tk="VISIBLE" | 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" )
3476+
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="AGGREGATE" | tk="ALGORITHM" | tk="ALIGN" | tk="ALTER" | tk="ALWAYS" | tk="ANALYZE" | tk="APPEND_ONLY" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="ASYMMETRIC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="AZURE" | tk="BASE64" | tk="BEFORE" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOBSTORAGE" | tk="BLOCK" | tk="BOOLEAN" | tk="BREADTH" | tk="BRANCH" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CERTIFICATE" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="CLOUD" | tk="COALESCE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMENTS" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="CORRESPONDING" | tk="COSTS" | tk="COUNT" | tk="CREATED" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFAULTS" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DELIMIT" | tk="DELIMITER" | tk="DEPTH" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCARD" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DRIVER" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCODING" | tk="ENCRYPTION" | tk="END" | tk="ENFORCED" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXA" | tk="EXCHANGE" | tk="EXCLUDE" | tk="EXCLUDING" | tk="EXCLUSIVE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXPORT" | 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="IDENTIFIED" | tk="IDENTITY" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCLUDING" | tk="INCREMENT" | tk="INDEX" | tk="INFORMATION" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="INVERSE" | tk="INVISIBLE" | tk="ISNULL" | tk="JDBC" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="KEY_BLOCK_SIZE" | tk="KILL" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LEVEL" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW" | tk="LOW_PRIORITY" | tk="LTRIM" | 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="MODE" | tk="MODIFY" | tk="MOVEMENT" | tk="NAME" | tk="NAMES" | tk="NEVER" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NONE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="ORA" | tk="ORDINALITY" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="OVERRIDING" | tk="OVERWRITE" | tk="PADDING" | tk="PARALLEL" | tk="PARENT" | tk="PARSER" | tk="PARTITION" | tk="PARTITIONING" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PLUS" | tk="POLICY" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="REBUILD" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REJECT" | tk="REMOTE" | tk="REMOVE" | tk="RENAME" | tk="REORGANIZE" | tk="REPAIR" | 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="RTRIM" | tk="SAFE_CAST" | tk="SAFE_CONVERT" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEARCH" | tk="SECURE" | tk="SECURITY" | 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="SPATIAL" | tk="STORED" | tk="STREAM" | tk="STRICT" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYMMETRIC" | tk="SYNONYM" | tk="SYSTEM" | tk="SYSTEM_TIME" | tk="SYSTEM_TIMESTAMP" | tk="SYSTEM_VERSION" | 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="TRY_CONVERT" | tk="TUMBLING" | tk="TYPE" | tk="UNLIMITED" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VALIDATION" | tk="VERBOSE" | tk="VERSION" | tk="VIEW" | tk="VISIBLE" | 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" )
34743477
{ return tk.image; }
34753478
}
34763479

@@ -4592,6 +4595,7 @@ WithItem<?> WithItem() #WithItem:
45924595
List<SelectItem<?>> selectItems = null;
45934596
WithFunctionDeclaration withFunctionDeclaration = null;
45944597
ParenthesedStatement statement = null;
4598+
WithSearchClause withSearchClause = null;
45954599
WithItem<?> withItem;
45964600
}
45974601
{
@@ -4624,11 +4628,37 @@ WithItem<?> WithItem() #WithItem:
46244628
}
46254629
)
46264630
)
4631+
[ withSearchClause = WithSearchClause() { withItem.setSearchClause(withSearchClause); } ]
46274632
{
46284633
return withItem;
46294634
}
46304635
}
46314636

4637+
WithSearchClause WithSearchClause() #WithSearchClause:
4638+
{
4639+
Token orderingToken;
4640+
List<Column> searchColumns = new ArrayList<Column>();
4641+
Column searchColumn = null;
4642+
String sequenceColumnName;
4643+
}
4644+
{
4645+
<K_SEARCH>
4646+
( orderingToken=<K_BREADTH> | orderingToken=<K_DEPTH> )
4647+
<K_FIRST>
4648+
<K_BY>
4649+
searchColumn = Column() { searchColumns.add(searchColumn); }
4650+
( "," searchColumn = Column() { searchColumns.add(searchColumn); } )*
4651+
<K_SET>
4652+
sequenceColumnName = RelObjectName()
4653+
{
4654+
return new WithSearchClause(
4655+
"BREADTH".equalsIgnoreCase(orderingToken.image)
4656+
? WithSearchClause.SearchOrder.BREADTH
4657+
: WithSearchClause.SearchOrder.DEPTH,
4658+
searchColumns, sequenceColumnName);
4659+
}
4660+
}
4661+
46324662
WithFunctionDeclaration WithFunctionDeclaration() #WithFunctionDeclaration:
46334663
{
46344664
String functionName;

0 commit comments

Comments
 (0)