From 9926cad7f16cdc3e4cd27ac1c4b6a556ca6042d4 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 16 Feb 2018 00:11:27 +1300 Subject: [PATCH] #1262 - ENH: Support firstRow maxRows with findNative() --- .../server/query/CQueryBuilder.java | 7 ++ .../server/querydefn/DefaultOrmQuery.java | 2 +- .../rawsql/nativesql/TestNativeSqlBasic.java | 73 ++++++++++++------- 3 files changed, 56 insertions(+), 26 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index 5753d4021..6ae7a12a0 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -366,6 +366,10 @@ class CQueryBuilder { return new SqlTreeBuilder(this, request, predicates).build(); } + private String nativeQueryPaging(SpiQuery query, String sql) { + return dbPlatform.getBasicSqlLimiter().limit(sql, query.getFirstRow(), query.getMaxRows()); + } + /** * Create the SqlTree by reading the ResultSetMetaData and mapping table/columns to bean property paths. */ @@ -375,6 +379,9 @@ class CQueryBuilder { // parse named parameters returning the final sql to execute String sql = predicates.parseBindParams(query.getNativeSql()); + if (query.hasMaxRowsOrFirstRow()) { + sql = nativeQueryPaging(query, sql); + } query.setGeneratedSql(sql); Connection connection = request.getTransaction().getConnection(); diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 7a85fe2d8..a2cb55362 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -996,7 +996,7 @@ public class DefaultOrmQuery implements SpiQuery { CQueryPlanKey createQueryPlanKey() { if (isNativeSql()) { - queryPlanKey = new NativeSqlQueryPlanKey(nativeSql); + queryPlanKey = new NativeSqlQueryPlanKey(nativeSql + "-" + firstRow + "-" + maxRows); } else { queryPlanKey = new OrmQueryPlanKey(beanDescriptor.getDiscValue(), m2mIncludeJoin, type, detail, maxRows, firstRow, disableLazyLoading, orderBy, diff --git a/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index 77ceba129..94f7219a4 100644 --- a/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -3,7 +3,6 @@ package org.tests.rawsql.nativesql; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.Ebean; -import io.ebean.EbeanServer; import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; @@ -24,16 +23,14 @@ public class TestNativeSqlBasic extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); - String nativeSql = "select id, name from o_customer"; - Query query = server.findNative(Customer.class, nativeSql); + Query query = Ebean.findNative(Customer.class, nativeSql); List customers = query.findList(); assertThat(customers).isNotEmpty(); - BeanState beanState = server.getBeanState(customers.get(0)); + BeanState beanState = Ebean.getBeanState(customers.get(0)); assertThat(beanState.getLoadedProps()).contains("id", "name"); } @@ -42,15 +39,13 @@ public class TestNativeSqlBasic extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); - String nativeSql = "select * from o_customer"; - Query query = server.findNative(Customer.class, nativeSql); + Query query = Ebean.findNative(Customer.class, nativeSql); List customers = query.findList(); assertThat(customers).isNotEmpty(); - BeanState beanState = server.getBeanState(customers.get(0)); + BeanState beanState = Ebean.getBeanState(customers.get(0)); assertThat(beanState.getLoadedProps().size()).isGreaterThan(10); } @@ -59,10 +54,8 @@ public class TestNativeSqlBasic extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); - String nativeSql = "select c.*, b.city from o_customer c join o_address b on b.id = c.billing_address_id"; - Query query = server.findNative(Customer.class, nativeSql); + Query query = Ebean.findNative(Customer.class, nativeSql); List customers = query.findList(); assertThat(customers).isNotEmpty(); @@ -73,33 +66,67 @@ public class TestNativeSqlBasic extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); - String nativeSql = "select id, name from o_customer where id > :some"; - Query query = server.findNative(Customer.class, nativeSql); + Query query = Ebean.findNative(Customer.class, nativeSql); query.setParameter("some", 1); List customers = query.findList(); assertThat(customers).isNotEmpty(); - Query query2 = server.findNative(Customer.class, nativeSql); + Query query2 = Ebean.findNative(Customer.class, nativeSql); query2.setParameter("some", 2); List customers2 = query2.findList(); assertThat(customers2).isNotEmpty(); } + @Test + public void withMaxRows() { + + ResetBasicData.reset(); + + String nativeSql = "select id, name from o_customer where id > :some"; + + Query query = Ebean.findNative(Customer.class, nativeSql) + .setParameter("some", 1) + .setMaxRows(10); + + query.findList(); + + if (isH2() || isPostgres()) { + assertThat(sqlOf(query)).contains(" limit 10"); + } + } + + @Test + public void withFirstRowsMaxRows() { + + ResetBasicData.reset(); + + String nativeSql = "select id, name from o_customer where id > :some"; + + Query query = Ebean.findNative(Customer.class, nativeSql) + .setParameter("some", 1) + .setFirstRow(20) + .setMaxRows(10); + + query.findList(); + + if (isH2() || isPostgres()) { + assertThat(sqlOf(query)).contains(" limit 10 offset 20"); + } + } + + @Test public void partialAndLazyLoad() { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); - String nativeSql = "select id, name from o_customer where id > ?"; - List customers = server.findNative(Customer.class, nativeSql) + List customers = Ebean.findNative(Customer.class, nativeSql) .setParameter(1, 1) .findList(); @@ -117,11 +144,9 @@ public class TestNativeSqlBasic extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); - String nativeSql = "select o.id, o.status, c.id, c.name, c.version from o_order o join o_customer c on c.id = o.kcustomer_id "; - List orders = server.findNative(Order.class, nativeSql) + List orders = Ebean.findNative(Order.class, nativeSql) .findList(); for (Order order : orders) { @@ -135,11 +160,9 @@ public class TestNativeSqlBasic extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); - String nativeSql = "select o.id, o.status, o.kcustomer_id from o_order o"; - List orders = server.findNative(Order.class, nativeSql) + List orders = Ebean.findNative(Order.class, nativeSql) .findList(); LoggedSqlCollector.start();