Skip to content

Commit e23d4bc

Browse files
committed
simplified tests for SQL_CALC_FOUND_ROWS
1 parent 3e16345 commit e23d4bc

File tree

6 files changed

+26
-266
lines changed

6 files changed

+26
-266
lines changed

README.md

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

5050
## Extensions in the latest SNAPSHOT version 1.2
5151

52+
* **SQL_CALC_FOUND_ROWS** support
5253
* support for more complex expressions within **case expr when expr then expr end**.
5354
* support for **<<** and **>>** left and right shift operations
5455
* breaking **API** change: merge of *within group* and *over* (window expressions)

src/main/java/net/sf/jsqlparser/expression/MySqlSqlCalcFoundRows.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/test/java/net/sf/jsqlparser/expression/mysql/MySqlSqlCalcFoundRowRef.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/test/java/net/sf/jsqlparser/expression/mysql/MySqlSqlCalcFoundRowsTest.java

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
import net.sf.jsqlparser.JSQLParserException;
2525
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
2626
import net.sf.jsqlparser.statement.Statement;
27+
import net.sf.jsqlparser.statement.StatementVisitorAdapter;
28+
import net.sf.jsqlparser.statement.select.PlainSelect;
29+
import net.sf.jsqlparser.statement.select.Select;
30+
import net.sf.jsqlparser.statement.select.SelectVisitorAdapter;
2731
import org.junit.Test;
2832

2933
import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
@@ -50,7 +54,26 @@ public void testPossibleParsingWithSqlCalcFoundRowsHint() throws JSQLParserExcep
5054
assertSqlCanBeParsedAndDeparsed(generalSql);
5155
}
5256

53-
public void accept(Statement statement, MySqlSqlCalcFoundRowRef ref) {
54-
statement.accept(SqlCalcFoundRowsStatementVisitorFactory.create(ref));
57+
private void accept(Statement statement, final MySqlSqlCalcFoundRowRef ref) {
58+
statement.accept(new StatementVisitorAdapter() {
59+
@Override
60+
public void visit(Select select) {
61+
select.getSelectBody().accept(new SelectVisitorAdapter() {
62+
@Override
63+
public void visit(PlainSelect plainSelect) {
64+
ref.sqlCalcFoundRows = plainSelect.getMySqlSqlCalcFoundRows();
65+
}
66+
});
67+
}
68+
69+
});
70+
}
71+
}
72+
73+
class MySqlSqlCalcFoundRowRef {
74+
public boolean sqlCalcFoundRows = false;
75+
76+
public MySqlSqlCalcFoundRowRef(boolean sqlCalcFoundRows) {
77+
this.sqlCalcFoundRows = sqlCalcFoundRows;
5578
}
5679
}

src/test/java/net/sf/jsqlparser/expression/mysql/SelectVisitorUsingSqlCalcFoundRowsFactory.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/test/java/net/sf/jsqlparser/expression/mysql/SqlCalcFoundRowsStatementVisitorFactory.java

Lines changed: 0 additions & 147 deletions
This file was deleted.

0 commit comments

Comments
 (0)