From 3277fe81a17e91a8c8902ba331fe608992d54a10 Mon Sep 17 00:00:00 2001 From: Serhii Dakhnii Date: Wed, 30 Nov 2022 21:36:08 +0200 Subject: [PATCH] Fixed mandatory LIMIT generation in case of firstRow>0 --- .../ebean/config/dbplatform/LimitOffsetSqlLimiter.java | 10 +++++----- .../src/test/java/org/tests/basic/TestLimitQuery.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java index 63534a27f..846ee8056 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java @@ -31,12 +31,12 @@ public class LimitOffsetSqlLimiter implements SqlLimiter { int firstRow = request.getFirstRow(); int maxRows = request.getMaxRows(); - if (maxRows > 0 || firstRow > 0) { + if (maxRows > 0) { sb.append(" ").append(LIMIT).append(" ").append(maxRows); - if (firstRow > 0) { - sb.append(" ").append(OFFSET).append(" "); - sb.append(firstRow); - } + } + if (firstRow > 0) { + sb.append(" ").append(OFFSET).append(" "); + sb.append(firstRow); } String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery()); diff --git a/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java b/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java index 63183c7db..090efec8a 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java @@ -40,7 +40,7 @@ public class TestLimitQuery extends BaseTestCase { String sql = query.getGeneratedSql(); if (isH2()) { assertThat(sql).contains("offset 3"); - assertThat(sql).contains("limit 0"); + assertThat(sql).doesNotContain("limit"); } }