[6.6] HHH-19558: Fixed support of JDBC Escape Syntax

hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java

@@ -81,10 +81,15 @@ protected String substituteBrackets(String sqlQuery) throws QueryException {
 			final char ch = sqlQuery.charAt( index );
 			switch (ch) {
 				case '\'':
-					if (!doubleQuoted && !escaped) {
-						singleQuoted = !singleQuoted;
+					if (escaped) {
+						token.append(ch);
+					}
+					else {
+						if (!doubleQuoted) {
+							singleQuoted = !singleQuoted;
+						}
+						result.append(ch);
 					}
-					result.append(ch);
 					break;
 				case '"':
 					if (!singleQuoted && !escaped) {
@@ -216,7 +221,7 @@ private String resolveCollectionProperties(
 				}
 				aliasesFound++;
 				return collectionPersister.selectFragment( aliasName, collectionSuffix )
-						+ ", " + resolveProperties( aliasName, propertyName );
+					+ ", " + resolveProperties( aliasName, propertyName );
 			case "element.*":
 				return resolveProperties( aliasName, "*" );
 			default:
@@ -266,7 +271,7 @@ private void validate(String aliasName, String propertyName, String[] columnAlia
 			// TODO: better error message since we actually support composites if names are explicitly listed
 			throw new QueryException(
 					"SQL queries only support properties mapped to a single column - property [" +
-							propertyName + "] is mapped to " + columnAliases.length + " columns.",
+					propertyName + "] is mapped to " + columnAliases.length + " columns.",
 					originalQueryString
 			);
 		}

hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLQueryParserUnitTests.java

@@ -0,0 +1,65 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.sql;
+
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.query.sql.internal.SQLQueryParser;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link SQLQueryParser}
+ *
+ * @author Steve Ebersole
+ */
+@SuppressWarnings("JUnitMalformedDeclaration")
+public class SQLQueryParserUnitTests {
+
+	@ParameterizedTest
+	@DomainModel
+	@SessionFactory
+	@RequiresDialect(H2Dialect.class)
+	@ValueSource(strings = {
+			"{d '2025-06-18'}",
+			"{t '14:00'}",
+			"{t '14:00:00'}",
+			"{ts '2025-06-18T14:00'}",
+			"{ts '2025-06-18T14:00:00'}",
+			"{ts '2025-06-18T14:00:00.123'}",
+			"{ts '2025-06-18T14:00:00+01:00'}"})
+	void testJDBCEscapeSyntaxParsing(String variant, SessionFactoryScope scope) {
+		final SessionFactoryImplementor sessionFactory = scope.getSessionFactory();
+		final String sqlQuery = "select id, name from {h-domain}the_table where date = " + variant;
+
+		final String full = processSqlString( sqlQuery, "my_catalog", "my_schema", sessionFactory );
+		assertThat( full ).contains( variant );
+
+		final String catalogOnly = processSqlString( sqlQuery, "my_catalog", null, sessionFactory );
+		assertThat( catalogOnly ).contains( variant );
+
+		final String schemaOnly = processSqlString( sqlQuery, null, "my_schema", sessionFactory );
+		assertThat( schemaOnly ).contains( variant );
+
+		final String none = processSqlString( sqlQuery, null, null, sessionFactory );
+		assertThat( none ).contains( variant );
+	}
+
+	private static String processSqlString(
+			String sqlQuery,
+			String catalogName,
+			String schemaName,
+			SessionFactoryImplementor sessionFactory) {
+		return new SQLQueryParser( sqlQuery, null, sessionFactory ).process();
+	}
+}