Skip to content

Commit 4817878

Browse files
committed
edit
1 parent d377117 commit 4817878

File tree

7 files changed

+20
-14
lines changed

7 files changed

+20
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ default String id() {
2626

2727
@Override
2828
default String sql(QueryParameterBuilder builder, Object[] args) {
29-
throw new UnsupportedOperationException("sql");
29+
throw new UnsupportedOperationException("CombinedOperator::sql");
3030
}
3131
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public final class ComparisonExpressionGroup implements ComparisonExpression {
2424

2525
@Override
2626
public String sql(QueryParameterBuilder builder, Object operand) {
27-
return "(" + Stream.of(expressions)
27+
return Stream.of(expressions)
2828
.map(o-> o.sql(builder, operand))
29-
.collect(joining(operator.sql())) + ")";
29+
.collect(joining(operator.sql(), "(", ")"));
3030
}
3131

3232
@Override

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
import lombok.NoArgsConstructor;
1111
import lombok.extern.slf4j.Slf4j;
1212

13+
/**
14+
*
15+
* @author u$f
16+
*
17+
*/
1318
@Slf4j
1419
@NoArgsConstructor(access = AccessLevel.PRIVATE)
1520
public final class Mappers {

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package org.usf.jquery.core;
22

3+
/**
4+
*
5+
* @author u$f
6+
*
7+
*/
38
public enum Order {
49

510
ASC, DESC;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
* @author u$f
2727
*
2828
*/
29+
@Getter
2930
@AllArgsConstructor(access = AccessLevel.PRIVATE)
3031
public final class QueryParameterBuilder {
3132

3233
private static final String P_ARG = "?";
3334

34-
@Getter
3535
private final String schema;
3636
private final String vPrefix;
3737
private final List<Object> args; //dynamic flag

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void select(SqlStringBuilder sb, QueryParameterBuilder pb){
158158
}
159159

160160
void from(SqlStringBuilder sb, QueryParameterBuilder pb) {
161-
var excludes = joins.stream().map(ViewJoin::getView).toList();
161+
var excludes = joins.stream().map(ViewJoin::getView).map(v-> pb.getOverView().getOrDefault(v, v)).toList();
162162
var views = pb.views().stream().filter(not(excludes::contains)).toList(); //do not remove views
163163
if(!views.isEmpty()) {
164164
sb.append(" FROM ").appendEach(views, SCOMA, v-> v.sqlWithTag(pb));

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
@Getter
2222
@RequiredArgsConstructor
23-
public class ViewJoin implements DBObject {
23+
public final class ViewJoin implements DBObject {
2424

2525
private final JoinType joinType;
2626
private final DBView view;
@@ -39,22 +39,18 @@ public String sql(QueryParameterBuilder builder) {
3939
}
4040

4141
public static ViewJoin innerJoin(DBView view, DBFilter... filters) {
42-
return join(INNER, view, filters);
42+
return new ViewJoin(INNER, view, filters);
4343
}
4444

4545
public static ViewJoin leftJoin(DBView view, DBFilter... filters) {
46-
return join(LEFT, view, filters);
46+
return new ViewJoin(LEFT, view, filters);
4747
}
4848

4949
public static ViewJoin rightJoin(DBView view, DBFilter... filters) {
50-
return join(RIGHT, view, filters);
50+
return new ViewJoin(RIGHT, view, filters);
5151
}
5252

5353
public static ViewJoin fullJoin(DBView view, DBFilter... filters) {
54-
return join(FULL, view, filters);
55-
}
56-
57-
public static ViewJoin join(JoinType jt, DBView view, DBFilter... filters) {
58-
return new ViewJoin(jt, view, filters);
54+
return new ViewJoin(FULL, view, filters);
5955
}
6056
}

0 commit comments

Comments
 (0)