Skip to content

Commit 3da4433

Browse files
usfalamiusfalami
committed
edit
1 parent 3b8f71a commit 3da4433

40 files changed

+169
-152
lines changed

‎src/main/java/org/usf/jquery/core/ArithmeticOperator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
interface ArithmeticOperator extends Operator {
1212

1313
@Override
14-
default String sql(QueryVariables builder, Object[] args) {
14+
default String sql(QueryContext ctx, Object[] args) {
1515
requireNArgs(2, args, ArithmeticException.class::getSimpleName);
16-
return "(" + builder.appendLiteral(args[0]) + id() + builder.appendLiteral(args[1]) + ")";
16+
return "(" + ctx.appendLiteral(args[0]) + id() + ctx.appendLiteral(args[1]) + ")";
1717
}
1818
}

‎src/main/java/org/usf/jquery/core/BasicComparator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
public interface BasicComparator extends Comparator {
1212

1313
@Override
14-
default String sql(QueryVariables builder, Object[] args) {
14+
default String sql(QueryContext ctx, Object[] args) {
1515
requireNArgs(2, args, BasicComparator.class::getSimpleName);
16-
return builder.appendParameter(args[0]) + id() + builder.appendParameter(args[1]);
16+
return ctx.appendParameter(args[0]) + id() + ctx.appendParameter(args[1]);
1717
}
1818
}

‎src/main/java/org/usf/jquery/core/CaseColumn.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static java.util.stream.Collectors.joining;
44
import static org.usf.jquery.core.Nested.resolveAll;
5-
import static org.usf.jquery.core.QueryVariables.addWithValue;
5+
import static org.usf.jquery.core.QueryContext.addWithValue;
66
import static org.usf.jquery.core.SqlStringBuilder.SPACE;
77
import static org.usf.jquery.core.Validation.requireAtLeastNArgs;
88

@@ -24,8 +24,8 @@ public final class CaseColumn implements DBColumn {
2424
}
2525

2626
@Override
27-
public String sql(QueryVariables vars) {
28-
var sub = vars.withValue(); //force literal parameter
27+
public String sql(QueryContext ctx) {
28+
var sub = ctx.withValue(); //force literal parameter
2929
return Stream.of(whenCases)
3030
.map(o-> o.sql(sub))
3131
.collect(joining(SPACE, "CASE ", " END"));

‎src/main/java/org/usf/jquery/core/CastFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ default String id() {
1818
}
1919

2020
@Override
21-
default String sql(QueryVariables builder, Object[] args) {
21+
default String sql(QueryContext builder, Object[] args) {
2222
requireAtLeastNArgs(1, args, CastFunction.class::getSimpleName);
2323
var sb = new SqlStringBuilder(id())
2424
.append("(")

‎src/main/java/org/usf/jquery/core/ColumnFilterGroup.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static java.util.stream.Collectors.joining;
44
import static org.usf.jquery.core.Nested.resolveAll;
55
import static org.usf.jquery.core.Nested.viewsOfNested;
6-
import static org.usf.jquery.core.QueryVariables.addWithValue;
6+
import static org.usf.jquery.core.QueryContext.addWithValue;
77
import static org.usf.jquery.core.Utils.appendLast;
88
import static org.usf.jquery.core.Validation.requireAtLeastNArgs;
99

@@ -27,15 +27,15 @@ public final class ColumnFilterGroup implements DBFilter {
2727
}
2828

2929
@Override
30-
public String sql(QueryVariables builder) {
30+
public String sql(QueryContext ctx) {
3131
return Stream.of(filters)
32-
.map(o-> o.sql(builder))
32+
.map(o-> o.sql(ctx))
3333
.collect(joining(operator.sql(), "(", ")"));
3434
}
3535

3636
@Override
37-
public boolean resolve(QueryBuilder builder) {
38-
return resolveAll(filters, builder);
37+
public boolean resolve(QueryBuilder ctx) {
38+
return resolveAll(filters, ctx);
3939
}
4040

4141
@Override

‎src/main/java/org/usf/jquery/core/ColumnProxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.usf.jquery.core;
22

33
import static java.util.Objects.nonNull;
4-
import static org.usf.jquery.core.QueryVariables.addWithValue;
4+
import static org.usf.jquery.core.QueryContext.addWithValue;
55

66
import java.util.Objects;
77

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static org.usf.jquery.core.Nested.tryResolve;
44
import static org.usf.jquery.core.Nested.viewsOf;
5-
import static org.usf.jquery.core.QueryVariables.addWithValue;
5+
import static org.usf.jquery.core.QueryContext.addWithValue;
66

77
import java.util.Collection;
88

@@ -20,14 +20,14 @@ public class ColumnSingleFilter implements DBFilter {
2020
private final ComparisonExpression expression;
2121

2222
@Override
23-
public String sql(QueryVariables ph) {
24-
return expression.sql(ph, left);
23+
public String sql(QueryContext ctx) {
24+
return expression.sql(ctx, left);
2525
}
2626

2727
@Override
28-
public boolean resolve(QueryBuilder builder) {
29-
var res1 = tryResolve(left, builder);
30-
var res2 = expression.resolve(builder);
28+
public boolean resolve(QueryBuilder ctx) {
29+
var res1 = tryResolve(left, ctx);
30+
var res2 = expression.resolve(ctx);
3131
return res1 || res2;
3232
}
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ default String id() {
2525
}
2626

2727
@Override
28-
default String sql(QueryVariables builder, Object[] args) {
28+
default String sql(QueryContext ctx, Object[] args) { //no SQL
2929
throw new UnsupportedOperationException("CombinedOperator::sql");
3030
}
3131
}

‎src/main/java/org/usf/jquery/core/ComparisonExpression.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
*/
1212
public interface ComparisonExpression extends DBObject, Nested, Chainable<ComparisonExpression> {
1313

14-
String sql(QueryVariables builder, Object left); // do change method order
14+
String sql(QueryContext ctx, Object left); // do change method order
1515

1616
@Override
17-
default String sql(QueryVariables builder, Object[] args) {
17+
default String sql(QueryContext ctx, Object[] args) {
1818
requireNArgs(1, args, ComparisonExpression.class::getSimpleName);
19-
return sql(builder, args[0]);
19+
return sql(ctx, args[0]);
2020
}
2121

2222
static ComparisonExpression eq(Object right) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static java.util.stream.Collectors.joining;
44
import static org.usf.jquery.core.Nested.resolveAll;
55
import static org.usf.jquery.core.Nested.viewsOfNested;
6-
import static org.usf.jquery.core.QueryVariables.addWithValue;
6+
import static org.usf.jquery.core.QueryContext.addWithValue;
77
import static org.usf.jquery.core.Utils.appendLast;
88
import static org.usf.jquery.core.Validation.requireAtLeastNArgs;
99

@@ -27,9 +27,9 @@ public final class ComparisonExpressionGroup implements ComparisonExpression {
2727
}
2828

2929
@Override
30-
public String sql(QueryVariables builder, Object operand) {
30+
public String sql(QueryContext ctx, Object operand) {
3131
return Stream.of(expressions)
32-
.map(o-> o.sql(builder, operand))
32+
.map(o-> o.sql(ctx, operand))
3333
.collect(joining(operator.sql(), "(", ")"));
3434
}
3535

‎src/main/java/org/usf/jquery/core/ComparisonSingleExpression.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static java.util.Objects.nonNull;
55
import static org.usf.jquery.core.Nested.tryResolveAll;
66
import static org.usf.jquery.core.Nested.viewsOfAll;
7-
import static org.usf.jquery.core.QueryVariables.addWithValue;
7+
import static org.usf.jquery.core.QueryContext.addWithValue;
88

99
import java.util.ArrayList;
1010
import java.util.Collection;
@@ -24,13 +24,13 @@ public final class ComparisonSingleExpression implements ComparisonExpression {
2424
private final Object[] right; //optional
2525

2626
@Override
27-
public String sql(QueryVariables builder, Object left) {
27+
public String sql(QueryContext ctx, Object left) {
2828
var param = new ArrayList<>();
2929
param.add(left);
3030
if(nonNull(right)) {
3131
addAll(param, right);
3232
}
33-
return comparator.sql(builder, param.toArray());
33+
return comparator.sql(ctx, param.toArray());
3434
}
3535

3636
@Override

‎src/main/java/org/usf/jquery/core/ConstantOperator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public interface ConstantOperator extends Operator {
1212

1313
@Override
14-
default String sql(QueryVariables builder, Object[] args) {
14+
default String sql(QueryContext ctx, Object[] args) {
1515
requireNoArgs(args, ConstantOperator.class::getSimpleName);
1616
return id(); //use parentheses !?
1717
}

‎src/main/java/org/usf/jquery/core/DBColumn.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static java.util.Objects.nonNull;
44
import static org.usf.jquery.core.OrderType.ASC;
55
import static org.usf.jquery.core.OrderType.DESC;
6-
import static org.usf.jquery.core.QueryVariables.formatValue;
6+
import static org.usf.jquery.core.QueryContext.formatValue;
77
import static org.usf.jquery.core.Utils.appendFirst;
88
import static org.usf.jquery.core.Validation.requireLegalVariable;
99
import static org.usf.jquery.core.Validation.requireNoArgs;
@@ -22,12 +22,12 @@
2222
*/
2323
public interface DBColumn extends DBObject, Typed, Nested {
2424

25-
String sql(QueryVariables builder);
25+
String sql(QueryContext ctx);
2626

2727
@Override
28-
default String sql(QueryVariables builder, Object[] args) {
28+
default String sql(QueryContext ctx, Object[] args) {
2929
requireNoArgs(args, DBColumn.class::getSimpleName);
30-
return sql(builder);
30+
return sql(ctx);
3131
}
3232

3333
default ColumnProxy as(String name) {
@@ -384,7 +384,7 @@ default DBOrder order(OrderType order) {
384384
return new DBOrder(this, order);
385385
}
386386

387-
default SingleCaseColumnBuilder whenCase() {
387+
default SingleCaseColumnBuilder beginCase() {
388388
return new SingleCaseColumnBuilder(this);
389389
}
390390

@@ -436,7 +436,7 @@ static DBColumn constant(JDBCType type, Supplier<Object> value) {
436436
return new DBColumn() {
437437

438438
@Override
439-
public String sql(QueryVariables arg) {
439+
public String sql(QueryContext ctx) {
440440
return formatValue(value.get()); //lazy
441441
}
442442

‎src/main/java/org/usf/jquery/core/DBFilter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
*/
1010
public interface DBFilter extends DBObject, Nested, Chainable<DBFilter> {
1111

12-
String sql(QueryVariables builder);
12+
String sql(QueryContext ctx);
1313

1414
@Override
15-
default String sql(QueryVariables builder, Object[] args) {
15+
default String sql(QueryContext ctx, Object[] args) {
1616
requireNoArgs(args, DBFilter.class::getSimpleName);
17-
return sql(builder);
17+
return sql(ctx);
1818
}
1919
}

‎src/main/java/org/usf/jquery/core/DBObject.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@
88
@FunctionalInterface
99
public interface DBObject {
1010

11-
String sql(QueryVariables builder, Object[] args);
12-
11+
String sql(QueryContext ctx, Object[] args);
1312
}

‎src/main/java/org/usf/jquery/core/DBOrder.java

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

33
import static java.util.Objects.isNull;
4-
import static org.usf.jquery.core.QueryVariables.addWithValue;
4+
import static org.usf.jquery.core.QueryContext.addWithValue;
55
import static org.usf.jquery.core.SqlStringBuilder.SPACE;
66
import static org.usf.jquery.core.Validation.requireNoArgs;
77

@@ -26,15 +26,15 @@ public DBOrder(DBColumn column) {
2626
}
2727

2828
@Override
29-
public String sql(QueryVariables builder, Object[] args) {
29+
public String sql(QueryContext ctx, Object[] args) {
3030
requireNoArgs(args, DBOrder.class::getSimpleName);
31-
return sql(builder);
31+
return sql(ctx);
3232
}
3333

34-
public String sql(QueryVariables builder) {
34+
public String sql(QueryContext ctx) {
3535
return isNull(order)
36-
? column.sql(builder)
37-
: column.sql(builder) + SPACE + order.name();
36+
? column.sql(ctx)
37+
: column.sql(ctx) + SPACE + order.name();
3838
}
3939

4040
@Override

‎src/main/java/org/usf/jquery/core/DBView.java

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

3-
import static java.util.Objects.isNull;
43
import static org.usf.jquery.core.SqlStringBuilder.SPACE;
54
import static org.usf.jquery.core.Validation.requireNoArgs;
65

@@ -12,17 +11,16 @@
1211
@FunctionalInterface
1312
public interface DBView extends DBObject {
1413

15-
String sql(QueryVariables builder);
14+
String sql(QueryContext ctx);
1615

1716
@Override
18-
default String sql(QueryVariables builder, Object[] args) {
17+
default String sql(QueryContext ctx, Object[] args) {
1918
requireNoArgs(args, DBView.class::getSimpleName);
20-
return sql(builder);
19+
return sql(ctx);
2120
}
2221

23-
default String sqlWithTag(QueryVariables builder) {
24-
var tag = builder.viewAlias(this);
25-
var sql = builder.viewOverload(this).orElse(this).sql(builder); //!important
26-
return isNull(tag) ? sql : sql + SPACE + tag;
22+
default String sqlWithTag(QueryContext ctx) {
23+
return ctx.viewOverload(this).orElse(this).sql(ctx) //!important
24+
+ SPACE + ctx.viewAlias(this);
2725
}
2826
}

‎src/main/java/org/usf/jquery/core/ExtractFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ default String id() {
1818
}
1919

2020
@Override
21-
default String sql(QueryVariables builder, Object[] args) {
21+
default String sql(QueryContext builder, Object[] args) {
2222
requireNArgs(1, args, ExtractFunction.class::getSimpleName);
2323
return id() + "(" + field() + " FROM " + builder.appendLiteral(args[0]) + ")";
2424
}

‎src/main/java/org/usf/jquery/core/FunctionOperator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
public interface FunctionOperator extends Operator {
1111

1212
@Override
13-
default String sql(QueryVariables builder, Object[] args) {
13+
default String sql(QueryContext ctx, Object[] args) {
1414
return new SqlStringBuilder(id())
15-
.append("(").append(builder.appendLiteralArray(args)).append(")") //accept any
15+
.append("(").append(ctx.appendLiteralArray(args)).append(")") //accept any
1616
.toString();
1717
}
1818
}

‎src/main/java/org/usf/jquery/core/InComparator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
public interface InComparator extends Comparator {
1414

1515
@Override
16-
default String sql(QueryVariables builder, Object[] args) {
16+
default String sql(QueryContext ctx, Object[] args) {
1717
requireAtLeastNArgs(2, args, InComparator.class::getSimpleName);
18-
return builder.appendParameter(args[0]) + SPACE + id() + parenthese(builder.appendArrayParameter(args, 1));
18+
return ctx.appendParameter(args[0]) + SPACE + id() + parenthese(ctx.appendArrayParameter(args, 1));
1919
}
2020
}

‎src/main/java/org/usf/jquery/core/NamedColumn.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public interface NamedColumn extends DBColumn {
1212

1313
String getTag();
1414

15-
default String sqlWithTag(QueryVariables builder) {
16-
var s = sql(builder);
15+
default String sqlWithTag(QueryContext ctx) {
16+
var s = sql(ctx);
1717
if(nonNull(getTag())) {
1818
s += " AS " + doubleQuote(getTag());
1919
}

‎src/main/java/org/usf/jquery/core/NullComparator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
public interface NullComparator extends Comparator {
1313

1414
@Override
15-
default String sql(QueryVariables builder, Object[] args) {
15+
default String sql(QueryContext ctx, Object[] args) {
1616
requireNArgs(1, args, NullComparator.class::getSimpleName);
17-
return builder.appendParameter(args[0]) + SPACE + id();
17+
return ctx.appendParameter(args[0]) + SPACE + id();
1818
}
1919
}

0 commit comments

Comments
 (0)