Skip to content

Issue1352 #1353

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
wumpz merged 6 commits into from
Oct 9, 2021
+13 −1
Merged

Issue1352 #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80c17a2
Fixes #1352
manticore-projects Sep 28, 2021
764c0bc
Fixes #1352
manticore-projects Sep 28, 2021
d171410
Fixes #1352
manticore-projects Sep 28, 2021
86c7eff
Fixes #1352
manticore-projects Sep 30, 2021
a62e654
Fixes #1352
manticore-projects Oct 4, 2021
7cfd024
Merge branch 'master' into Issue1352
wumpz Oct 9, 2021
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
4 changes: 3 additions & 1 deletion 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 @@ -1642,7 +1642,9 @@ String RelObjectNameWithoutValue() :
| tk=<K_LOG> | tk=<K_DUMP> | tk=<K_FLUSH> | tk=<K_ACTIVE> | tk=<K_RESUME> | tk=<K_SWITCH> | tk=<K_SUSPEND>
| tk=<K_ARCHIVE> | tk=<K_QUIESCE> | tk=<K_HISTORY> | tk=<K_SHUTDOWN> | tk=<K_REGISTER> | tk=<K_UNQIESCE>
| tk=<K_RESTRICTED> | tk=<K_CHECKPOINT> | tk=<K_DISCONNECT>

| tk=<K_SYSTEM>
| tk=<K_QUERY>
| tk=<K_FULLTEXT>
| tk=<K_TABLESPACE>
)

Expand Down
10 changes: 10 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 @@ -4821,6 +4821,16 @@ public void testReservedKeywordsMSSQLUseIndexIssue1325() throws JSQLParserExcept
"SELECT col FROM table USE INDEX(primary)", true);
}

@Test
public void testReservedKeywordsIssue1352() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed(
"SELECT system from b1.system", true);
assertSqlCanBeParsedAndDeparsed(
"SELECT query from query.query", true);
assertSqlCanBeParsedAndDeparsed(
"SELECT fulltext from fulltext.fulltext", true);
}

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