Skip to content

Fixes 649 to add support for HOUR, MINUTE, SECOND date literals and s… #756

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 1 commit into from
Feb 25, 2019
Merged

Fixes 649 to add support for HOUR, MINUTE, SECOND date literals and s… #756

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
4 changes: 2 additions & 2 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 @@ -140,7 +140,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
| <K_CROSS:"CROSS">
| <K_CURRENT: "CURRENT">
| <K_DATETIMELITERAL : ("DATE" | "TIME" | "TIMESTAMP") >
| <K_DATE_LITERAL : ( "YEAR" | "MONTH" | "DAY" ) >
| <K_DATE_LITERAL : ( "YEAR" | "MONTH" | "DAY" | "HOUR" | "MINUTE" | "SECOND" ) >
| <K_DEFERRABLE : "DEFERRABLE">
| <K_DELAYED : "DELAYED">
| <K_DELETE:"DELETE">
Expand Down Expand Up @@ -2837,7 +2837,7 @@ IntervalExpression IntervalExpression() : {
[ LOOKAHEAD(2) (token = <S_IDENTIFIER> | token = <K_DATE_LITERAL>) { interval.setIntervalType(token.image); } ]
|
{ interval = new IntervalExpression(false); }
( token=<S_LONG> | token=<S_DOUBLE> | token=<S_CHAR_LITERAL> )
( token=<S_LONG> | token=<S_DOUBLE> | token=<S_CHAR_LITERAL> | token = <S_IDENTIFIER>)
{ interval.setParameter((signed?"-":"") + token.image); }
token = <K_DATE_LITERAL> { interval.setIntervalType(token.image); }
)
Expand Down
15 changes: 15 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 @@ -3470,6 +3470,21 @@ public void testDateArithmentic5() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("SELECT CASE WHEN CURRENT_DATE BETWEEN (CURRENT_DATE - 1 DAY) AND ('2019-01-01') THEN 1 ELSE 0 END FROM SYSIBM.SYSDUMMY1");
}

@Test
public void testDateArithmentic6() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("SELECT CURRENT_DATE + HOURS_OFFSET HOUR AS NEXT_DATE FROM SYSIBM.SYSDUMMY1");
}

@Test
public void testDateArithmentic7() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("SELECT CURRENT_DATE + MINUTE_OFFSET MINUTE AS NEXT_DATE FROM SYSIBM.SYSDUMMY1");
}

@Test
public void testDateArithmentic8() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("SELECT CURRENT_DATE + SECONDS_OFFSET SECOND AS NEXT_DATE FROM SYSIBM.SYSDUMMY1");
}

@Test
public void testNotProblemIssue721() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("SELECT * FROM dual WHERE NOT regexp_like('a', '[\\w]+')");
Expand Down