HHH-13612 Quoted table name in FROM clause in @formula gets wrongly qualified with generated alias

Author: dreab8

hibernate-core/src/main/java/org/hibernate/sql/Template.java

@@ -167,8 +167,13 @@ public static String renderWhereStringTemplate(
 
 		boolean hasMore = tokens.hasMoreTokens();
 		String nextToken = hasMore ? tokens.nextToken() : null;
+		String token = null;
+		String previousToken = null;
 		while ( hasMore ) {
-			String token = nextToken;
+			if ( token != null ) {
+				previousToken = token;
+			}
+			token = nextToken;
 			String lcToken = token.toLowerCase(Locale.ROOT);
 			hasMore = tokens.hasMoreTokens();
 			nextToken = hasMore ? tokens.nextToken() : null;
@@ -203,7 +208,9 @@ else if ( quotedIdentifier && dialect.closeQuote()==token.charAt(0) ) {
 				else {
 					isOpenQuote = false;
 				}
-				if ( isOpenQuote ) {
+				if ( isOpenQuote
+					&& !inFromClause // don't want to append alias to tokens inside the from clause
+					&& notEndsWithDot( previousToken ) ) {
 					result.append( alias ).append( '.' );
 				}
 			}
@@ -232,7 +239,8 @@ else if ( FUNCTION_WITH_FROM_KEYWORDS.contains(lcToken) && "(".equals( nextToken
 				result.append(token);
 				inExtractOrTrim = true;
 			}
-			else if ( isIdentifier(token)
+			else if ( !inFromClause // don't want to append alias to tokens inside the from clause
+					&& isIdentifier( token )
 					&& !isFunctionOrKeyword( lcToken, nextToken, dialect, typeConfiguration )
 					&& !isLiteral( lcToken, nextToken, sql, symbols, tokens ) ) {
 				result.append(alias)
@@ -268,6 +276,10 @@ else if ( inFromClause && ",".equals(lcToken) ) {
 		return result.toString();
 	}
 
+	private static boolean notEndsWithDot(String token) {
+		return token == null || token != null && !token.endsWith( "." );
+	}
+
 	private static boolean isLiteral(
 			String lcToken, String next,
 			String sqlWhereString, String symbols, StringTokenizer tokens) {