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

View File

@ -954,6 +954,11 @@ <Y extends Comparable<? super Y>> JpaPredicate between(
*/ */
<T> JpaExpression<T> lastValue(Expression<T> argument, JpaWindow window); <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. * Create a {@code nth_value} window function expression.
* *
@ -1012,6 +1017,31 @@ <Y extends Comparable<? super Y>> JpaPredicate between(
*/ */
JpaExpression<Double> cumeDist(JpaWindow window); 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. * Create a generic ordered set-aggregate function expression.
* *
@ -1019,6 +1049,7 @@ <Y extends Comparable<? super Y>> JpaPredicate between(
* @param type type of this expression * @param type type of this expression
* @param order order by clause used in within group * @param order order by clause used in within group
* @param filter optional filter clause * @param filter optional filter clause
* @param window optional window over which to apply the function
* @param args optional arguments to the function * @param args optional arguments to the function
* @param <T> type of this expression * @param <T> type of this expression
* *
@ -1029,47 +1060,26 @@ <T> JpaExpression<T> functionWithinGroup(
Class<T> type, Class<T> type,
JpaOrder order, JpaOrder order,
JpaPredicate filter, JpaPredicate filter,
JpaWindow window,
Expression<?>... args); Expression<?>... args);
/** /**
* Create a generic ordered set-aggregate function expression. * @see #listagg(JpaOrder, JpaPredicate, JpaWindow, Expression, 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
*/ */
<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. * @see #listagg(JpaOrder, JpaPredicate, JpaWindow, Expression, 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
*/ */
JpaExpression<String> listagg(JpaOrder order, Expression<String> argument, Expression<String> separator); JpaExpression<String> listagg(JpaOrder order, Expression<String> argument, Expression<String> separator);
/** /**
* Create a {@code listagg} ordered set-aggregate function expression. * @see #listagg(JpaOrder, JpaPredicate, JpaWindow, Expression, Expression)
* */
* @param order order by clause used in within group JpaExpression<String> listagg(JpaOrder order, JpaPredicate filter, Expression<String> argument, String separator);
* @param filter optional filter clause
* @param argument values to join /**
* @param separator the separator used to join the values * @see #listagg(JpaOrder, JpaPredicate, JpaWindow, Expression, Expression)
*
* @return ordered set-aggregate expression
*
* @see #functionWithinGroup
*/ */
JpaExpression<String> listagg( JpaExpression<String> listagg(
JpaOrder order, JpaOrder order,
@ -1078,127 +1088,252 @@ JpaExpression<String> listagg(
Expression<String> separator); 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 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 * @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. * Create a {@code mode} ordered set-aggregate function expression.
* *
* @param order order by clause used in within group
* @param filter optional filter clause * @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 * @return ordered set-aggregate expression
* * @param <T> type of this expression
* @see #functionWithinGroup * @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. * 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 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 * @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. * @see #percentileDisc(Expression, JpaPredicate, JpaWindow, Expression, SortOrder, NullPrecedence)
*
* @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
*/ */
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. * 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 * @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 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 * @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. * @see #rank(JpaOrder, JpaPredicate, JpaWindow, 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
*/ */
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. * Create a {@code rank} ordered set-aggregate function expression.
* *
* @param order order by clause used in within group * @param order order by clause used in within group
* @param filter optional filter clause * @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 * @return ordered set-aggregate expression
* *
* @see #functionWithinGroup * @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. * @see #percentRank(JpaOrder, JpaPredicate, JpaWindow, 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
*/ */
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. * Create a {@code percent_rank} ordered set-aggregate function expression.
* *
* @param order order by clause used in within group * @param order order by clause used in within group
* @param filter optional filter clause * @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 * @return ordered set-aggregate expression
* *
* @see #functionWithinGroup * @see #functionWithinGroup
*/ */
JpaExpression<Double> percentRank(JpaOrder order, JpaPredicate filter, Expression<Integer> argument); JpaExpression<Double> percentRank(
JpaOrder order,
JpaPredicate filter,
JpaWindow window,
Expression<?>... arguments);
} }

View File

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

View File

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

View File

@ -12,6 +12,9 @@
import org.hibernate.query.criteria.HibernateCriteriaBuilder; import org.hibernate.query.criteria.HibernateCriteriaBuilder;
import org.hibernate.query.criteria.JpaExpression; 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.StandardDomainModel;
import org.hibernate.testing.orm.domain.gambit.EntityOfBasics; import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
@ -107,7 +110,7 @@ public void testListaggWithoutOrder(SessionFactoryScope scope) {
CriteriaQuery<String> cr = cb.createQuery( String.class ); CriteriaQuery<String> cr = cb.createQuery( String.class );
Root<EntityOfBasics> root = cr.from( EntityOfBasics.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 ); cr.select( function );
List<String> elements = Arrays.asList( session.createQuery( cr ).getSingleResult().split( "," ) ); List<String> elements = Arrays.asList( session.createQuery( cr ).getSingleResult().split( "," ) );
@ -126,11 +129,7 @@ public void testListagg(SessionFactoryScope scope) {
CriteriaQuery<String> cr = cb.createQuery( String.class ); CriteriaQuery<String> cr = cb.createQuery( String.class );
Root<EntityOfBasics> root = cr.from( EntityOfBasics.class ); Root<EntityOfBasics> root = cr.from( EntityOfBasics.class );
JpaExpression<String> function = cb.listagg( JpaExpression<String> function = cb.listagg( cb.desc( root.get( "id" ) ), root.get( "theString" ), "," );
cb.desc( root.get( "id" ) ),
root.get( "theString" ),
cb.literal( "," )
);
cr.select( function ); cr.select( function );
String result = session.createQuery( cr ).getSingleResult(); String result = session.createQuery( cr ).getSingleResult();
@ -150,7 +149,7 @@ public void testListaggWithFilter(SessionFactoryScope scope) {
cb.desc( root.get( "id" ) ), cb.desc( root.get( "id" ) ),
cb.lt( root.get( "theInt" ), cb.literal( 10 ) ), cb.lt( root.get( "theInt" ), cb.literal( 10 ) ),
root.get( "theString" ), root.get( "theString" ),
cb.literal( "," ) ","
); );
cr.select( function ); cr.select( function );
@ -188,8 +187,10 @@ public void testInverseDistribution(SessionFactoryScope scope) {
Root<EntityOfBasics> root = cr.from( EntityOfBasics.class ); Root<EntityOfBasics> root = cr.from( EntityOfBasics.class );
JpaExpression<Integer> function = cb.percentileDisc( 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 ); cr.select( function );

View File

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