Skip to content

HHH-18991 enable more use of parameters in Restrictions #10036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2025
Merged

HHH-18991 enable more use of parameters in Restrictions #10036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/query/range/Interval.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ record Interval<U extends Comparable<U>>(LowerBound<U> lowerBound, UpperBound<U>
public Predicate toPredicate(Path<? extends U> path, CriteriaBuilder builder) {
return lowerBound.open() || upperBound.open()
? builder.and( lowerBound.toPredicate( path, builder ), upperBound.toPredicate( path, builder ) )
: builder.between( path, builder.literal( lowerBound.bound() ), builder.literal( upperBound.bound() ) );
: builder.between( path, lowerBound.bound(), upperBound.bound() );
}

@Override
Expand Down
20 changes: 12 additions & 8 deletions hibernate-core/src/main/java/org/hibernate/query/range/Pattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
* @author Gavin King
*/
record Pattern(String pattern, boolean caseSensitive) implements Range<String> {

// default escape and wildcard characters
private static final char ESCAPE = '\\';
private static final char WILDCARD_CHAR = '_';
private static final char WILDCARD_STRING = '%';

Pattern(String pattern, boolean caseSensitive, char charWildcard, char stringWildcard) {
this( translate( pattern, charWildcard, stringWildcard ), caseSensitive );
}
Expand All @@ -25,10 +31,8 @@ public Predicate toPredicate(Path<? extends String> path, CriteriaBuilder builde
@SuppressWarnings("unchecked")
final Path<String> stringPath = (Path<String>) path; // safe, because String is final
return caseSensitive
? builder.like( stringPath, builder.literal( pattern ), '\\' )
: builder.like( builder.lower( stringPath ),
builder.literal( pattern.toLowerCase( Locale.ROOT ) ),
'\\' );
? builder.like( stringPath, pattern, ESCAPE )
: builder.like( builder.lower( stringPath ), pattern.toLowerCase( Locale.ROOT ), ESCAPE );
}

@Override
Expand All @@ -41,14 +45,14 @@ private static String translate(String pattern, char charWildcard, char stringWi
for ( int i = 0; i < pattern.length(); i++ ) {
final char ch = pattern.charAt( i );
if ( ch == charWildcard ) {
result.append( '_' );
result.append( WILDCARD_CHAR );
}
else if ( ch == stringWildcard ) {
result.append( '%' );
result.append( WILDCARD_STRING );
}
else {
if ( ch == '%' || ch == '_' || ch == '\\' ) {
result.append( '\\' );
if ( ch == WILDCARD_STRING || ch == WILDCARD_CHAR || ch == ESCAPE ) {
result.append( ESCAPE );
}
result.append( ch );
}
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/query/range/ValueList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ record ValueList<U>(List<U> values) implements Range<U> {

@Override
public Predicate toPredicate(Path<? extends U> path, CriteriaBuilder builder) {
return path.in( values.stream().map( builder::literal ).toList() );
return path.in( values );
}

@Override
Expand Down