Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-6749: Modified SQLServer2005Dialect.getLimitString() to add limit criteria that uses the max row value in an exclusive manner

This commit is contained in:
John Verhaeg 2011-10-20 16:39:34 -05:00
parent 7c2d88df8b
commit d12e0c09ae
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2005Dialect.java
View File

@ -130,7 +130,7 @@ public class SQLServer2005Dialect extends SQLServerDialect {
// Wrap the query within a with statement:
sb.insert(0, "WITH query AS (").append(") SELECT * FROM query ");
sb.append("WHERE __hibernate_row_nr__ BETWEEN ? AND ?");
sb.append("WHERE __hibernate_row_nr__ >= ? AND __hibernate_row_nr__ < ?");
return sb.toString();
}

4
hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java
View File

@ -1651,10 +1651,10 @@ public class FooBarTest extends LegacyTestCase {
.iterate();
int count=0;
while ( iter.hasNext() ) {
System.out.println("ROW = " + iter.next());
iter.next();
count++;
}
assertEquals(DIALECT.useMaxForLimit() ? 7 : 4, count);
assertEquals(4, count);
iter = s.createQuery("select distinct foo from Foo foo")
.setMaxResults(2)
.setFirstResult(2)

16
hibernate-core/src/test/java/org/hibernate/dialect/SQLServer2005DialectTestCase.java
View File

@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals;
/**
* Unit test of the behavior of the SQLServerDialect utility methods
*
*
* @author Valotasion Yoryos
*/
public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
@ -42,7 +42,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
assertEquals( "some_field1, some_fild2, _field3", SQLServer2005Dialect.stripAliases(input) );
}
@Test
public void testGetSelectFieldsWithoutAliases() {
StringBuilder input = new StringBuilder( "select some_field1 as f12, some_fild2 as f879, _field3 as _f24674_3 from...." );
@ -50,20 +50,20 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
assertEquals( " some_field1, some_fild2, _field3", output );
}
@Test
public void testReplaceDistinctWithGroupBy() {
StringBuilder input = new StringBuilder( "select distinct f1, f2 as ff, f3 from table where f1 = 5" );
SQLServer2005Dialect.replaceDistinctWithGroupBy( input );
assertEquals( "select f1, f2 as ff, f3 from table where f1 = 5 group by f1, f2, f3 ", input.toString() );
}
@Test
public void testGetLimitString() {
String input = "select distinct f1 as f53245 from table849752 order by f234, f67 desc";
String input = "select distinct f1 as f53245 from table849752 order by f234, f67 desc";
Dialect sqlDialect = new SQLServer2005Dialect();
assertEquals( "with query as (select row_number() over (order by f234, f67 desc) as __hibernate_row_nr__, f1 as f53245 from table849752 group by f1) select * from query where __hibernate_row_nr__ between ? and ?", sqlDialect.getLimitString(input, 10, 15).toLowerCase() );
assertEquals( "with query as (select row_number() over (order by f234, f67 desc) as __hibernate_row_nr__, f1 as f53245 from table849752 group by f1) select * from query where __hibernate_row_nr__ >= ? and __hibernate_row_nr__ < ?", sqlDialect.getLimitString(input, 10, 15).toLowerCase() );
}
}