Skip to content

Add support for AllTableColumns in PrimaryExpression #2197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 21, 2025
Merged

Add support for AllTableColumns in PrimaryExpression #2197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3252,12 +3252,8 @@ SelectItem<?> SelectItem() #SelectItem:
// @fixme: Oracle's SEQUENCE.nextval is parsed as COLUMN with a name part nextval
// @todo: parse a proper SEQUENCE instead of a COLUMN
(
expression = AllColumns()
|
LOOKAHEAD( 3 ) expression = ConnectByPriorOperator()
|
LOOKAHEAD(AllTableColumns()) expression = AllTableColumns()
|
LOOKAHEAD( 3 ) expression = XorExpression()
|
LOOKAHEAD( 3 ) expression = ConcatExpression()
Expand Down Expand Up @@ -5301,6 +5297,9 @@ Expression PrimaryExpression() #PrimaryExpression:

| LOOKAHEAD(2, {!interrupted}) retval=CastExpression()

| LOOKAHEAD(AllColumns()) retval=AllColumns()

| LOOKAHEAD(AllTableColumns()) retval=AllTableColumns()

// support timestamp expressions
| LOOKAHEAD(2, {!interrupted}) (token=<K_TIME_KEY_EXPR> | token=<K_CURRENT>) { retval = new TimeKeyExpression(token.image); }
Expand Down Expand Up @@ -6450,10 +6449,6 @@ Function InternalFunction(boolean escaped):
)
]
(
"*" { expr = new AllColumns(); expressionList = new ExpressionList(expr); }
|
LOOKAHEAD( AllTableColumns() ) expr=AllTableColumns() { expressionList = new ExpressionList(expr); }
|
LOOKAHEAD(3) [ LOOKAHEAD(2) extraKeywordToken = <K_TABLE> { retval.setExtraKeyword(extraKeywordToken.image); } ]
expressionList=ExpressionList()
[ orderByList = OrderByElements() { retval.setOrderByElements(orderByList); } ]
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5486,6 +5486,12 @@ public void testReservedKeywordsIssue1352() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("SELECT fulltext from fulltext.fulltext", true);
}

@Test
public void testGroupByWithAllTableColumns() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed(
"select c.post_id, p.* from posts p inner join comments c on c.post_id = p.post_id group by p.post_id, c.post_id, p.*;");
}

@Test
public void testTableSpaceKeyword() throws JSQLParserException {
// without extra brackets
Expand Down
Loading