Skip to content

Add support for variable support to "SELECT SKIP <ROWCOUNT> FIRST <RO… #158

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
merged 1 commit into from
Aug 5, 2015
Merged

Add support for variable support to "SELECT SKIP <ROWCOUNT> FIRST <RO… #158

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
17 changes: 16 additions & 1 deletion src/main/java/net/sf/jsqlparser/statement/select/First.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public enum Keyword {
private Keyword keyword;
private Long rowCount;
private JdbcParameter jdbcParameter;
private String variable;

public Long getRowCount() {
return rowCount;
Expand All @@ -64,11 +65,25 @@ public void setKeyword(Keyword keyword) {
this.keyword = keyword;
}

public String getVariable() {
return variable;
}

public void setVariable(String variable) {
this.variable = variable;
}

@Override
public String toString() {
String result = keyword.name() + " ";

result += jdbcParameter != null ? jdbcParameter.toString() : rowCount;
if(rowCount != null) {
result += rowCount;
} else if (jdbcParameter != null) {
result += jdbcParameter.toString();
} else if (variable != null){
result += variable;
}

return result;
}
Expand Down
17 changes: 16 additions & 1 deletion src/main/java/net/sf/jsqlparser/statement/select/Skip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class Skip {

private Long rowCount;
private JdbcParameter jdbcParameter;
private String variable;

public Long getRowCount() {
return rowCount;
Expand All @@ -50,11 +51,25 @@ public void setJdbcParameter(JdbcParameter jdbcParameter) {
this.jdbcParameter = jdbcParameter;
}

public String getVariable() {
return variable;
}

public void setVariable(String variable) {
this.variable = variable;
}

@Override
public String toString() {
String result = "SKIP ";

result += jdbcParameter != null ? jdbcParameter.toString() : rowCount;
if(rowCount != null) {
result += rowCount;
} else if (jdbcParameter != null) {
result += jdbcParameter.toString();
} else if (variable != null){
result += variable;
}

return result;
}
Expand Down
2 changes: 2 additions & 0 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 @@ -1315,6 +1315,7 @@ Skip Skip():
<K_SKIP>
(
token=<S_LONG> { skip.setRowCount(Long.parseLong(token.image)); }
| token=<S_IDENTIFIER> { skip.setVariable(token.image); }
| "?" { skip.setJdbcParameter(new JdbcParameter()); } [ LOOKAHEAD(2) token = <S_LONG> { skip.getJdbcParameter().setIndex(Integer.valueOf(token.image)); } ]
)
{
Expand All @@ -1333,6 +1334,7 @@ First First():
)
(
token=<S_LONG> { first.setRowCount(Long.parseLong(token.image)); }
| token=<S_IDENTIFIER> { first.setVariable(token.image); }
| "?" { first.setJdbcParameter(new JdbcParameter()); } [ LOOKAHEAD(2) token = <S_LONG> { first.getJdbcParameter().setIndex(Integer.valueOf(token.image)); } ]
)
{
Expand Down
47 changes: 42 additions & 5 deletions src/test/java/net/sf/jsqlparser/test/select/SelectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,13 +437,31 @@ public void testSkip() throws JSQLParserException {
final Skip skip = selectBody.getSkip();
assertEquals((long) 5, (long) skip.getRowCount());
assertNull(skip.getJdbcParameter());
assertNull(skip.getVariable());

final List<SelectItem> selectItems = selectBody.getSelectItems();
assertEquals(2, selectItems.size());
assertEquals(firstColumnName, selectItems.get(0).toString());
assertEquals(secondColumnName, selectItems.get(1).toString());

assertStatementCanBeDeparsedAs(select, statement);

final String statement2 = "SELECT SKIP skipVar c1, c2 FROM t";
final Select select2 = (Select) parserManager.parse(new StringReader(statement2));

final PlainSelect selectBody2 = (PlainSelect) select2.getSelectBody();

final Skip skip2 = selectBody2.getSkip();
assertNull(skip2.getRowCount());
assertNull(skip2.getJdbcParameter());
assertEquals("skipVar", skip2.getVariable());

final List<SelectItem> selectItems2 = selectBody2.getSelectItems();
assertEquals(2, selectItems2.size());
assertEquals("c1", selectItems2.get(0).toString());
assertEquals("c2", selectItems2.get(1).toString());

assertStatementCanBeDeparsedAs(select2, statement2);
}

public void testFirst() throws JSQLParserException {
Expand All @@ -465,6 +483,24 @@ public void testFirst() throws JSQLParserException {
assertEquals(secondColumnName, selectItems.get(1).toString());

assertStatementCanBeDeparsedAs(select, statement);


final String statement2 = "SELECT FIRST firstVar c1, c2 FROM t";
final Select select2 = (Select) parserManager.parse(new StringReader(statement2));

final PlainSelect selectBody2 = (PlainSelect) select2.getSelectBody();

final First first2 = selectBody2.getFirst();
assertNull(first2.getRowCount());
assertNull(first2.getJdbcParameter());
assertEquals("firstVar", first2.getVariable());

final List<SelectItem> selectItems2 = selectBody2.getSelectItems();
assertEquals(2, selectItems2.size());
assertEquals("c1", selectItems2.get(0).toString());
assertEquals("c2", selectItems2.get(1).toString());

assertStatementCanBeDeparsedAs(select2, statement2);
}

public void testFirstWithKeywordLimit() throws JSQLParserException {
Expand All @@ -490,7 +526,7 @@ public void testFirstWithKeywordLimit() throws JSQLParserException {
}

public void testSkipFirst() throws JSQLParserException {
final String statement = "SELECT SKIP ?1 FIRST ?2 c1, c2 FROM t1";
final String statement = "SELECT SKIP ?1 FIRST f1 c1, c2 FROM t1";
final Select select = (Select) parserManager.parse(new StringReader(statement));

final PlainSelect selectBody = (PlainSelect) select.getSelectBody();
Expand All @@ -499,11 +535,12 @@ public void testSkipFirst() throws JSQLParserException {
assertNotNull(skip.getJdbcParameter());
assertNotNull(skip.getJdbcParameter().getIndex());
assertEquals((int) 1, (int) skip.getJdbcParameter().getIndex());
assertNull(skip.getVariable());
final First first = selectBody.getFirst();
assertNotNull(first.getJdbcParameter());
assertNotNull(first.getJdbcParameter().getIndex());
assertEquals((int) 2, (int) first.getJdbcParameter().getIndex());

assertNull(first.getJdbcParameter());
assertNull(first.getRowCount());
assertEquals("f1", first.getVariable());
final List<SelectItem> selectItems = selectBody.getSelectItems();
assertEquals(2, selectItems.size());
assertEquals("c1", selectItems.get(0).toString());
Expand Down