diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONNull.java b/jOOQ/src/main/java/org/jooq/impl/JSONNull.java index 645c0668c8..f1257f18b8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONNull.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONNull.java @@ -53,7 +53,7 @@ import org.jooq.SQLDialect; /** * @author Lukas Eder */ -final class JSONNull extends AbstractQueryPart { +final class JSONNull extends AbstractQueryPart implements SimpleQueryPart { /** * Generated UID diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONReturning.java b/jOOQ/src/main/java/org/jooq/impl/JSONReturning.java index c542c97f29..a083237754 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONReturning.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONReturning.java @@ -54,7 +54,7 @@ import org.jooq.SQLDialect; /** * @author Lukas Eder */ -final class JSONReturning extends AbstractQueryPart { +final class JSONReturning extends AbstractQueryPart implements SimpleQueryPart { /** * Generated UID diff --git a/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java b/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java index af9ae9056b..ef2dae20be 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java +++ b/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java @@ -61,7 +61,7 @@ import org.jooq.Statement; * * @author Lukas Eder */ -class QueryPartCollectionView extends AbstractQueryPart implements Collection { +class QueryPartCollectionView extends AbstractQueryPart implements Collection, SimpleQueryPart { private static final long serialVersionUID = -2936922742534009564L; final Collection wrapped; @@ -97,6 +97,15 @@ class QueryPartCollectionView extends AbstractQueryPart imp return wrapped; } + @Override + public boolean isSimple() { + for (T e : this) + if (!Tools.isSimple(e)) + return false; + + return true; + } + @Override public boolean rendersContent(Context ctx) { return !isEmpty(); diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java index 77c6b137e9..9f09a93b1a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java @@ -120,7 +120,7 @@ extends case SQLITE: - ctx.visit(function(N_RTRIM, getDataType(), string, characters))); + ctx.visit(function(N_RTRIM, getDataType(), string, characters)); break; default: diff --git a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java index bfd3740c28..6ee6ecabab 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java @@ -103,7 +103,6 @@ extends - case SQLITE: ctx.visit(DSL.power(value, inline(0.5))); break;