github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-25 15:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robin Bygrave
2016-05-12 20:59:52 +12:00
parent 58a36e6b67
commit 8cb8f9eabf
12 changed files with 256 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java
+34
View File
@@ -0,0 +1,34 @@
package com.avaje.ebean.config.dbplatform;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
public class BasicSqlLimitOffsetTest {
private BasicSqlLimitOffset limiter = new BasicSqlLimitOffset();
@Test
public void limit_maxRows() throws Exception {
String query = "select * from mytab order by id";
String sql = limiter.limit(query, 0, 10);
assertThat(sql).isEqualTo(query+" limit 10");
}
@Test
public void limit_firstRowMaxRows() throws Exception {
String query = "select * from mytab order by id";
String sql = limiter.limit(query, 5, 10);
assertThat(sql).isEqualTo(query+" limit 10 offset 5");
}
@Test
public void limit_zeros() throws Exception {
String query = "select * from mytab order by id";
String sql = limiter.limit(query, 0, 0);
assertThat(sql).isEqualTo(query);
}
}
src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java
+35
View File
@@ -0,0 +1,35 @@
package com.avaje.ebean.config.dbplatform;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
public class BasicSqlStandardLimiterTest {
private BasicSqlAnsiLimiter limiter = new BasicSqlAnsiLimiter();
@Test
public void limit_maxRows() throws Exception {
String query = "select * from mytab order by id";
String sql = limiter.limit(query, 0, 10);
assertThat(sql).isEqualTo(query+" fetch next 10 rows only");
}
@Test
public void limit_firstRowMaxRows() throws Exception {
String query = "select * from mytab order by id";
String sql = limiter.limit(query, 5, 10);
assertThat(sql).isEqualTo(query+" offset 5 rows fetch next 10 rows only");
}
@Test
public void limit_zeros() throws Exception {
String query = "select * from mytab order by id";
String sql = limiter.limit(query, 0, 0);
assertThat(sql).isEqualTo(query);
}
}
src/test/java/com/avaje/tests/basic/TestLimitQuery.java
+14 -28
View File
@@ -1,16 +1,16 @@
package com.avaje.tests.basic;
import java.util.List;
import org.junit.Assert;
import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.Query;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
import com.avaje.tests.model.basic.Order;
import com.avaje.tests.model.basic.ResetBasicData;
import org.junit.Assert;
import org.junit.Test;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
public class TestLimitQuery extends BaseTestCase {
@@ -26,9 +26,6 @@ public class TestLimitQuery extends BaseTestCase {
ResetBasicData.reset();
SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null);
boolean h2Db = "h2".equals(server.getDatabasePlatform().getName());
Query<Order> query = Ebean.find(Order.class)
.setAutoTune(false)
.fetch("details")
@@ -40,21 +37,16 @@ public class TestLimitQuery extends BaseTestCase {
query.findList();
String sql = query.getGeneratedSql();
boolean hasLimit = sql.contains("limit 0");
boolean hasOffset = sql.contains("offset 3");
if (h2Db) {
Assert.assertTrue(hasLimit);
Assert.assertTrue(hasOffset);
if (isH2()) {
assertThat(sql).contains("offset 3");
assertThat(sql).contains("limit 0");
}
}
@Test
public void testMaxRowsWithFirstRowZero() {
ResetBasicData.reset();
SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null);
boolean h2Db = "h2".equals(server.getDatabasePlatform().getName());
ResetBasicData.reset();
Query<Order> query = Ebean.find(Order.class)
.setAutoTune(false)
@@ -69,7 +61,7 @@ public class TestLimitQuery extends BaseTestCase {
boolean hasLimit = sql.contains("limit 3");
boolean hasOffset = sql.contains("offset");
if (h2Db) {
if (isH2()) {
Assert.assertTrue(sql, hasLimit);
Assert.assertFalse(sql, hasOffset);
}
@@ -79,9 +71,6 @@ public class TestLimitQuery extends BaseTestCase {
public void testDefaults() {
ResetBasicData.reset();
SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null);
boolean h2Db = "h2".equals(server.getDatabasePlatform().getName());
Query<Order> query = Ebean.find(Order.class)
.setAutoTune(false)
.fetch("details")
@@ -94,7 +83,7 @@ public class TestLimitQuery extends BaseTestCase {
boolean hasLimit = sql.contains("limit");
boolean hasOffset = sql.contains("offset");
if (h2Db) {
if (isH2()) {
Assert.assertFalse(hasLimit);
Assert.assertFalse(hasOffset);
}
@@ -103,9 +92,6 @@ public class TestLimitQuery extends BaseTestCase {
private void rob() {
ResetBasicData.reset();
SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null);
boolean h2Db = "h2".equals(server.getDatabasePlatform().getName());
Query<Order> query = Ebean.find(Order.class)
.setAutoTune(false)
.fetch("details")
@@ -126,7 +112,7 @@ public class TestLimitQuery extends BaseTestCase {
Assert.assertTrue(hasDetailsJoin);
Assert.assertFalse(hasSelectedDetails);
Assert.assertTrue(hasDistinct);
if (h2Db) {
if (isH2()) {
Assert.assertTrue(hasLimit);
}
@@ -146,7 +132,7 @@ public class TestLimitQuery extends BaseTestCase {
Assert.assertFalse("no join with maxRows", hasDetailsJoin);
Assert.assertFalse(hasSelectedDetails);
Assert.assertFalse(hasDistinct);
if (h2Db) {
if (isH2()) {
Assert.assertTrue(hasLimit);
}
}
src/test/java/com/avaje/tests/compositekeys/ModifiedH2Platform.java
-11
View File
@@ -1,11 +0,0 @@
package com.avaje.tests.compositekeys;
import com.avaje.ebean.config.dbplatform.H2Platform;
public class ModifiedH2Platform extends H2Platform {
public ModifiedH2Platform() {
super();
this.idInExpandedForm = true;
}
}
src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java
+76 -1
View File
@@ -1,5 +1,6 @@
package com.avaje.tests.query.sqlquery;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.QueryEachConsumer;
import com.avaje.ebean.QueryEachWhileConsumer;
@@ -7,13 +8,87 @@ import com.avaje.ebean.SqlQuery;
import com.avaje.ebean.SqlRow;
import com.avaje.tests.model.basic.Order;
import com.avaje.tests.model.basic.ResetBasicData;
import org.avaje.ebeantest.LoggedSqlCollector;
import org.junit.Test;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
public class SqlQueryTests {
public class SqlQueryTests extends BaseTestCase {
@Test
public void firstRowMaxRows() {
ResetBasicData.reset();
SqlQuery sqlQuery = Ebean.createSqlQuery("Select * from o_order");
sqlQuery.setFirstRow(3);
sqlQuery.setMaxRows(10);
LoggedSqlCollector.start();
List<SqlRow> list = sqlQuery.findList();
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql.get(0)).contains("Select * from o_order limit 10 offset 3; --bind()");
assertThat(list).isNotEmpty();
}
@Test
public void firstRow() {
if (isPostgres()) {
ResetBasicData.reset();
SqlQuery sqlQuery = Ebean.createSqlQuery("Select * from o_order order by id");
sqlQuery.setFirstRow(3);
LoggedSqlCollector.start();
sqlQuery.findList();
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql.get(0)).contains("Select * from o_order order by id offset 3");
}
}
@Test
public void maxRows() {
ResetBasicData.reset();
SqlQuery sqlQuery = Ebean.createSqlQuery("Select * from o_order order by id");
sqlQuery.setMaxRows(10);
LoggedSqlCollector.start();
sqlQuery.findList();
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql.get(0)).contains("Select * from o_order order by id limit 10");
}
@Test
public void findEachMaxRows() {
ResetBasicData.reset();
SqlQuery sqlQuery = Ebean.createSqlQuery("Select * from o_order");
sqlQuery.setMaxRows(10);
LoggedSqlCollector.start();
sqlQuery.findEach(new QueryEachConsumer<SqlRow>() {
@Override
public void accept(SqlRow bean) {
bean.get("id");
}
});
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql.get(0)).contains("limit 10");
}
@Test
public void findEach() {