[hibernate-commits] Hibernate SVN: r15330 - in core/branches/Branch_3_2/src/org/hibernate: loader and 1 other directory.
Author: dstephan
Date: 2008-10-12 19:22:31 -0400 (Sun, 12 Oct 2008)
New Revision: 15330
Modified:
core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java
core/branches/Branch_3_2/src/org/hibernate/loader/Loader.java
Log:
JBPAPP-1205 - Added forceLimitUsage, Backport of HHH-2592
Modified: core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java 2008-10-12 23:19:57
UTC (rev 15329)
+++ core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java 2008-10-12 23:22:31
UTC (rev 15330)
@@ -804,7 +804,18 @@
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.
*
* @param query The query to which to apply the limit.
@@ -813,7 +824,7 @@
* @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() ) );
}
/**
Modified: core/branches/Branch_3_2/src/org/hibernate/loader/Loader.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/loader/Loader.java 2008-10-12 23:19:57 UTC
(rev 15329)
+++ core/branches/Branch_3_2/src/org/hibernate/loader/Loader.java 2008-10-12 23:22:31 UTC
(rev 15330)
@@ -1638,7 +1638,7 @@
}
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 );