#278 - SqlQuery setFirstRow fail - modify SQL using LIMIT/OFFSET etc to support firstRows/maxRows

This commit is contained in:
Robin Bygrave committed 2016-05-12 20:59:52 +12:00
1 parent 58a36e6b67
commit 8cb8f9eabf
12 files changed
+256 -60

No files matched your search

@@ -31,8 +31,6 @@ import java.util.List;
*/
public final class RelationalQueryRequest {
private static final int GLOBAL_ROW_LIMIT = Integer.valueOf(System.getProperty("ebean.query.globallimit", "1000000"));
private static final Logger logger = LoggerFactory.getLogger(RelationalQueryRequest.class);
private final SpiSqlQuery query;
@@ -212,7 +210,18 @@ public final class RelationalQueryRequest {
// convert any named parameters if required
sql = BindParamsParser.parse(bindParams, sql);
}
this.sql = sql;
this.sql = limitOffset(sql);
}
private String limitOffset(String sql) {
int firstRow = query.getFirstRow();
int maxRows = query.getMaxRows();
if (firstRow > 0 || maxRows > 0) {
return ebeanServer.getDatabasePlatform().getBasicSqlLimiter()
.limit(query.getQuery(), firstRow, maxRows);
}
return sql;
}
/**
@@ -250,13 +259,6 @@ public final class RelationalQueryRequest {
}
/**
* Return the maxRows allowed to fetch.
*/
public int getMaxRows() {
return query.getMaxRows() >= 1 ? query.getMaxRows() : GLOBAL_ROW_LIMIT;
}
/**
* Return the SQL executed for this query.
*/
@@ -74,19 +74,9 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
try {
request.executeSql(binder);
int maxRows = request.getMaxRows();
int loadRowCount = 0;
List<SqlRow> rows = new ArrayList<SqlRow>();
while (request.next()) {
rows.add(readRow(request));
loadRowCount++;
if (loadRowCount == maxRows) {
// break, as we have hit the max rows to fetch...
break;
}
}
logSummary(request, startTime);