HHH-8301 - SQLServer2005LimitHandler skips column alias generation

hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2005LimitHandler.java

@@ -186,8 +186,10 @@ public class SQLServer2005LimitHandler extends AbstractLimitHandler {
 						// Inserting alias. It is unlikely that we would have to add alias, but just in case.
 						alias = StringHelper.generateAlias( "page", unique );
 						sb.insert( nextComa, " as " + alias );
+						int aliasExprLength = ( " as " + alias ).length();
 						++unique;
-						nextComa += ( " as " + alias ).length();
+						nextComa += aliasExprLength;
+						endPos += aliasExprLength;
 					}
 					aliases.add( alias );
 				}

hibernate-core/src/test/java/org/hibernate/dialect/SQLServer2005DialectTestCase.java

@@ -81,6 +81,19 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 		);
 	}
 
+	@Test
+	@TestForIssue(jiraKey = "HHH-8301")
+	public void testGetLimitStringAliasGeneration() {
+		final String notAliasedSQL = "select column1, column2, column3, column4 from table1";
+
+		assertEquals(
+				"WITH query AS (SELECT inner_query.*, ROW_NUMBER() OVER (ORDER BY CURRENT_TIMESTAMP) as __hibernate_row_nr__ FROM ( " +
+						"select column1 as page0_, column2 as page1_, column3 as page2_, column4 as page3_ from table1 ) inner_query ) " +
+						"SELECT page0_, page1_, page2_, page3_ FROM query WHERE __hibernate_row_nr__ >= ? AND __hibernate_row_nr__ < ?",
+				dialect.buildLimitHandler( notAliasedSQL, toRowSelection( 3, 5 ) ).getProcessedSql()
+		);
+	}
+
 	@Test
 	@TestForIssue(jiraKey = "HHH-7019")
 	public void testGetLimitStringWithSubselect() {