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

support 'this' with @Query repository methods 

in a very temporary way

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-03-27 23:57:36 +01:00
parent e1bcd01321
commit 8aaf0c7c9d
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/eg/Bookshop.java
View File

@ -16,4 +16,10 @@ public interface Bookshop extends CrudRepository<Book,String> {
@Query("select isbn where title like ?1 order by isbn")
String[] ssns(String title);
@Query("select count(this) where title like ?1 order by isbn")
long count1(String title);
@Query("select count(this) where this.title like ?1 order by this.isbn")
long count2(String title);
}

13
tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java
View File

@ -72,6 +72,7 @@ import static javax.lang.model.util.ElementFilter.methodsIn;
import static org.hibernate.grammars.hql.HqlLexer.FROM;
import static org.hibernate.grammars.hql.HqlLexer.GROUP;
import static org.hibernate.grammars.hql.HqlLexer.HAVING;
import static org.hibernate.grammars.hql.HqlLexer.IDENTIFIER;
import static org.hibernate.grammars.hql.HqlLexer.ORDER;
import static org.hibernate.grammars.hql.HqlLexer.WHERE;
import static org.hibernate.internal.util.StringHelper.isNotEmpty;
@ -2155,9 +2156,17 @@ public class AnnotationMetaEntity extends AnnotationMeta {
}
else {
final HqlLexer hqlLexer = HqlParseTreeBuilder.INSTANCE.buildHqlLexer( hql );
String thisText = "";
final List<? extends Token> allTokens = hqlLexer.getAllTokens();
for (Token token : allTokens) {
switch ( token.getType() ) {
//TEMPORARY until HQL gets support for 'this'
case IDENTIFIER:
final String text = token.getText();
if ( text.equalsIgnoreCase("this") ) {
thisText = " as " + text;
}
break;
case FROM:
return hql;
case WHERE:
@ -2165,11 +2174,11 @@ public class AnnotationMetaEntity extends AnnotationMeta {
case GROUP:
case ORDER:
return new StringBuilder(hql)
.insert(token.getStartIndex(), "from " + entityType + " ")
.insert(token.getStartIndex(), "from " + entityType + thisText + " ")
.toString();
}
}
return hql + " from " + entityType;
return hql + " from " + entityType + thisText;
}
}