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

HHH-11084 - Fix invalid SQL used in test cases.

This commit is contained in:
Chris Cranford 2016-12-16 12:50:24 -05:00
parent 54f3409b41
commit 1304541d94
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,12 +151,12 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
public void testGetLimitStringWithSelectDistinctSubselect() { public void testGetLimitStringWithSelectDistinctSubselect() {
final String selectDistinctSubselectSQL = "select page0_.CONTENTID as CONTENT1_12_ " + final String selectDistinctSubselectSQL = "select page0_.CONTENTID as CONTENT1_12_ " +
"where page0_.CONTENTTYPE='PAGE' and (page0_.CONTENTID in " + "where page0_.CONTENTTYPE='PAGE' and (page0_.CONTENTID in " +
"(select distinct page2_.PREVVER from CONTENT page2_ where (page2_.PREVVER is not null))"; "(select distinct page2_.PREVVER from CONTENT page2_ where (page2_.PREVVER is not null)))";
assertEquals( assertEquals(
"select TOP(?) page0_.CONTENTID as CONTENT1_12_ " + "select TOP(?) page0_.CONTENTID as CONTENT1_12_ " +
"where page0_.CONTENTTYPE='PAGE' and (page0_.CONTENTID in " + "where page0_.CONTENTTYPE='PAGE' and (page0_.CONTENTID in " +
"(select distinct page2_.PREVVER from CONTENT page2_ where (page2_.PREVVER is not null))", "(select distinct page2_.PREVVER from CONTENT page2_ where (page2_.PREVVER is not null)))",
dialect.getLimitHandler().processSql( selectDistinctSubselectSQL, toRowSelection( 0, 5 ) ) dialect.getLimitHandler().processSql( selectDistinctSubselectSQL, toRowSelection( 0, 5 ) )
); );
} }
@ -164,14 +164,14 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
@Test @Test
@TestForIssue(jiraKey = "HHH-11084") @TestForIssue(jiraKey = "HHH-11084")
public void testGetLimitStringWithSelectDistinctSubselectNotFirst() { public void testGetLimitStringWithSelectDistinctSubselectNotFirst() {
final String selectDistinctSubselectSQL = "select page0_.CONTENTID as CONTENT1_12_ " + final String selectDistinctSubselectSQL = "select page0_.CONTENTID as CONTENT1_12_ FROM CONTEXT page0_ " +
"where page0_.CONTENTTYPE='PAGE' and (page0_.CONTENTID in " + "where page0_.CONTENTTYPE='PAGE' and (page0_.CONTENTID in " +
"(select distinct page2_.PREVVER from CONTENT page2_ where (page2_.PREVVER is not null))"; "(select distinct page2_.PREVVER from CONTENT page2_ where (page2_.PREVVER is not null)))";
assertEquals( assertEquals(
"WITH query AS (SELECT inner_query.*, ROW_NUMBER() OVER (ORDER BY CURRENT_TIMESTAMP) as __hibernate_row_nr__ " + "WITH query AS (SELECT inner_query.*, ROW_NUMBER() OVER (ORDER BY CURRENT_TIMESTAMP) as __hibernate_row_nr__ " +
"FROM ( " + selectDistinctSubselectSQL + " ) inner_query ) " + "FROM ( " + selectDistinctSubselectSQL + " ) inner_query ) " +
"SELECT page2_.PREVVER FROM query WHERE __hibernate_row_nr__ >= ? AND __hibernate_row_nr__ < ?", "SELECT CONTENT1_12_ FROM query WHERE __hibernate_row_nr__ >= ? AND __hibernate_row_nr__ < ?",
dialect.getLimitHandler().processSql( selectDistinctSubselectSQL, toRowSelection( 1, 5 ) ) dialect.getLimitHandler().processSql( selectDistinctSubselectSQL, toRowSelection( 1, 5 ) )
); );
} }