From ce4330e1ffb55462c80a0e01b5b547b2489c2717 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Fri, 12 Sep 2008 06:16:31 +0000 Subject: [PATCH] HHH-2592 - Dialect.forceLimitUsage git-svn-id: https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_3@15191 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- .../java/org/hibernate/dialect/Dialect.java | 22 +++++++++---------- .../java/org/hibernate/loader/Loader.java | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/org/hibernate/dialect/Dialect.java b/core/src/main/java/org/hibernate/dialect/Dialect.java index 4c8d20a7f6..a84fb895c2 100644 --- a/core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/core/src/main/java/org/hibernate/dialect/Dialect.java @@ -767,16 +767,6 @@ public abstract class Dialect { return false; } - /** - * Generally, if there is no limit applied to a Hibernate query we do not apply any limits - * to the SQL query. This option forces that the limit be written to the SQL query. - * - * @return True to force limit into SQL query even if none specified in Hibernate query; false otherwise. - */ - public boolean forceLimitUsage() { - return true; - } - /** * Does this dialect's LIMIT support (if any) additionally * support specifying an offset? @@ -837,6 +827,16 @@ public abstract class Dialect { return false; } + /** + * Generally, if there is no limit applied to a Hibernate query we do not apply any limits + * to the SQL query. This option forces that the limit be written to the SQL query. + * + * @return True to force limit into SQL query even if none specified in Hibernate query; false otherwise. + */ + public boolean forceLimitUsage() { + return false; + } + /** * Given a limit and an offset, apply the limit clause to the query. * @@ -846,7 +846,7 @@ public abstract class Dialect { * @return The modified query statement with the limit applied. */ public String getLimitString(String query, int offset, int limit) { - return getLimitString( query, offset > 0 ); + return getLimitString( query, ( offset > 0 || forceLimitUsage() ) ); } /** diff --git a/core/src/main/java/org/hibernate/loader/Loader.java b/core/src/main/java/org/hibernate/loader/Loader.java index e5111c3fee..0575743113 100644 --- a/core/src/main/java/org/hibernate/loader/Loader.java +++ b/core/src/main/java/org/hibernate/loader/Loader.java @@ -1526,7 +1526,7 @@ public abstract class Loader { * LIMIT clause. */ private static boolean useLimit(final RowSelection selection, final Dialect dialect) { - return dialect.supportsLimit() && ( hasMaxRows( selection ) || dialect.forceLimitUsage() ); + return dialect.supportsLimit() && hasMaxRows( selection ); } /** @@ -1659,7 +1659,7 @@ public abstract class Loader { } int firstRow = getFirstRow( selection ); int lastRow = getMaxOrLimit( selection, dialect ); - boolean hasFirstRow = firstRow > 0 && dialect.supportsLimitOffset(); + boolean hasFirstRow = dialect.supportsLimitOffset() && ( firstRow > 0 || dialect.forceLimitUsage() ); boolean reverse = dialect.bindLimitParametersInReverseOrder(); if ( hasFirstRow ) { statement.setInt( index + ( reverse ? 1 : 0 ), firstRow );