Skip to content

Commit 20141ca

Browse files
hferentschikstliu
hferentschik
authored and
stliu
committed
HHH-6849 Formatting and adding actual assertions to testOffset(). This is not addressing the SQLServer issue yet.
1 parent 8114e9c commit 20141ca

File tree

3 files changed

+92
-52
lines changed

3 files changed

+92
-52
lines changed

‎hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2005Dialect.java

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* Boston, MA 02110-1301 USA
2323
*/
2424
package org.hibernate.dialect;
25+
2526
import java.sql.Types;
2627

2728
import org.hibernate.dialect.function.NoArgSQLFunction;
@@ -84,7 +85,9 @@ public int convertToFirstRowValue(int zeroBasedFirstResult) {
8485
@Override
8586
public String getLimitString(String query, int offset, int limit) {
8687
// We transform the query to one with an offset and limit if we have an offset and limit to bind
87-
if (offset > 1 || limit > 1) return getLimitString(query, true);
88+
if ( offset > 1 || limit > 1 ) {
89+
return getLimitString( query, true );
90+
}
8891
return query;
8992
}
9093

@@ -101,37 +104,32 @@ public String getLimitString(String query, int offset, int limit) {
101104
* SELECT * FROM query WHERE __hibernate_row_nr__ BEETWIN offset AND offset + last
102105
* </pre>
103106
*
104-
*
105-
* @param querySqlString
106-
* The SQL statement to base the limit query off of.
107-
* @param offset
108-
* Offset of the first row to be returned by the query (zero-based)
109-
* @param limit
110-
* Maximum number of rows to be returned by the query
107+
* @param querySqlString The SQL statement to base the limit query off of.
108+
* @param hasOffset Is the query requesting an offset?
111109
*
112110
* @return A new SQL statement with the LIMIT clause applied.
113111
*/
114112
@Override
115113
public String getLimitString(String querySqlString, boolean hasOffset) {
116-
StringBuilder sb = new StringBuilder(querySqlString.trim().toLowerCase());
114+
StringBuilder sb = new StringBuilder( querySqlString.trim().toLowerCase() );
117115

118-
int orderByIndex = sb.indexOf("order by");
119-
CharSequence orderby = orderByIndex > 0 ? sb.subSequence(orderByIndex, sb.length())
116+
int orderByIndex = sb.indexOf( "order by" );
117+
CharSequence orderby = orderByIndex > 0 ? sb.subSequence( orderByIndex, sb.length() )
120118
: "ORDER BY CURRENT_TIMESTAMP";
121119

122120
// Delete the order by clause at the end of the query
123-
if (orderByIndex > 0) {
124-
sb.delete(orderByIndex, orderByIndex + orderby.length());
121+
if ( orderByIndex > 0 ) {
122+
sb.delete( orderByIndex, orderByIndex + orderby.length() );
125123
}
126124

127125
// HHH-5715 bug fix
128-
replaceDistinctWithGroupBy(sb);
126+
replaceDistinctWithGroupBy( sb );
129127

130-
insertRowNumberFunction(sb, orderby);
128+
insertRowNumberFunction( sb, orderby );
131129

132130
// Wrap the query within a with statement:
133-
sb.insert(0, "WITH query AS (").append(") SELECT * FROM query ");
134-
sb.append("WHERE __hibernate_row_nr__ >= ? AND __hibernate_row_nr__ < ?");
131+
sb.insert( 0, "WITH query AS (" ).append( ") SELECT * FROM query " );
132+
sb.append( "WHERE __hibernate_row_nr__ >= ? AND __hibernate_row_nr__ < ?" );
135133

136134
return sb.toString();
137135
}
@@ -144,52 +142,50 @@ public String getLimitString(String querySqlString, boolean hasOffset) {
144142
* @param sql an sql query
145143
*/
146144
protected static void replaceDistinctWithGroupBy(StringBuilder sql) {
147-
int distinctIndex = sql.indexOf(DISTINCT);
148-
if (distinctIndex > 0) {
149-
sql.delete(distinctIndex, distinctIndex + DISTINCT.length() + 1);
150-
sql.append(" group by").append(getSelectFieldsWithoutAliases(sql));
145+
int distinctIndex = sql.indexOf( DISTINCT );
146+
if ( distinctIndex > 0 ) {
147+
sql.delete( distinctIndex, distinctIndex + DISTINCT.length() + 1 );
148+
sql.append( " group by" ).append( getSelectFieldsWithoutAliases( sql ) );
151149
}
152150
}
153151

154152
/**
155153
* This utility method searches the given sql query for the fields of the select statement and returns them without
156154
* the aliases. See {@link SQLServer2005DialectTestCase#testGetSelectFieldsWithoutAliases()}
157155
*
158-
* @param an
159-
* sql query
156+
* @param sql sql query
157+
*
160158
* @return the fields of the select statement without their alias
161159
*/
162160
protected static CharSequence getSelectFieldsWithoutAliases(StringBuilder sql) {
163-
String select = sql.substring(sql.indexOf(SELECT) + SELECT.length(), sql.indexOf(FROM));
161+
String select = sql.substring( sql.indexOf( SELECT ) + SELECT.length(), sql.indexOf( FROM ) );
164162

165163
// Strip the as clauses
166-
return stripAliases(select);
164+
return stripAliases( select );
167165
}
168166

169167
/**
170168
* Utility method that strips the aliases. See {@link SQLServer2005DialectTestCase#testStripAliases()}
171169
*
172-
* @param a
173-
* string to replace the as statements
170+
* @param str string to replace the as statements
171+
*
174172
* @return a string without the as statements
175173
*/
176174
protected static String stripAliases(String str) {
177-
return str.replaceAll("\\sas[^,]+(,?)", "$1");
175+
return str.replaceAll( "\\sas[^,]+(,?)", "$1" );
178176
}
179177

180178
/**
181179
* Right after the select statement of a given query we must place the row_number function
182180
*
183-
* @param sql
184-
* the initial sql query without the order by clause
185-
* @param orderby
186-
* the order by clause of the query
181+
* @param sql the initial sql query without the order by clause
182+
* @param orderby the order by clause of the query
187183
*/
188184
protected static void insertRowNumberFunction(StringBuilder sql, CharSequence orderby) {
189185
// Find the end of the select statement
190-
int selectEndIndex = sql.indexOf(SELECT) + SELECT.length();
186+
int selectEndIndex = sql.indexOf( SELECT ) + SELECT.length();
191187

192188
// Insert after the select statement the row_number() function:
193-
sql.insert(selectEndIndex, " ROW_NUMBER() OVER (" + orderby + ") as __hibernate_row_nr__,");
189+
sql.insert( selectEndIndex, " ROW_NUMBER() OVER (" + orderby + ") as __hibernate_row_nr__," );
194190
}
195191
}

‎hibernate-core/src/matrix/java/org/hibernate/test/pagination/DataPoint.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,40 @@ public BigDecimal getY() {
107107
public void setY(BigDecimal y) {
108108
this.y = y;
109109
}
110+
111+
@Override
112+
public boolean equals(Object o) {
113+
if ( this == o ) {
114+
return true;
115+
}
116+
if ( o == null || getClass() != o.getClass() ) {
117+
return false;
118+
}
119+
120+
DataPoint dataPoint = (DataPoint) o;
121+
122+
if ( sequence != dataPoint.sequence ) {
123+
return false;
124+
}
125+
if ( description != null ? !description.equals( dataPoint.description ) : dataPoint.description != null ) {
126+
return false;
127+
}
128+
if ( x != null ? !x.equals( dataPoint.x ) : dataPoint.x != null ) {
129+
return false;
130+
}
131+
if ( y != null ? !y.equals( dataPoint.y ) : dataPoint.y != null ) {
132+
return false;
133+
}
134+
135+
return true;
136+
}
137+
138+
@Override
139+
public int hashCode() {
140+
int result = sequence;
141+
result = 31 * result + ( x != null ? x.hashCode() : 0 );
142+
result = 31 * result + ( y != null ? y.hashCode() : 0 );
143+
result = 31 * result + ( description != null ? description.hashCode() : 0 );
144+
return result;
145+
}
110146
}

‎hibernate-core/src/matrix/java/org/hibernate/test/pagination/PaginationTest.java

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
* Boston, MA 02110-1301 USA
2323
*/
2424
package org.hibernate.test.pagination;
25+
2526
import java.math.BigDecimal;
2627
import java.util.List;
2728

29+
import org.junit.Test;
30+
2831
import org.hibernate.Criteria;
2932
import org.hibernate.Query;
3033
import org.hibernate.SQLQuery;
3134
import org.hibernate.Session;
3235
import org.hibernate.criterion.Order;
33-
34-
import org.junit.Test;
35-
3636
import org.hibernate.testing.DialectChecks;
3737
import org.hibernate.testing.RequiresDialectFeature;
3838
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -44,7 +44,7 @@
4444
* @author Gavin King
4545
*/
4646
public class PaginationTest extends BaseCoreFunctionalTestCase {
47-
public static final int ROWS = 100;
47+
public static final int NUMBER_OF_TEST_ROWS = 100;
4848

4949
@Override
5050
public String[] getMappings() {
@@ -92,8 +92,9 @@ public void testLimit() {
9292

9393
cleanupTestData();
9494
}
95+
9596
@Test
96-
public void testOffset(){
97+
public void testOffset() {
9798
prepareTestData();
9899
Session session = openSession();
99100
session.beginTransaction();
@@ -102,9 +103,16 @@ public void testOffset(){
102103
result = generateBaseHQLQuery( session )
103104
.setFirstResult( 3 )
104105
.list();
106+
DataPoint firstDataPointHQL = (DataPoint) result.get( 0 );
107+
105108
result = generateBaseCriteria( session )
106109
.setFirstResult( 3 )
107110
.list();
111+
DataPoint firstDataPointCriteria = (DataPoint) result.get( 0 );
112+
113+
assertEquals( "The first entry should be the same in HQL and Criteria", firstDataPointHQL, firstDataPointHQL );
114+
assertEquals( "Wrong first result", 3, firstDataPointCriteria.getSequence() );
115+
108116
session.getTransaction().commit();
109117
session.close();
110118
cleanupTestData();
@@ -128,40 +136,40 @@ public void testLimitOffset() {
128136
.setMaxResults( 20 )
129137
.list();
130138
assertEquals( 20, result.size() );
131-
assertEquals( 0, ( ( DataPoint ) result.get( 0 ) ).getSequence() );
132-
assertEquals( 1, ( ( DataPoint ) result.get( 1 ) ).getSequence() );
139+
assertEquals( 0, ( (DataPoint) result.get( 0 ) ).getSequence() );
140+
assertEquals( 1, ( (DataPoint) result.get( 1 ) ).getSequence() );
133141

134142
result = generateBaseCriteria( session )
135143
.setFirstResult( 1 )
136144
.setMaxResults( 20 )
137145
.list();
138146
assertEquals( 20, result.size() );
139-
assertEquals( 1, ( ( DataPoint ) result.get( 0 ) ).getSequence() );
140-
assertEquals( 2, ( ( DataPoint ) result.get( 1 ) ).getSequence() );
147+
assertEquals( 1, ( (DataPoint) result.get( 0 ) ).getSequence() );
148+
assertEquals( 2, ( (DataPoint) result.get( 1 ) ).getSequence() );
141149

142150
result = generateBaseCriteria( session )
143151
.setFirstResult( 99 )
144152
.setMaxResults( Integer.MAX_VALUE - 200 )
145153
.list();
146154
assertEquals( 1, result.size() );
147-
assertEquals( 99, ( ( DataPoint ) result.get( 0 ) ).getSequence() );
155+
assertEquals( 99, ( (DataPoint) result.get( 0 ) ).getSequence() );
148156

149-
result = session.createQuery("select distinct description from DataPoint order by description")
157+
result = session.createQuery( "select distinct description from DataPoint order by description" )
150158
.setFirstResult( 2 )
151159
.setMaxResults( 3 )
152160
.list();
153161
assertEquals( 3, result.size() );
154-
assertEquals( "Description: 2", result.get(0));
155-
assertEquals( "Description: 3", result.get(1));
156-
assertEquals( "Description: 4", result.get(2));
162+
assertEquals( "Description: 2", result.get( 0 ) );
163+
assertEquals( "Description: 3", result.get( 1 ) );
164+
assertEquals( "Description: 4", result.get( 2 ) );
157165

158166
result = session.createSQLQuery( "select description, xval, yval from DataPoint order by xval, yval" )
159167
.setFirstResult( 2 )
160168
.setMaxResults( 5 )
161169
.list();
162170
assertEquals( 5, result.size() );
163-
Object[] row = (Object[]) result.get(0);
164-
assertTrue( row[0] instanceof String);
171+
Object[] row = (Object[]) result.get( 0 );
172+
assertTrue( row[0] instanceof String );
165173

166174
result = session.createSQLQuery( "select * from DataPoint order by xval, yval" )
167175
.setFirstResult( 2 )
@@ -193,14 +201,14 @@ private SQLQuery generateBaseSQLQuery(Session session) {
193201
private void prepareTestData() {
194202
Session session = openSession();
195203
session.beginTransaction();
196-
for ( int i = 0; i < ROWS; i++ ) {
204+
for ( int i = 0; i < NUMBER_OF_TEST_ROWS; i++ ) {
197205
DataPoint dataPoint = new DataPoint();
198206
dataPoint.setSequence( i );
199207
dataPoint.setDescription( "data point #" + i );
200208
BigDecimal x = new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN );
201209
dataPoint.setX( x );
202210
dataPoint.setY( new BigDecimal( Math.cos( x.doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
203-
dataPoint.setDescription("Description: " + i%5);
211+
dataPoint.setDescription( "Description: " + i % 5 );
204212
session.save( dataPoint );
205213
}
206214
session.getTransaction().commit();

0 commit comments

Comments
 (0)