github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#5929] java.util.impl.Contains should check both sides of the expression for array types

Browse Source
This commit is contained in:
lukaseder 2017-03-16 15:00:25 +01:00
parent 586559f031
commit 0dee565fe3
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jOOQ/src/main/java/org/jooq/impl/Contains.java
View File

@ -87,23 +87,17 @@ final class Contains<T> extends AbstractCondition {
private final Condition condition(Configuration configuration) {
// [#1107] Some dialects support "contains" operations for ARRAYs
if (lhs.getDataType().isArray()) {
// [#5929] Check both sides of the operation for array types
if (lhs.getDataType().isArray()
|| (rhs != null && rhs.getDataType().isArray())
|| (rhs == null && value != null && value.getClass().isArray()))
return new PostgresArrayContains();
}
// "contains" operations on Strings
else {
Field<String> concat;
if (rhs == null) {
concat = DSL.concat(inline("%"), Tools.escapeForLike(value, configuration), inline("%"));
}
else {
concat = DSL.concat(inline("%"), Tools.escapeForLike(rhs, configuration), inline("%"));
}
return lhs.like(concat, Tools.ESCAPE);
}
else
return lhs.like((rhs == null)
? DSL.concat(inline("%"), Tools.escapeForLike(value, configuration), inline("%"))
: DSL.concat(inline("%"), Tools.escapeForLike(rhs, configuration), inline("%")), Tools.ESCAPE);
}
/**