Skip to content

HHH-19558: Fixed support of JDBC Escape Syntax #10369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+41 −5
Open

HHH-19558: Fixed support of JDBC Escape Syntax #10369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6c1dc7
HHH-19558: Fixed support of JDBC escape syntax
Stefan-Tri Jun 18, 2025
108e91e
HHH-19558: Improved Test
Stefan-Tri Jun 18, 2025
554f6c0
HHH-19558: Removed double quoted case
Stefan-Tri Jun 30, 2025
979f8b1
Merge branch 'main' into HHH-19558
Stefan-Tri Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,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) {
Expand Down Expand Up @@ -220,7 +225,7 @@ private String resolveCollectionProperties(
}
aliasesFound++;
return collectionPersister.selectFragment( aliasName, collectionSuffix )
+ ", " + resolveProperties( aliasName, propertyName );
+ ", " + resolveProperties( aliasName, propertyName );
case "element.*":
return resolveProperties( aliasName, "*" );
default:
Expand Down Expand Up @@ -270,7 +275,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
);
}
Expand Down
31 changes: 31 additions & 0 deletions hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLQueryParserUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
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;

Expand All @@ -24,6 +26,35 @@
@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 );
}

@Test
@DomainModel
@SessionFactory
Expand Down