Skip to content

fix: allowing skyline keywords as columns, tables, etc. #2137

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
manticore-projects merged 8 commits into from
Jan 7, 2025
Merged

fix: allowing skyline keywords as columns, tables, etc. #2137

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0eaab3c
fix: allowing skyline keywords as columns, tables, etc.
nicky6s Jan 5, 2025
d055332
fix: adding test clause
nicky6s Jan 5, 2025
f7952b6
fix: tweak
nicky6s Jan 5, 2025
1b015b2
fix: removing preferring
nicky6s Jan 5, 2025
fc83790
fix: clean up formatting
nicky6s Jan 5, 2025
8caa5fa
fix: updating keyword to allow low, high, inverse and plus again
nicky6s Jan 5, 2025
9eeb92f
fix: addressing review comment
nicky6s Jan 6, 2025
7108257
fix: minor revert
nicky6s Jan 6, 2025
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
Prev Previous commit
Next Next commit
fix: tweak
  • Loading branch information
@nicky6s
nicky6s committed Jan 6, 2025
commit f7952b6194cc5328e00c895ff9b9c541e7ad1053
9 changes: 4 additions & 5 deletions src/test/java/net/sf/jsqlparser/statement/delete/DeleteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,11 +389,10 @@ public void testPreferringClause(String sqlStr) throws JSQLParserException {

@Test
public void testDeleteWithSkylineKeywords() throws JSQLParserException {
String statement = """
DELETE
FROM mytable
WHERE low = 1 AND high = 2 AND inverse = 3 AND plus = 4 AND preferring = 5
""";
String statement =
" DELETE " +
" FROM mytable " +
" WHERE low = 1 AND high = 2 AND inverse = 3 AND plus = 4 AND preferring = 5 ";
Delete delete = (Delete) assertSqlCanBeParsedAndDeparsed(statement);
assertEquals("mytable", delete.getTable().toString());
assertEquals("low = 1 AND high = 2 AND inverse = 3 AND plus = 4 AND preferring = 5", delete.getWhere().toString());
Expand Down
7 changes: 3 additions & 4 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 @@ -6134,10 +6134,9 @@ void testSelectAndInsertWithin2Ctes() throws JSQLParserException {

@Test
public void testSelectWithSkylineKeywords() throws JSQLParserException {
String statement = """
SELECT low, high, inverse, plus, preferring
FROM mytable
""";
String statement =
" SELECT low, high, inverse, plus, preferring " +
" FROM mytable ";
Select select = (Select) assertSqlCanBeParsedAndDeparsed(statement);
assertEquals("mytable", select.getPlainSelect().getFromItem().toString());
assertEquals("[low, high, inverse, plus, preferring]", select.getPlainSelect().getSelectItems().toString());
Expand Down
9 changes: 4 additions & 5 deletions src/test/java/net/sf/jsqlparser/statement/update/UpdateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,11 +570,10 @@ public void testUpdateWithBoolean() throws JSQLParserException {

@Test
public void testUpdateWithSkylineKeywords() throws JSQLParserException {
String statement = """
UPDATE mytable
SET low = 1, high = 2, inverse = 3, plus = 4, preferring = 5
WHERE id = 6
""";
String statement =
" UPDATE mytable " +
" SET low = 1, high = 2, inverse = 3, plus = 4, preferring = 5 " +
" WHERE id = 6";
Update update = (Update) PARSER_MANAGER.parse(new StringReader(statement));
assertEquals("mytable", update.getTable().toString());
assertEquals(5, update.getUpdateSets().size());
Expand Down