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

HHH-15654 Overrides and small changes in the API interface

This commit is contained in:
Marco Belladelli 2022-12-05 15:24:50 +01:00 committed by Christian Beikov
parent 9a980b3f93
commit 28b0d6c5a4
5 changed files with 690 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

317
hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java
View File

@ -954,6 +954,11 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder {
*/
<T> JpaExpression<T> lastValue(Expression<T> argument, JpaWindow window);
/**
* @see #nthValue(Expression, Expression, JpaWindow) nthValue
*/
<T> JpaExpression<T> nthValue(Expression<T> argument, int n, JpaWindow window);
/**
* Create a {@code nth_value} window function expression.
*
@ -1012,6 +1017,31 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder {
*/
JpaExpression<Double> cumeDist(JpaWindow window);
/**
* @see #functionWithinGroup(String, Class, JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
<T> JpaExpression<T> functionWithinGroup(String name, Class<T> type, JpaOrder order, Expression<?>... args);
/**
* @see #functionWithinGroup(String, Class, JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
<T> JpaExpression<T> functionWithinGroup(
String name,
Class<T> type,
JpaOrder order,
JpaPredicate filter,
Expression<?>... args);
/**
* @see #functionWithinGroup(String, Class, JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
<T> JpaExpression<T> functionWithinGroup(
String name,
Class<T> type,
JpaOrder order,
JpaWindow window,
Expression<?>... args);
/**
* Create a generic ordered set-aggregate function expression.
*
@ -1019,6 +1049,7 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder {
* @param type type of this expression
* @param order order by clause used in within group
* @param filter optional filter clause
* @param window optional window over which to apply the function
* @param args optional arguments to the function
* @param <T> type of this expression
*
@ -1029,47 +1060,26 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder {
Class<T> type,
JpaOrder order,
JpaPredicate filter,
JpaWindow window,
Expression<?>... args);
/**
* Create a generic ordered set-aggregate function expression.
*
* @param name name of the ordered set-aggregate function
* @param type type of this expression
* @param order order by clause used in within group
* @param args optional arguments to the function
* @param <T> type of this expression
*
* @return ordered set-aggregate function expression
*
* @see #functionWithinGroup(String, Class, JpaOrder, JpaPredicate, Expression...) functionWithinGroup
* @see #listagg(JpaOrder, JpaPredicate, JpaWindow, Expression, Expression)
*/
<T> JpaExpression<T> functionWithinGroup(String name, Class<T> type, JpaOrder order, Expression<?>... args);
JpaExpression<String> listagg(JpaOrder order, Expression<String> argument, String separator);
/**
* Create a {@code listagg} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param argument values to join
* @param separator the separator used to join the values
*
* @return ordered set-aggregate expression
*
* @see #listagg(JpaOrder, JpaPredicate, Expression, Expression) listagg
* @see #listagg(JpaOrder, JpaPredicate, JpaWindow, Expression, Expression)
*/
JpaExpression<String> listagg(JpaOrder order, Expression<String> argument, Expression<String> separator);
/**
* Create a {@code listagg} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param filter optional filter clause
* @param argument values to join
* @param separator the separator used to join the values
*
* @return ordered set-aggregate expression
*
* @see #functionWithinGroup
* @see #listagg(JpaOrder, JpaPredicate, JpaWindow, Expression, Expression)
*/
JpaExpression<String> listagg(JpaOrder order, JpaPredicate filter, Expression<String> argument, String separator);
/**
* @see #listagg(JpaOrder, JpaPredicate, JpaWindow, Expression, Expression)
*/
JpaExpression<String> listagg(
JpaOrder order,
@ -1078,127 +1088,252 @@ public interface HibernateCriteriaBuilder extends CriteriaBuilder {
Expression<String> separator);
/**
* Create a {@code mode} ordered set-aggregate function expression.
* @see #listagg(JpaOrder, JpaPredicate, JpaWindow, Expression, Expression)
*/
JpaExpression<String> listagg(JpaOrder order, JpaWindow window, Expression<String> argument, String separator);
/**
* @see #listagg(JpaOrder, JpaPredicate, JpaWindow, Expression, Expression)
*/
JpaExpression<String> listagg(
JpaOrder order,
JpaWindow window,
Expression<String> argument,
Expression<String> separator);
/**
* @see #listagg(JpaOrder, JpaPredicate, JpaWindow, Expression, Expression)
*/
JpaExpression<String> listagg(
JpaOrder order,
JpaPredicate filter,
JpaWindow window,
Expression<String> argument,
String separator);
/**
* Create a {@code listagg} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param argument argument to the function
* @param filter optional filter clause
* @param window optional window over which to apply the function
* @param argument values to join
* @param separator the separator used to join the values
*
* @return ordered set-aggregate expression
*
* @see #mode(JpaOrder, JpaPredicate, Expression) mode
* @see #functionWithinGroup(String, Class, JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
JpaExpression<?> mode(JpaOrder order, Expression<?> argument);
JpaExpression<String> listagg(
JpaOrder order,
JpaPredicate filter,
JpaWindow window,
Expression<String> argument,
Expression<String> separator);
/**
* @see #mode(JpaPredicate, JpaWindow, Expression, SortOrder, NullPrecedence)
*/
<T> JpaExpression<T> mode(Expression<T> sortExpression, SortOrder sortOrder, NullPrecedence nullPrecedence);
/**
* @see #mode(JpaPredicate, JpaWindow, Expression, SortOrder, NullPrecedence)
*/
<T> JpaExpression<T> mode(
JpaPredicate filter,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence);
/**
* @see #mode(JpaPredicate, JpaWindow, Expression, SortOrder, NullPrecedence)
*/
<T> JpaExpression<T> mode(
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence);
/**
* Create a {@code mode} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param filter optional filter clause
* @param argument argument to the function
*
* @param window optional window over which to apply the function
* @param sortExpression the sort expression
* @param sortOrder the sort order
* @param nullPrecedence the null precedence
* @return ordered set-aggregate expression
*
* @see #functionWithinGroup
* @param <T> type of this expression
* @see #functionWithinGroup(String, Class, JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
JpaExpression<?> mode(JpaOrder order, JpaPredicate filter, Expression<?> argument);
<T> JpaExpression<T> mode(
JpaPredicate filter,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence);
/**
* @see #percentileCont(Expression, JpaPredicate, JpaWindow, Expression, SortOrder, NullPrecedence)
*/
<T> JpaExpression<T> percentileCont(
Expression<? extends Number> argument,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence);
/**
* @see #percentileCont(Expression, JpaPredicate, JpaWindow, Expression, SortOrder, NullPrecedence)
*/
<T> JpaExpression<T> percentileCont(
Expression<? extends Number> argument,
JpaPredicate filter,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence);
/**
* @see #percentileCont(Expression, JpaPredicate, JpaWindow, Expression, SortOrder, NullPrecedence)
*/
<T> JpaExpression<T> percentileCont(
Expression<? extends Number> argument,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence);
/**
* Create a {@code percentile_cont} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param argument argument to the function
* @param filter optional filter clause
* @param window optional window over which to apply the function
* @param sortExpression the sort expression
* @param sortOrder the sort order
* @param nullPrecedence the null precedence
*
* @return ordered set-aggregate expression
*
* @see #percentileCont(JpaOrder, JpaPredicate, Expression) percentileCont
* @see #functionWithinGroup(String, Class, JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
JpaExpression<Integer> percentileCont(JpaOrder order, Expression<? extends Number> argument);
<T> JpaExpression<T> percentileCont(
Expression<? extends Number> argument,
JpaPredicate filter,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence);
/**
* Create a {@code percentile_cont} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param filter optional filter clause
* @param argument argument to the function
*
* @return ordered set-aggregate expression
*
* @see #functionWithinGroup
* @see #percentileDisc(Expression, JpaPredicate, JpaWindow, Expression, SortOrder, NullPrecedence)
*/
JpaExpression<Integer> percentileCont(JpaOrder order, JpaPredicate filter, Expression<? extends Number> argument);
<T> JpaExpression<T> percentileDisc(
Expression<? extends Number> argument,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence);
/**
* @see #percentileDisc(Expression, JpaPredicate, JpaWindow, Expression, SortOrder, NullPrecedence)
*/
<T> JpaExpression<T> percentileDisc(
Expression<? extends Number> argument,
JpaPredicate filter,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence);
/**
* @see #percentileDisc(Expression, JpaPredicate, JpaWindow, Expression, SortOrder, NullPrecedence)
*/
<T> JpaExpression<T> percentileDisc(
Expression<? extends Number> argument,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence);
/**
* Create a {@code percentile_disc} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param argument argument to the function
*
* @return ordered set-aggregate expression
*
* @see #percentileDisc(JpaOrder, JpaPredicate, Expression) percentileDisc
*/
JpaExpression<Integer> percentileDisc(JpaOrder order, Expression<? extends Number> argument);
/**
* Create a {@code percentile_disc} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param filter optional filter clause
* @param argument argument to the function
* @param window optional window over which to apply the function
* @param sortExpression the sort expression
* @param sortOrder the sort order
* @param nullPrecedence the null precedence
*
* @return ordered set-aggregate expression
*
* @see #functionWithinGroup
* @see #functionWithinGroup(String, Class, JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
JpaExpression<Integer> percentileDisc(JpaOrder order, JpaPredicate filter, Expression<? extends Number> argument);
<T> JpaExpression<T> percentileDisc(
Expression<? extends Number> argument,
JpaPredicate filter,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence);
/**
* Create a {@code rank} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param argument argument to the function
*
* @return ordered set-aggregate expression
*
* @see #rank(JpaOrder, JpaPredicate, Expression) rank
* @see #rank(JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
JpaExpression<Long> rank(JpaOrder order, Expression<Integer> argument);
JpaExpression<Long> rank(JpaOrder order, Expression<?>... arguments);
/**
* @see #rank(JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
JpaExpression<Long> rank(JpaOrder order, JpaPredicate filter, Expression<?>... arguments);
/**
* @see #rank(JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
JpaExpression<Long> rank(JpaOrder order, JpaWindow window, Expression<?>... arguments);
/**
* Create a {@code rank} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param filter optional filter clause
* @param argument argument to the function
* @param window optional window over which to apply the function
* @param arguments arguments to the function
*
* @return ordered set-aggregate expression
*
* @see #functionWithinGroup
*/
JpaExpression<Long> rank(JpaOrder order, JpaPredicate filter, Expression<Integer> argument);
JpaExpression<Long> rank(JpaOrder order, JpaPredicate filter, JpaWindow window, Expression<?>... arguments);
/**
* Create a {@code percent_rank} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param argument argument to the function
*
* @return ordered set-aggregate expression
*
* @see #percentRank(JpaOrder, JpaPredicate, Expression) percentRank
* @see #percentRank(JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
JpaExpression<Double> percentRank(JpaOrder order, Expression<Integer> argument);
JpaExpression<Double> percentRank(JpaOrder order, Expression<?>... arguments);
/**
* @see #percentRank(JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
JpaExpression<Double> percentRank(JpaOrder order, JpaPredicate filter, Expression<?>... arguments);
/**
* @see #percentRank(JpaOrder, JpaPredicate, JpaWindow, Expression...)
*/
JpaExpression<Double> percentRank(JpaOrder order, JpaWindow window, Expression<?>... arguments);
/**
* Create a {@code percent_rank} ordered set-aggregate function expression.
*
* @param order order by clause used in within group
* @param filter optional filter clause
* @param argument argument to the function
* @param window optional window over which to apply the function
* @param arguments arguments to the function
*
* @return ordered set-aggregate expression
*
* @see #functionWithinGroup
*/
JpaExpression<Double> percentRank(JpaOrder order, JpaPredicate filter, Expression<Integer> argument);
JpaExpression<Double> percentRank(
JpaOrder order,
JpaPredicate filter,
JpaWindow window,
Expression<?>... arguments);
}

239
hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java
View File

@ -1281,6 +1281,11 @@ public class HibernateCriteriaBuilderDelegate implements HibernateCriteriaBuilde
return criteriaBuilder.lastValue( argument, window );
}
@Override
public <T> JpaExpression<T> nthValue(Expression<T> argument, int n, JpaWindow window) {
return criteriaBuilder.nthValue( argument, n, window );
}
@Override
public <T> JpaExpression<T> nthValue(Expression<T> argument, Expression<Integer> n, JpaWindow window) {
return criteriaBuilder.nthValue( argument, n, window );
@ -1306,6 +1311,11 @@ public class HibernateCriteriaBuilderDelegate implements HibernateCriteriaBuilde
return criteriaBuilder.cumeDist( window );
}
@Override
public <T> JpaExpression<T> functionWithinGroup(String name, Class<T> type, JpaOrder order, Expression<?>... args) {
return criteriaBuilder.functionWithinGroup( name, type, order, args );
}
@Override
public <T> JpaExpression<T> functionWithinGroup(
String name,
@ -1317,8 +1327,29 @@ public class HibernateCriteriaBuilderDelegate implements HibernateCriteriaBuilde
}
@Override
public <T> JpaExpression<T> functionWithinGroup(String name, Class<T> type, JpaOrder order, Expression<?>... args) {
return criteriaBuilder.functionWithinGroup( name, type, order, args );
public <T> JpaExpression<T> functionWithinGroup(
String name,
Class<T> type,
JpaOrder order,
JpaWindow window,
Expression<?>... args) {
return criteriaBuilder.functionWithinGroup( name, type, order, window, args );
}
@Override
public <T> JpaExpression<T> functionWithinGroup(
String name,
Class<T> type,
JpaOrder order,
JpaPredicate filter,
JpaWindow window,
Expression<?>... args) {
return criteriaBuilder.functionWithinGroup( name, type, order, filter, window, args );
}
@Override
public JpaExpression<String> listagg(JpaOrder order, Expression<String> argument, String separator) {
return criteriaBuilder.listagg( order, argument, separator );
}
@Override
@ -1326,6 +1357,15 @@ public class HibernateCriteriaBuilderDelegate implements HibernateCriteriaBuilde
return criteriaBuilder.listagg( order, argument, separator );
}
@Override
public JpaExpression<String> listagg(
JpaOrder order,
JpaPredicate filter,
Expression<String> argument,
String separator) {
return criteriaBuilder.listagg( order, filter, argument, separator );
}
@Override
public JpaExpression<String> listagg(
JpaOrder order,
@ -1336,58 +1376,197 @@ public class HibernateCriteriaBuilderDelegate implements HibernateCriteriaBuilde
}
@Override
public JpaExpression<?> mode(JpaOrder order, Expression<?> argument) {
return criteriaBuilder.mode( order, argument );
public JpaExpression<String> listagg(
JpaOrder order,
JpaWindow window,
Expression<String> argument,
String separator) {
return criteriaBuilder.listagg( order, window, argument, separator );
}
@Override
public JpaExpression<?> mode(JpaOrder order, JpaPredicate filter, Expression<?> argument) {
return criteriaBuilder.mode( order, filter, argument );
public JpaExpression<String> listagg(
JpaOrder order,
JpaWindow window,
Expression<String> argument,
Expression<String> separator) {
return criteriaBuilder.listagg( order, window, argument, separator );
}
@Override
public JpaExpression<Integer> percentileCont(JpaOrder order, Expression<? extends Number> argument) {
return criteriaBuilder.percentileCont( order, argument );
}
@Override
public JpaExpression<Integer> percentileCont(
public JpaExpression<String> listagg(
JpaOrder order,
JpaPredicate filter,
Expression<? extends Number> argument) {
return criteriaBuilder.percentileCont( order, filter, argument );
JpaWindow window,
Expression<String> argument,
String separator) {
return criteriaBuilder.listagg( order, filter, window, argument, separator );
}
@Override
public JpaExpression<Integer> percentileDisc(JpaOrder order, Expression<? extends Number> argument) {
return criteriaBuilder.percentileDisc( order, argument );
}
@Override
public JpaExpression<Integer> percentileDisc(
public JpaExpression<String> listagg(
JpaOrder order,
JpaPredicate filter,
Expression<? extends Number> argument) {
return criteriaBuilder.percentileDisc( order, filter, argument );
JpaWindow window,
Expression<String> argument,
Expression<String> separator) {
return criteriaBuilder.listagg( order, filter, window, argument, separator );
}
@Override
public JpaExpression<Long> rank(JpaOrder order, Expression<Integer> argument) {
return criteriaBuilder.rank( order, argument );
public <T> JpaExpression<T> mode(Expression<T> sortExpression, SortOrder sortOrder, NullPrecedence nullPrecedence) {
return criteriaBuilder.mode( sortExpression, sortOrder, nullPrecedence );
}
@Override
public JpaExpression<Long> rank(JpaOrder order, JpaPredicate filter, Expression<Integer> argument) {
return criteriaBuilder.rank( order, filter, argument );
public <T> JpaExpression<T> mode(
JpaPredicate filter,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return criteriaBuilder.mode( filter, sortExpression, sortOrder, nullPrecedence );
}
@Override
public JpaExpression<Double> percentRank(JpaOrder order, Expression<Integer> argument) {
return criteriaBuilder.percentRank( order, argument );
public <T> JpaExpression<T> mode(
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return criteriaBuilder.mode( window, sortExpression, sortOrder, nullPrecedence );
}
@Override
public JpaExpression<Double> percentRank(JpaOrder order, JpaPredicate filter, Expression<Integer> argument) {
return criteriaBuilder.percentRank( order, filter, argument );
public <T> JpaExpression<T> mode(
JpaPredicate filter,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return criteriaBuilder.mode( filter, window, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> JpaExpression<T> percentileCont(
Expression<? extends Number> argument,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return criteriaBuilder.percentileCont( argument, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> JpaExpression<T> percentileCont(
Expression<? extends Number> argument,
JpaPredicate filter,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return criteriaBuilder.percentileCont( argument, filter, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> JpaExpression<T> percentileCont(
Expression<? extends Number> argument,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return criteriaBuilder.percentileCont( argument, window, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> JpaExpression<T> percentileCont(
Expression<? extends Number> argument,
JpaPredicate filter,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return criteriaBuilder.percentileCont( argument, filter, window, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> JpaExpression<T> percentileDisc(
Expression<? extends Number> argument,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return criteriaBuilder.percentileDisc( argument, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> JpaExpression<T> percentileDisc(
Expression<? extends Number> argument,
JpaPredicate filter,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return criteriaBuilder.percentileDisc( argument, filter, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> JpaExpression<T> percentileDisc(
Expression<? extends Number> argument,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return criteriaBuilder.percentileDisc( argument, window, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> JpaExpression<T> percentileDisc(
Expression<? extends Number> argument,
JpaPredicate filter,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return criteriaBuilder.percentileDisc( argument, filter, window, sortExpression, sortOrder, nullPrecedence );
}
@Override
public JpaExpression<Long> rank(JpaOrder order, Expression<?>... arguments) {
return criteriaBuilder.rank( order, arguments );
}
@Override
public JpaExpression<Long> rank(JpaOrder order, JpaPredicate filter, Expression<?>... arguments) {
return criteriaBuilder.rank( order, filter, arguments );
}
@Override
public JpaExpression<Long> rank(JpaOrder order, JpaWindow window, Expression<?>... arguments) {
return criteriaBuilder.rank( order, window, arguments );
}
@Override
public JpaExpression<Long> rank(JpaOrder order, JpaPredicate filter, JpaWindow window, Expression<?>... arguments) {
return criteriaBuilder.rank( order, filter, window, arguments );
}
@Override
public JpaExpression<Double> percentRank(JpaOrder order, Expression<?>... arguments) {
return criteriaBuilder.percentRank( order, arguments );
}
@Override
public JpaExpression<Double> percentRank(JpaOrder order, JpaPredicate filter, Expression<?>... arguments) {
return criteriaBuilder.percentRank( order, filter, arguments );
}
@Override
public JpaExpression<Double> percentRank(JpaOrder order, JpaWindow window, Expression<?>... arguments) {
return criteriaBuilder.percentRank( order, window, arguments );
}
@Override
public JpaExpression<Double> percentRank(
JpaOrder order,
JpaPredicate filter,
JpaWindow window,
Expression<?>... arguments) {
return criteriaBuilder.percentRank( order, filter, window, arguments );
}
}

286
hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
View File

@ -2606,6 +2606,11 @@ public class SqmCriteriaNodeBuilder implements NodeBuilder, SqmCreationContext,
return (SqmExpression<T>) windowFunction( "last_value", argument.getJavaType(), window, argument );
}
@Override
public <T> SqmExpression<T> nthValue(Expression<T> argument, int n, JpaWindow window) {
return nthValue( argument, value( n ), window );
}
@Override
@SuppressWarnings("unchecked")
public <T> SqmExpression<T> nthValue(Expression<T> argument, Expression<Integer> n, JpaWindow window) {
@ -2635,6 +2640,11 @@ public class SqmCriteriaNodeBuilder implements NodeBuilder, SqmCreationContext,
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Ordered set-aggregate functions
@Override
public <T> SqmExpression<T> functionWithinGroup(String name, Class<T> type, JpaOrder order, Expression<?>... args) {
return functionWithinGroup( name, type, order, null, null, args );
}
@Override
public <T> SqmExpression<T> functionWithinGroup(
String name,
@ -2642,15 +2652,33 @@ public class SqmCriteriaNodeBuilder implements NodeBuilder, SqmCreationContext,
JpaOrder order,
JpaPredicate filter,
Expression<?>... args) {
// todo marco : we could also pass a Window (?)
// set aggregate function support OVER clauses
// eg. https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions110.htm
return functionWithinGroup( name, type, order, filter, null, args );
}
@Override
public <T> SqmExpression<T> functionWithinGroup(
String name,
Class<T> type,
JpaOrder order,
JpaWindow window,
Expression<?>... args) {
return functionWithinGroup( name, type, order, null, window, args );
}
@Override
public <T> SqmExpression<T> functionWithinGroup(
String name,
Class<T> type,
JpaOrder order,
JpaPredicate filter,
JpaWindow window,
Expression<?>... args) {
SqmOrderByClause withinGroupClause = new SqmOrderByClause();
if ( order != null ) {
withinGroupClause.addSortSpecification( (SqmSortSpecification) order );
}
SqmPredicate sqmFilter = filter != null ? (SqmPredicate) filter : null;
return getFunctionDescriptor( name ).generateOrderedSetAggregateSqmExpression(
SqmExpression<T> function = getFunctionDescriptor( name ).generateOrderedSetAggregateSqmExpression(
expressionList( args ),
sqmFilter,
withinGroupClause,
@ -2658,20 +2686,31 @@ public class SqmCriteriaNodeBuilder implements NodeBuilder, SqmCreationContext,
queryEngine,
getJpaMetamodel().getTypeConfiguration()
);
if ( window == null ) {
return function;
}
else {
return new SqmOver<>( function, (SqmWindow) window );
}
}
@Override
public <T> SqmExpression<T> functionWithinGroup(
String name,
Class<T> type,
public SqmExpression<String> listagg(JpaOrder order, Expression<String> argument, String separator) {
return listagg( order, null, null, argument, separator );
}
@Override
public SqmExpression<String> listagg(JpaOrder order, Expression<String> argument, Expression<String> separator) {
return listagg( order, null, null, argument, separator );
}
@Override
public SqmExpression<String> listagg(
JpaOrder order,
Expression<?>... args) {
return functionWithinGroup( name, type, order, null, args );
}
@Override
public JpaExpression<String> listagg(JpaOrder order, Expression<String> argument, Expression<String> separator) {
return listagg( order, null, argument, separator );
JpaPredicate filter,
Expression<String> argument,
String separator) {
return listagg( order, filter, null, argument, separator );
}
@Override
@ -2680,62 +2719,223 @@ public class SqmCriteriaNodeBuilder implements NodeBuilder, SqmCreationContext,
JpaPredicate filter,
Expression<String> argument,
Expression<String> separator) {
return functionWithinGroup( "listagg", String.class, order, filter, argument, separator );
return listagg( order, filter, null, argument, separator );
}
@Override
public JpaExpression<?> mode(JpaOrder order, Expression<?> argument) {
return mode( order, null, argument );
public SqmExpression<String> listagg(
JpaOrder order,
JpaWindow window,
Expression<String> argument,
String separator) {
return listagg( order, null, window, argument, separator );
}
@Override
public SqmExpression<?> mode(JpaOrder order, JpaPredicate filter, Expression<?> argument) {
return functionWithinGroup( "mode", argument.getJavaType(), order, filter, argument );
public SqmExpression<String> listagg(
JpaOrder order,
JpaWindow window,
Expression<String> argument,
Expression<String> separator) {
return listagg( order, null, window, argument, separator );
}
@Override
public JpaExpression<Integer> percentileCont(JpaOrder order, Expression<? extends Number> argument) {
return percentileCont( order, null, argument );
}
@Override
public SqmExpression<Integer> percentileCont(
public SqmExpression<String> listagg(
JpaOrder order,
JpaPredicate filter,
Expression<? extends Number> argument) {
return functionWithinGroup( "percentile_cont", Integer.class, order, filter, argument );
JpaWindow window,
Expression<String> argument,
String separator) {
return listagg( order, filter, window, argument, value( separator, (SqmExpression<String>) argument ) );
}
@Override
public JpaExpression<Integer> percentileDisc(JpaOrder order, Expression<? extends Number> argument) {
return percentileDisc( order, null, argument );
}
@Override
public SqmExpression<Integer> percentileDisc(
public SqmExpression<String> listagg(
JpaOrder order,
JpaPredicate filter,
Expression<? extends Number> argument) {
return functionWithinGroup( "percentile_disc", Integer.class, order, filter, argument );
JpaWindow window,
Expression<String> argument,
Expression<String> separator) {
return functionWithinGroup( "listagg", String.class, order, filter, window, argument, separator );
}
@Override
public JpaExpression<Long> rank(JpaOrder order, Expression<Integer> argument) {
return rank( order, null, argument );
public <T> SqmExpression<T> mode(Expression<T> sortExpression, SortOrder sortOrder, NullPrecedence nullPrecedence) {
return mode( null, null, sortExpression, sortOrder, nullPrecedence );
}
@Override
public SqmExpression<Long> rank(JpaOrder order, JpaPredicate filter, Expression<Integer> argument) {
return functionWithinGroup( "rank", Long.class, order, filter, argument );
public <T> SqmExpression<T> mode(
JpaPredicate filter,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return mode( filter, null, sortExpression, sortOrder, nullPrecedence );
}
@Override
public JpaExpression<Double> percentRank(JpaOrder order, Expression<Integer> argument) {
return percentRank( order, null, argument );
public <T> SqmExpression<T> mode(
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return mode( null, window, sortExpression, sortOrder, nullPrecedence );
}
@Override
public SqmExpression<Double> percentRank(JpaOrder order, JpaPredicate filter, Expression<Integer> argument) {
return functionWithinGroup( "percent_rank", Double.class, order, filter, argument );
@SuppressWarnings("unchecked")
public <T> SqmExpression<T> mode(
JpaPredicate filter,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return (SqmExpression<T>) functionWithinGroup(
"mode",
sortExpression.getJavaType(),
sort( (SqmExpression<T>) sortExpression, sortOrder, nullPrecedence ),
filter,
window
);
}
@Override
public <T> SqmExpression<T> percentileCont(
Expression<? extends Number> argument,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return percentileCont( argument, null, null, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> SqmExpression<T> percentileCont(
Expression<? extends Number> argument,
JpaPredicate filter,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return percentileCont( argument, filter, null, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> SqmExpression<T> percentileCont(
Expression<? extends Number> argument,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return percentileCont( argument, null, window, sortExpression, sortOrder, nullPrecedence );
}
@Override
@SuppressWarnings("unchecked")
public <T> SqmExpression<T> percentileCont(
Expression<? extends Number> argument,
JpaPredicate filter,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return (SqmExpression<T>) functionWithinGroup(
"percentile_cont",
sortExpression.getJavaType(),
sort( (SqmExpression<T>) sortExpression, sortOrder, nullPrecedence ),
filter,
window,
argument
);
}
@Override
public <T> SqmExpression<T> percentileDisc(
Expression<? extends Number> argument,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return percentileDisc( argument, null, null, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> SqmExpression<T> percentileDisc(
Expression<? extends Number> argument,
JpaPredicate filter,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return percentileDisc( argument, filter, null, sortExpression, sortOrder, nullPrecedence );
}
@Override
public <T> SqmExpression<T> percentileDisc(
Expression<? extends Number> argument,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return percentileDisc( argument, null, window, sortExpression, sortOrder, nullPrecedence );
}
@Override
@SuppressWarnings("unchecked")
public <T> SqmExpression<T> percentileDisc(
Expression<? extends Number> argument,
JpaPredicate filter,
JpaWindow window,
Expression<T> sortExpression,
SortOrder sortOrder,
NullPrecedence nullPrecedence) {
return (SqmExpression<T>) functionWithinGroup(
"percentile_disc",
sortExpression.getJavaType(),
sort( (SqmExpression<T>) sortExpression, sortOrder, nullPrecedence ),
filter,
argument
);
}
@Override
public SqmExpression<Long> rank(JpaOrder order, Expression<?>... arguments) {
return functionWithinGroup( "rank", Long.class, order, null, null, arguments );
}
@Override
public SqmExpression<Long> rank(JpaOrder order, JpaPredicate filter, Expression<?>... arguments) {
return functionWithinGroup( "rank", Long.class, order, filter, null, arguments );
}
@Override
public SqmExpression<Long> rank(JpaOrder order, JpaWindow window, Expression<?>... arguments) {
return functionWithinGroup( "rank", Long.class, order, null, window, arguments );
}
@Override
public SqmExpression<Long> rank(JpaOrder order, JpaPredicate filter, JpaWindow window, Expression<?>... arguments) {
return functionWithinGroup( "rank", Long.class, order, filter, window, arguments );
}
@Override
public SqmExpression<Double> percentRank(JpaOrder order, Expression<?>... arguments) {
return percentRank( order, null, null, arguments );
}
@Override
public SqmExpression<Double> percentRank(JpaOrder order, JpaPredicate filter, Expression<?>... arguments) {
return percentRank( order, filter, null, arguments );
}
@Override
public SqmExpression<Double> percentRank(JpaOrder order, JpaWindow window, Expression<?>... arguments) {
return percentRank( order, null, window, arguments );
}
@Override
public SqmExpression<Double> percentRank(
JpaOrder order,
JpaPredicate filter,
JpaWindow window,
Expression<?>... arguments) {
return functionWithinGroup( "percent_rank", Double.class, order, filter, window, arguments );
}
}

19
hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java
View File

@ -12,6 +12,9 @@ import java.util.List;
import org.hibernate.query.criteria.HibernateCriteriaBuilder;
import org.hibernate.query.criteria.JpaExpression;
import org.hibernate.query.criteria.JpaWindow;
import org.hibernate.query.sqm.NullPrecedence;
import org.hibernate.query.sqm.SortOrder;
import org.hibernate.testing.orm.domain.StandardDomainModel;
import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
@ -107,7 +110,7 @@ public class CriteriaOrderedSetAggregateTest {
CriteriaQuery<String> cr = cb.createQuery( String.class );
Root<EntityOfBasics> root = cr.from( EntityOfBasics.class );
JpaExpression<String> function = cb.listagg( null, root.get( "theString" ), cb.literal( "," ) );
JpaExpression<String> function = cb.listagg( null, root.get( "theString" ), "," );
cr.select( function );
List<String> elements = Arrays.asList( session.createQuery( cr ).getSingleResult().split( "," ) );
@ -126,11 +129,7 @@ public class CriteriaOrderedSetAggregateTest {
CriteriaQuery<String> cr = cb.createQuery( String.class );
Root<EntityOfBasics> root = cr.from( EntityOfBasics.class );
JpaExpression<String> function = cb.listagg(
cb.desc( root.get( "id" ) ),
root.get( "theString" ),
cb.literal( "," )
);
JpaExpression<String> function = cb.listagg( cb.desc( root.get( "id" ) ), root.get( "theString" ), "," );
cr.select( function );
String result = session.createQuery( cr ).getSingleResult();
@ -150,7 +149,7 @@ public class CriteriaOrderedSetAggregateTest {
cb.desc( root.get( "id" ) ),
cb.lt( root.get( "theInt" ), cb.literal( 10 ) ),
root.get( "theString" ),
cb.literal( "," )
","
);
cr.select( function );
@ -188,8 +187,10 @@ public class CriteriaOrderedSetAggregateTest {
Root<EntityOfBasics> root = cr.from( EntityOfBasics.class );
JpaExpression<Integer> function = cb.percentileDisc(
cb.asc( root.get( "theInt" ) ),
cb.literal( 0.5 )
cb.literal( 0.5 ),
root.get( "theInt" ),
SortOrder.ASCENDING,
NullPrecedence.FIRST
);
cr.select( function );

5
hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java
View File

@ -167,7 +167,7 @@ public class CriteriaWindowFunctionTest {
JpaWindow window = cb.createWindow().orderBy( cb.desc( root.get( "theInt" ) ) );
JpaExpression<Integer> nthValue = cb.nthValue(
root.get( "theInt" ),
cb.literal( 2 ),
2,
window
);
@ -243,8 +243,7 @@ public class CriteriaWindowFunctionTest {
public void testSumWithFilterAsWindowFunction(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
// todo marco : add filter clause predicate to CriteriaBuilder ?
// problem with getting the window functions as aggregate, @see SqmCriteriaNodeBuilder#windowFunction
// todo marco : add 'simple` aggregate functions (sum, avg, count)
TypedQuery<Long> q = session.createQuery(
"select sum(eob.theInt) filter (where eob.theInt > 5) over (order by eob.theInt) from EntityOfBasics eob order by eob.theInt",
Long.class