Skip to content

Commit 4f925c5

Browse files
committed
fixes #1088 - allowed CURRENT as jdbc named parameter name
1 parent 4183ae0 commit 4f925c5

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Also I would like to know about needed examples or documentation stuff.
6767

6868
## Extensions in the latest SNAPSHOT version 4.0
6969

70+
* allowed keyword **current** as jdbc named parameter name
7071
* **Grant** allows now multipart names
7172
* updated JavaCC 7.0.10
7273
* support for **CREATE OR REPLACE** for create function statements

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ String RelObjectNameExt2():
13941394
String result=null;
13951395
}
13961396
{
1397-
( result=RelObjectNameExt() | tk=<K_FROM> | tk=<K_SELECT> )
1397+
( result=RelObjectNameExt() | tk=<K_FROM> | tk=<K_SELECT> | tk=<K_CURRENT>)
13981398
{
13991399
if (tk!=null) result=tk.image;
14001400
return result;

src/test/java/net/sf/jsqlparser/statement/create/CreateTableTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,5 +680,5 @@ public void testCreateTableWithCommentIssue413_2() throws JSQLParserException {
680680
@Test
681681
public void testCreateTableWithParameterDefaultFalseIssue1089() throws JSQLParserException {
682682
assertSqlCanBeParsedAndDeparsed("create table ADDRESS_TYPE ( address_type CHAR(1) not null, at_name VARCHAR(250) not null, is_disabled BOOL not null default FALSE, constraint PK_ADDRESS_TYPE primary key (address_type) )", true);
683-
}
683+
}
684684
}

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4376,4 +4376,9 @@ public void testFormatKeywordIssue1078() throws JSQLParserException {
43764376
public void testConditionalParametersForFunctions() throws JSQLParserException {
43774377
assertSqlCanBeParsedAndDeparsed("SELECT myFunc(SELECT mycol FROM mytable)");
43784378
}
4379+
4380+
@Test
4381+
public void testCreateTableWithParameterDefaultFalseIssue1088() throws JSQLParserException {
4382+
assertSqlCanBeParsedAndDeparsed("SELECT p.*, rhp.house_id FROM rel_house_person rhp INNER JOIN person p ON rhp.person_id = p.if WHERE rhp.house_id IN (SELECT house_id FROM rel_house_person WHERE person_id = :personId AND current_occupant = :current) AND rhp.current_occupant = :currentOccupant");
4383+
}
43794384
}

0 commit comments

Comments
 (0)