Skip to content

Commit aa84fa4

Browse files
committed
edit
1 parent fca5874 commit aa84fa4

File tree

6 files changed

+17
-48
lines changed

6 files changed

+17
-48
lines changed

src/main/java/org/usf/jquery/core/ColumnSingleFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @author u$f
1515
*
1616
*/
17-
@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
17+
@RequiredArgsConstructor
1818
public class ColumnSingleFilter implements DBFilter {
1919

2020
private final Object left;

src/main/java/org/usf/jquery/core/ComparisonExpressionGroup.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import static org.usf.jquery.core.Nested.viewsOfNested;
66
import static org.usf.jquery.core.QueryVariables.addWithValue;
77
import static org.usf.jquery.core.Utils.appendLast;
8-
import static org.usf.jquery.core.Validation.requireNArgs;
8+
import static org.usf.jquery.core.Validation.requireAtLeastNArgs;
99

1010
import java.util.Collection;
1111
import java.util.stream.Stream;
@@ -23,7 +23,7 @@ public final class ComparisonExpressionGroup implements ComparisonExpression {
2323

2424
ComparisonExpressionGroup(LogicalOperator operator, ComparisonExpression... expressions) {
2525
this.operator = operator;
26-
this.expressions = requireNArgs(1, expressions, ComparisonExpressionGroup.class::getSimpleName);
26+
this.expressions = requireAtLeastNArgs(1, expressions, ComparisonExpressionGroup.class::getSimpleName);
2727
}
2828

2929
@Override

src/main/java/org/usf/jquery/core/Nested.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
import static org.usf.jquery.core.Utils.isEmpty;
55

66
import java.util.Collection;
7+
import java.util.function.BiConsumer;
8+
import java.util.function.BiFunction;
9+
import java.util.function.Consumer;
710
import java.util.function.Function;
811
import java.util.function.Predicate;
912

src/main/java/org/usf/jquery/core/QueryView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
* @author u$f
1212
*
1313
*/
14+
@Getter
1415
@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
1516
public final class QueryView implements DBView {
1617

17-
@Getter
1818
private final QueryBuilder builder;
1919

2020
@Override

src/main/java/org/usf/jquery/web/RevisionIterator.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.util.Map.Entry;
1212
import java.util.stream.Stream;
1313

14+
import org.usf.jquery.core.ColumnSingleFilter;
1415
import org.usf.jquery.core.DBColumn;
1516
import org.usf.jquery.core.DBFilter;
1617
import org.usf.jquery.core.QueryVariables;
@@ -68,12 +69,15 @@ static DBColumn yearColumn() {
6869
}
6970

7071
static DBFilter monthFilter(DBColumn column) {
71-
return b-> {
72-
var values = currentRev.get().getValue(); //get it on build
73-
var filter = values.size() == 1
74-
? column.eq(values.get(0).getMonthValue())
75-
: column.in(values.stream().map(YearMonth::getMonthValue).toArray(Integer[]::new));
76-
return filter.sql(b);
72+
return new ColumnSingleFilter(null, null) {
73+
@Override
74+
public String sql(QueryVariables vars) {
75+
var values = currentRev.get().getValue(); //get it on build
76+
var filter = values.size() == 1
77+
? column.eq(values.get(0).getMonthValue())
78+
: column.in(values.stream().map(YearMonth::getMonthValue).toArray(Integer[]::new));
79+
return filter.sql(vars);
80+
}
7781
};
7882
}
7983
}

src/test/java/org/usf/jquery/core/FunctionOperatorTest.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)