From f63a456fc677f5079a47cd0c0bd26ea4ca1ce767 Mon Sep 17 00:00:00 2001 From: dengliming Date: Sun, 8 Mar 2026 13:54:19 +0800 Subject: [PATCH 1/2] fix(parser): parse SEARCH BREADTH/DEPTH FIRST in recursive CTEs --- .../jsqlparser/statement/select/WithItem.java | 30 ++++-- .../statement/select/WithSearchClause.java | 100 ++++++++++++++++++ .../util/deparser/SelectDeParser.java | 3 + .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 32 +++++- .../statement/select/WithItemTest.java | 46 ++++++++ 5 files changed, 203 insertions(+), 8 deletions(-) create mode 100644 src/main/java/net/sf/jsqlparser/statement/select/WithSearchClause.java diff --git a/src/main/java/net/sf/jsqlparser/statement/select/WithItem.java b/src/main/java/net/sf/jsqlparser/statement/select/WithItem.java index 8789a6875..01605c8a9 100644 --- a/src/main/java/net/sf/jsqlparser/statement/select/WithItem.java +++ b/src/main/java/net/sf/jsqlparser/statement/select/WithItem.java @@ -9,25 +9,25 @@ */ package net.sf.jsqlparser.statement.select; -import net.sf.jsqlparser.expression.Alias; -import net.sf.jsqlparser.statement.ParenthesedStatement; -import net.sf.jsqlparser.statement.StatementVisitor; -import net.sf.jsqlparser.statement.delete.ParenthesedDelete; -import net.sf.jsqlparser.statement.insert.ParenthesedInsert; -import net.sf.jsqlparser.statement.update.ParenthesedUpdate; - import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Optional; +import net.sf.jsqlparser.expression.Alias; +import net.sf.jsqlparser.statement.ParenthesedStatement; +import net.sf.jsqlparser.statement.StatementVisitor; +import net.sf.jsqlparser.statement.delete.ParenthesedDelete; +import net.sf.jsqlparser.statement.insert.ParenthesedInsert; +import net.sf.jsqlparser.statement.update.ParenthesedUpdate; public class WithItem implements Serializable { private K statement; private Alias alias; private List> withItemList; private WithFunctionDeclaration withFunctionDeclaration; + private WithSearchClause searchClause; private boolean recursive = false; private boolean usingNot = false; private boolean materialized = false; @@ -136,6 +136,19 @@ public WithItem withWithFunctionDeclaration( return this; } + public WithSearchClause getSearchClause() { + return searchClause; + } + + public void setSearchClause(WithSearchClause searchClause) { + this.searchClause = searchClause; + } + + public WithItem withSearchClause(WithSearchClause searchClause) { + this.setSearchClause(searchClause); + return this; + } + @Override public String toString() { StringBuilder builder = new StringBuilder(); @@ -161,6 +174,9 @@ public String toString() { : "MATERIALIZED "); } builder.append(statement); + if (searchClause != null) { + builder.append(" ").append(searchClause); + } } return builder.toString(); } diff --git a/src/main/java/net/sf/jsqlparser/statement/select/WithSearchClause.java b/src/main/java/net/sf/jsqlparser/statement/select/WithSearchClause.java new file mode 100644 index 000000000..0616a9981 --- /dev/null +++ b/src/main/java/net/sf/jsqlparser/statement/select/WithSearchClause.java @@ -0,0 +1,100 @@ +/*- + * #%L + * JSQLParser library + * %% + * Copyright (C) 2004 - 2026 JSQLParser + * %% + * Dual licensed under GNU LGPL 2.1 or Apache License 2.0 + * #L% + */ +package net.sf.jsqlparser.statement.select; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import net.sf.jsqlparser.schema.Column; + +public class WithSearchClause implements Serializable { + public enum SearchOrder { + BREADTH, DEPTH + } + + private SearchOrder searchOrder; + private List searchColumns; + private String sequenceColumnName; + + public WithSearchClause() {} + + public WithSearchClause(SearchOrder searchOrder, List searchColumns, + String sequenceColumnName) { + this.searchOrder = searchOrder; + this.searchColumns = searchColumns; + this.sequenceColumnName = sequenceColumnName; + } + + public SearchOrder getSearchOrder() { + return searchOrder; + } + + public void setSearchOrder(SearchOrder searchOrder) { + this.searchOrder = searchOrder; + } + + public WithSearchClause withSearchOrder(SearchOrder searchOrder) { + this.setSearchOrder(searchOrder); + return this; + } + + public List getSearchColumns() { + return searchColumns; + } + + public void setSearchColumns(List searchColumns) { + this.searchColumns = searchColumns; + } + + public WithSearchClause withSearchColumns(List searchColumns) { + this.setSearchColumns(searchColumns); + return this; + } + + public WithSearchClause addSearchColumns(Column... searchColumns) { + List collection = Optional.ofNullable(getSearchColumns()).orElseGet(ArrayList::new); + Collections.addAll(collection, searchColumns); + return this.withSearchColumns(collection); + } + + public WithSearchClause addSearchColumns(Collection searchColumns) { + List collection = Optional.ofNullable(getSearchColumns()).orElseGet(ArrayList::new); + collection.addAll(searchColumns); + return this.withSearchColumns(collection); + } + + public String getSequenceColumnName() { + return sequenceColumnName; + } + + public void setSequenceColumnName(String sequenceColumnName) { + this.sequenceColumnName = sequenceColumnName; + } + + public WithSearchClause withSequenceColumnName(String sequenceColumnName) { + this.setSequenceColumnName(sequenceColumnName); + return this; + } + + @Override + public String toString() { + return new StringBuilder() + .append("SEARCH ") + .append(searchOrder) + .append(" FIRST BY ") + .append(Select.getStringList(searchColumns)) + .append(" SET ") + .append(sequenceColumnName) + .toString(); + } +} 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 bb606a347..ba7d8ef3d 100644 --- a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java +++ b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java @@ -755,6 +755,9 @@ public StringBuilder visit(WithItem withItem, S context) { StatementDeParser statementDeParser = new StatementDeParser((ExpressionDeParser) expressionVisitor, this, builder); statementDeParser.deParse(withItem.getParenthesedStatement()); + if (withItem.getSearchClause() != null) { + builder.append(" ").append(withItem.getSearchClause()); + } } else { builder.append(withItem.getWithFunctionDeclaration().toString()); } diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index ac704be70..d33754a35 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -276,6 +276,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -328,6 +329,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -593,6 +595,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -3470,7 +3473,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="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" ) + | 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" ) { return tk.image; } } @@ -4592,6 +4595,7 @@ WithItem WithItem() #WithItem: List> selectItems = null; WithFunctionDeclaration withFunctionDeclaration = null; ParenthesedStatement statement = null; + WithSearchClause withSearchClause = null; WithItem withItem; } { @@ -4624,11 +4628,37 @@ WithItem WithItem() #WithItem: } ) ) + [ withSearchClause = WithSearchClause() { withItem.setSearchClause(withSearchClause); } ] { return withItem; } } +WithSearchClause WithSearchClause() #WithSearchClause: +{ + Token orderingToken; + List searchColumns = new ArrayList(); + Column searchColumn = null; + String sequenceColumnName; +} +{ + + ( orderingToken= | orderingToken= ) + + + searchColumn = Column() { searchColumns.add(searchColumn); } + ( "," searchColumn = Column() { searchColumns.add(searchColumn); } )* + + sequenceColumnName = RelObjectName() + { + return new WithSearchClause( + "BREADTH".equalsIgnoreCase(orderingToken.image) + ? WithSearchClause.SearchOrder.BREADTH + : WithSearchClause.SearchOrder.DEPTH, + searchColumns, sequenceColumnName); + } +} + WithFunctionDeclaration WithFunctionDeclaration() #WithFunctionDeclaration: { String functionName; diff --git a/src/test/java/net/sf/jsqlparser/statement/select/WithItemTest.java b/src/test/java/net/sf/jsqlparser/statement/select/WithItemTest.java index 00224497f..f84bfa4b7 100644 --- a/src/test/java/net/sf/jsqlparser/statement/select/WithItemTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/select/WithItemTest.java @@ -9,6 +9,9 @@ */ package net.sf.jsqlparser.statement.select; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.test.TestUtils; import org.junit.jupiter.api.Test; @@ -53,4 +56,47 @@ void testNotMaterializedIssue2251() throws JSQLParserException { void testWithFunction(String sqlStr) throws JSQLParserException { TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); } + + @Test + void testRecursiveWithSearchBreadthClause() throws JSQLParserException { + String sqlStr = "WITH RECURSIVE team_hierarchy AS (\n" + + " SELECT employee_id, first_name, manager_id, ARRAY[employee_id] AS path\n" + + " FROM employees\n" + + " WHERE manager_id IS NULL\n" + + " UNION ALL\n" + + " SELECT e.employee_id, e.first_name, e.manager_id, th.path || e.employee_id\n" + + " FROM employees e\n" + + " INNER JOIN team_hierarchy th ON e.manager_id = th.employee_id\n" + + ")\n" + + "SEARCH BREADTH FIRST BY employee_id SET order_col\n" + + "SELECT employee_id, first_name, path, order_col FROM team_hierarchy ORDER BY order_col"; + + Select select = (Select) TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); + WithSearchClause searchClause = select.getWithItemsList().get(0).getSearchClause(); + + assertNotNull(searchClause); + assertEquals(WithSearchClause.SearchOrder.BREADTH, searchClause.getSearchOrder()); + assertEquals("employee_id", searchClause.getSearchColumns().get(0).toString()); + assertEquals("order_col", searchClause.getSequenceColumnName()); + } + + @Test + void testRecursiveWithSearchDepthClause() throws JSQLParserException { + String sqlStr = "WITH RECURSIVE search_tree AS (\n" + + " SELECT id, parent_id FROM nodes WHERE parent_id IS NULL\n" + + " UNION ALL\n" + + " SELECT n.id, n.parent_id FROM nodes n JOIN search_tree st ON st.id = n.parent_id\n" + + ")\n" + + "SEARCH DEPTH FIRST BY id, parent_id SET traversal_order\n" + + "SELECT traversal_order FROM search_tree"; + + Select select = (Select) TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); + WithSearchClause searchClause = select.getWithItemsList().get(0).getSearchClause(); + + assertNotNull(searchClause); + assertEquals(WithSearchClause.SearchOrder.DEPTH, searchClause.getSearchOrder()); + assertEquals("id", searchClause.getSearchColumns().get(0).toString()); + assertEquals("parent_id", searchClause.getSearchColumns().get(1).toString()); + assertEquals("traversal_order", searchClause.getSequenceColumnName()); + } } From 66dac44ebd01f96be31441f2fdea28b93f037da3 Mon Sep 17 00:00:00 2001 From: dengliming Date: Sun, 8 Mar 2026 14:11:40 +0800 Subject: [PATCH 2/2] fix --- .../statement/select/WithSearchClause.java | 24 +++++++++---------- .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/sf/jsqlparser/statement/select/WithSearchClause.java b/src/main/java/net/sf/jsqlparser/statement/select/WithSearchClause.java index 0616a9981..84de6e223 100644 --- a/src/main/java/net/sf/jsqlparser/statement/select/WithSearchClause.java +++ b/src/main/java/net/sf/jsqlparser/statement/select/WithSearchClause.java @@ -10,11 +10,9 @@ package net.sf.jsqlparser.statement.select; import java.io.Serializable; -import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Optional; + +import net.sf.jsqlparser.expression.operators.relational.ExpressionList; import net.sf.jsqlparser.schema.Column; public class WithSearchClause implements Serializable { @@ -23,12 +21,12 @@ public enum SearchOrder { } private SearchOrder searchOrder; - private List searchColumns; + private ExpressionList searchColumns; private String sequenceColumnName; public WithSearchClause() {} - public WithSearchClause(SearchOrder searchOrder, List searchColumns, + public WithSearchClause(SearchOrder searchOrder, ExpressionList searchColumns, String sequenceColumnName) { this.searchOrder = searchOrder; this.searchColumns = searchColumns; @@ -48,27 +46,29 @@ public WithSearchClause withSearchOrder(SearchOrder searchOrder) { return this; } - public List getSearchColumns() { + public ExpressionList getSearchColumns() { return searchColumns; } - public void setSearchColumns(List searchColumns) { + public void setSearchColumns(ExpressionList searchColumns) { this.searchColumns = searchColumns; } - public WithSearchClause withSearchColumns(List searchColumns) { + public WithSearchClause withSearchColumns(ExpressionList searchColumns) { this.setSearchColumns(searchColumns); return this; } public WithSearchClause addSearchColumns(Column... searchColumns) { - List collection = Optional.ofNullable(getSearchColumns()).orElseGet(ArrayList::new); - Collections.addAll(collection, searchColumns); + ExpressionList collection = + getSearchColumns() != null ? getSearchColumns() : new ExpressionList<>(); + collection.addExpressions(searchColumns); return this.withSearchColumns(collection); } public WithSearchClause addSearchColumns(Collection searchColumns) { - List collection = Optional.ofNullable(getSearchColumns()).orElseGet(ArrayList::new); + ExpressionList collection = + getSearchColumns() != null ? getSearchColumns() : new ExpressionList<>(); collection.addAll(searchColumns); return this.withSearchColumns(collection); } diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index d33754a35..2895df958 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -4637,7 +4637,7 @@ WithItem WithItem() #WithItem: WithSearchClause WithSearchClause() #WithSearchClause: { Token orderingToken; - List searchColumns = new ArrayList(); + ExpressionList searchColumns = new ExpressionList(); Column searchColumn = null; String sequenceColumnName; }