Fix HHH-11352 - the Pattern at buildShallowIndexPattern where "wordBo…

…undary==true" should wrap the pattern properly with '\b'

(cherry picked from commit 56f7466)

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

@@ -356,14 +356,15 @@ private static int shallowIndexOfPattern(final StringBuilder sb, final Pattern p
 	 * based on the search pattern that is not enclosed in parenthesis.
 	 *
 	 * @param pattern String search pattern.
-	 * @param wordBoundardy whether to apply a word boundary restriction.
+	 * @param wordBoundary whether to apply a word boundary restriction.
 	 * @return Compiled {@link Pattern}.
 	 */
-	private static Pattern buildShallowIndexPattern(String pattern, boolean wordBoundardy) {
+	private static Pattern buildShallowIndexPattern(String pattern, boolean wordBoundary) {
 		return Pattern.compile(
 				"(" +
-				( wordBoundardy ? "\\b" : "" ) +
+				( wordBoundary ? "\\b" : "" ) +
 				pattern +
+				( wordBoundary ? "\\b" : "" ) +
 				")(?![^\\(|\\[]*(\\)|\\]))",
 				Pattern.CASE_INSENSITIVE
 		);

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

@@ -127,6 +127,16 @@ public void testGetLimitStringAliasGenerationWithAliasesNoAs() {
 		);
 	}
 
+	@Test
+	@TestForIssue(jiraKey = "HHH-11352")
+	public void testPagingWithColumnNameStartingWithFrom() {
+		final String sql = "select column1 c1, from_column c2 from table1";
+		assertEquals( "WITH query AS (SELECT inner_query.*, ROW_NUMBER() OVER (ORDER BY CURRENT_TIMESTAMP) as __hibernate_row_nr__ FROM ( " +
+				"select column1 c1, from_column c2 from table1 ) inner_query ) " +
+				"SELECT c1, c2 FROM query WHERE __hibernate_row_nr__ >= ? AND __hibernate_row_nr__ < ?",
+				dialect.getLimitHandler().processSql(sql, toRowSelection(3, 5)));
+	}
+
 	@Test
 	@TestForIssue(jiraKey = "HHH-7019")
 	public void testGetLimitStringWithSubselect() {