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

fix error reported for empty HQL string

This commit is contained in:
Gavin 2023-06-10 23:13:19 +02:00 committed by Gavin King
parent e0d08a5f26
commit bc81eb6d19
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-core/src/main/java/org/hibernate/query/hql/internal/StandardHqlTranslator.java
View File

@ -159,10 +159,15 @@ public class StandardHqlTranslator implements HqlTranslator {
} }
if ( e instanceof NoViableAltException ) { if ( e instanceof NoViableAltException ) {
errorText += message.substring( 0, message.indexOf("'") ); errorText += message.substring( 0, message.indexOf("'") );
if ( hql.isEmpty() ) {
errorText += "'*' (empty query string)";
}
else {
String lineText = hql.lines().collect( toList() ).get( line -1 ); String lineText = hql.lines().collect( toList() ).get( line -1 );
String text = lineText.substring( 0, charPositionInLine) + "*" + lineText.substring(charPositionInLine); String text = lineText.substring( 0, charPositionInLine) + "*" + lineText.substring(charPositionInLine);
errorText += "'" + text + "'"; errorText += "'" + text + "'";
} }
}
else if ( e instanceof InputMismatchException ) { else if ( e instanceof InputMismatchException ) {
errorText += message.substring( 0, message.length()-1 ) errorText += message.substring( 0, message.length()-1 )
.replace(" expecting {", ", expecting one of the following tokens: "); .replace(" expecting {", ", expecting one of the following tokens: ");