Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-09 20:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-10664 - Prep 6.0 feature branch - merge hibernate-entitymanager into hibernate-core (fix test failures)

Browse Source
This commit is contained in:
Steve Ebersole 2016-05-02 12:22:08 -05:00
parent 1ece6056d1
commit 66802a70c1
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hibernate-core/src/main/java/org/hibernate/engine/spi/RowSelection.java
View File

@ -17,6 +17,10 @@ public final class RowSelection {
private Integer timeout; private Integer timeout;
private Integer fetchSize; private Integer fetchSize;
public void setFirstRow(Integer firstRow) {
this.firstRow = firstRow;
}
public void setFirstRow(int firstRow) { public void setFirstRow(int firstRow) {
this.firstRow = firstRow; this.firstRow = firstRow;
} }
@ -25,6 +29,10 @@ public Integer getFirstRow() {
return firstRow; return firstRow;
} }
public void setMaxRows(Integer maxRows) {
this.maxRows = maxRows;
}
public void setMaxRows(int maxRows) { public void setMaxRows(int maxRows) {
this.maxRows = maxRows; this.maxRows = maxRows;
} }
@ -33,6 +41,10 @@ public Integer getMaxRows() {
return maxRows; return maxRows;
} }
public void setTimeout(Integer timeout) {
this.timeout = timeout;
}
public void setTimeout(int timeout) { public void setTimeout(int timeout) {
this.timeout = timeout; this.timeout = timeout;
} }
@ -45,6 +57,10 @@ public Integer getFetchSize() {
return fetchSize; return fetchSize;
} }
public void setFetchSize(Integer fetchSize) {
this.fetchSize = fetchSize;
}
public void setFetchSize(int fetchSize) { public void setFetchSize(int fetchSize) {
this.fetchSize = fetchSize; this.fetchSize = fetchSize;
} }
@ -53,7 +69,4 @@ public boolean definesLimits() {
return maxRows != null || (firstRow != null && firstRow <= 0); return maxRows != null || (firstRow != null && firstRow <= 0);
} }
public void unsetMaxRows() {
maxRows = null;
}
} }

1
hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java
View File

@ -594,7 +594,6 @@ private static List<ProcedureCallMementoImpl.ParameterMemento> toParameterMement
@Override @Override
public ProcedureCallImplementor<R> registerStoredProcedureParameter(int position, Class type, ParameterMode mode) { public ProcedureCallImplementor<R> registerStoredProcedureParameter(int position, Class type, ParameterMode mode) {
getProducer().checkOpen( true ); getProducer().checkOpen( true );
getProducer().checkOpen( true );
try { try {
registerParameter( (ParameterRegistrationImplementor) registerParameter( position, type, mode ) ); registerParameter( (ParameterRegistrationImplementor) registerParameter( position, type, mode ) );

2
hibernate-core/src/main/java/org/hibernate/query/internal/AbstractProducedQuery.java
View File

@ -629,7 +629,7 @@ public int getMaxResults() {
public QueryImplementor setMaxResults(int maxResult) { public QueryImplementor setMaxResults(int maxResult) {
if ( maxResult <= 0 ) { if ( maxResult <= 0 ) {
// treat zero and negatives specially as meaning no limit... // treat zero and negatives specially as meaning no limit...
queryOptions.unsetMaxRows(); queryOptions.setMaxRows( null );
} }
else { else {
queryOptions.setMaxRows( maxResult ); queryOptions.setMaxRows( maxResult );