From 60744d89d96cbd1d902f67b6911e70e310a0d7f7 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 19 Dec 2014 17:34:28 +0100 Subject: [PATCH] Fixed jOOQ OSS edition compilation errors --- .../src/main/java/org/jooq/impl/Function.java | 66 +++++++++---------- .../main/java/org/jooq/impl/GroupConcat.java | 47 +++++++++++-- 2 files changed, 73 insertions(+), 40 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/Function.java b/jOOQ/src/main/java/org/jooq/impl/Function.java index 5e86a20ed1..548c49eea2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Function.java +++ b/jOOQ/src/main/java/org/jooq/impl/Function.java @@ -549,39 +549,6 @@ class Function extends AbstractField implements xxxxxx xxxxx x - xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxx xxxxxxxxxxx x - xxxxxxxxxxxxxxxxxxxxx x x xxx xxxxxxxxxxxxxxxxxxxxxxxx - xxxxxxxxxxxxxxxxxxxxxxxxxxxx - xxxxxx x xx - xxxxxx xxxxx - x - - xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxx xxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx - x - - xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx - x - - xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxx xxxx xxxxxxxxxxxx xxxxxx x - xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx - x - xxxxxxxxx xxxxxx xxxxx xxxxxxxxxxxxxxxxx xxxxxxxxxxxxx x xxxxxxxxxxx x xxxxx @@ -597,6 +564,39 @@ class Function extends AbstractField implements x xx [/pro] */ + @Override + public final WindowBeforeOverStep filterWhere(Condition... conditions) { + return filterWhere(Arrays.asList(conditions)); + } + + @Override + public final WindowBeforeOverStep filterWhere(Collection conditions) { + ConditionProviderImpl c = new ConditionProviderImpl(); + c.addConditions(conditions); + filter = c; + return this; + } + + @Override + public final WindowBeforeOverStep filterWhere(Field field) { + return filterWhere(condition(field)); + } + + @Override + public final WindowBeforeOverStep filterWhere(String sql) { + return filterWhere(condition(sql)); + } + + @Override + public final WindowBeforeOverStep filterWhere(String sql, Object... bindings) { + return filterWhere(condition(sql, bindings)); + } + + @Override + public final WindowBeforeOverStep filterWhere(String sql, QueryPart... parts) { + return filterWhere(condition(sql, parts)); + } + @Override public final WindowPartitionByStep over() { windowSpecification = new WindowSpecificationImpl(); diff --git a/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java b/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java index cc184a0643..1cf8e916cb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java +++ b/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java @@ -45,14 +45,16 @@ import static org.jooq.impl.DSL.inline; import java.util.Arrays; import java.util.Collection; +import org.jooq.AggregateFilterStep; import org.jooq.AggregateFunction; +import org.jooq.Condition; import org.jooq.Configuration; import org.jooq.Field; import org.jooq.GroupConcatOrderByStep; import org.jooq.GroupConcatSeparatorStep; import org.jooq.Name; +import org.jooq.QueryPart; import org.jooq.SortField; -import org.jooq.WindowBeforeOverStep; import org.jooq.WindowDefinition; import org.jooq.WindowFinalStep; import org.jooq.WindowPartitionByStep; @@ -102,36 +104,67 @@ class GroupConcat extends AbstractFunction implements GroupConcatOrderBy /* [pro] xx xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx x + xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx x xxxxx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx xxxxxxxxx xx xxxxxxxxxxxx xxxxxxxxx xxxxxxxxxxx x xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx x + xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx x xxxxx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx xxxxxxxxx xx xxxxxxxxxxxx xxxxxxxxx xxxxxxxxxxx x xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxx xxxxxxx x + xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxx xxxxxxx x xxxxx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx xxxxxxxxx xx xxxxxxxxxxxx xxxxxxxxx xxxxxxxxxxx x xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx x + xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx x xxxxx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx xxxxxxxxx xx xxxxxxxxxxxx xxxxxxxxx xxxxxxxxxxx x xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx x + xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx x xxxxx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx xxxxxxxxx xx xxxxxxxxxxxx xxxxxxxxx xxxxxxxxxxx x xxxxxxxxx - xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxx xxxxxxx x + xxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxxxxxxxx xxxxxxx x xxxxx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx xxxxxxxxx xx xxxxxxxxxxxx xxxxxxxxx xxxxxxxxxxx x xx [/pro] */ + + @Override + public final AggregateFilterStep filterWhere(Condition... conditions) { + throw new UnsupportedOperationException("FILTER() not supported on GROUP_CONCAT aggregate function"); + } + + @Override + public final AggregateFilterStep filterWhere(Collection conditions) { + throw new UnsupportedOperationException("FILTER() not supported on GROUP_CONCAT aggregate function"); + } + + @Override + public final AggregateFilterStep filterWhere(Field field) { + throw new UnsupportedOperationException("FILTER() not supported on GROUP_CONCAT aggregate function"); + } + + @Override + public final AggregateFilterStep filterWhere(String sql) { + throw new UnsupportedOperationException("FILTER() not supported on GROUP_CONCAT aggregate function"); + } + + @Override + public final AggregateFilterStep filterWhere(String sql, Object... bindings) { + throw new UnsupportedOperationException("FILTER() not supported on GROUP_CONCAT aggregate function"); + } + + @Override + public final AggregateFilterStep filterWhere(String sql, QueryPart... parts) { + throw new UnsupportedOperationException("FILTER() not supported on GROUP_CONCAT aggregate function"); + } + @Override public final WindowPartitionByStep over() { throw new UnsupportedOperationException("OVER() not supported on GROUP_CONCAT aggregate function");