Skip to content

Commit 30144e7

Browse files
feat: enable session with catalog
Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
1 parent eeb0400 commit 30144e7

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2093,6 +2093,7 @@ SessionStatement SessionStatement():
20932093
{
20942094
Token actionToken;
20952095
Token idToken = null;
2096+
String id = null;
20962097
}
20972098
{
20982099
( <K_SESSION> | <K_BRANCH> )
@@ -2117,12 +2118,25 @@ SessionStatement SessionStatement():
21172118
idToken = <S_CHAR_LITERAL>
21182119
|
21192120
idToken = <S_LONG>
2120-
)
2121+
) { id = idToken.image; }
2122+
2123+
(
2124+
"."
2125+
(
2126+
idToken = <S_IDENTIFIER>
2127+
|
2128+
idToken = <S_QUOTED_IDENTIFIER>
2129+
|
2130+
idToken = <S_CHAR_LITERAL>
2131+
|
2132+
idToken = <S_LONG>
2133+
) { id += "." + idToken.image; }
2134+
)?
21212135
]
21222136

21232137
{
2124-
SessionStatement sessionsStatement = idToken!=null
2125-
? new SessionStatement(actionToken.image, idToken.image)
2138+
SessionStatement sessionsStatement = id!=null
2139+
? new SessionStatement(actionToken.image, id)
21262140
: new SessionStatement(actionToken.image);
21272141

21282142
//linkAST(sessionsStatement,jjtThis);

src/test/java/net/sf/jsqlparser/statement/SessionStatementTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class SessionStatementTest {
2121
@ValueSource(strings = {
2222
"SESSION START 1234", "SESSION START", "SESSION APPLY 'test'", "SESSION APPLY",
2323
"SESSION DROP \"test\"", "SESSION DROP", "SESSION SHOW test", "SESSION SHOW",
24-
"SESSION DESCRIBE 1234", "SESSION DESCRIBE"
24+
"SESSION DESCRIBE 1234", "SESSION DESCRIBE", "SESSION APPLY unnamed.session1"
2525
})
2626
void testStartSession(String sqlStr) throws JSQLParserException {
2727
SessionStatement sessionStatement =

0 commit comments

Comments
 (0)