Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-7973 - Fix String literals in an HQL query can get mangled

This commit is contained in:
Andrea Boriero 2016-02-05 21:15:05 +00:00
parent c9631a9ae2
commit 599df2405b
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hibernate-core/src/main/java/org/hibernate/hql/internal/QuerySplitter.java
View File

@ -89,6 +89,18 @@ public final class QuerySplitter {
templateQuery.append( token ); templateQuery.append( token );
continue; continue;
} }
else if ( isTokenStartWithAQuoteCharacter( token ) ) {
if ( !isTokenEndWithAQuoteCharacter( token ) ) {
inQuote = true;
}
templateQuery.append( token );
continue;
}
else if ( isTokenEndWithAQuoteCharacter( token ) ) {
inQuote = false;
templateQuery.append( token );
continue;
}
else if ( inQuote ) { else if ( inQuote ) {
templateQuery.append( token ); templateQuery.append( token );
continue; continue;
@ -130,6 +142,14 @@ public final class QuerySplitter {
return "'".equals( token ) || "\"".equals( token ); return "'".equals( token ) || "\"".equals( token );
} }
private static boolean isTokenStartWithAQuoteCharacter(String token) {
return token.startsWith( "'" ) || token.startsWith( "\"" );
}
private static boolean isTokenEndWithAQuoteCharacter(String token) {
return token.endsWith( "'" ) || token.endsWith( "\"" );
}
private static String nextNonWhite(String[] tokens, int start) { private static String nextNonWhite(String[] tokens, int start) {
for ( int i = start + 1; i < tokens.length; i++ ) { for ( int i = start + 1; i < tokens.length; i++ ) {
if ( !ParserHelper.isWhitespace( tokens[i] ) ) { if ( !ParserHelper.isWhitespace( tokens[i] ) ) {