13459599702

Committed 21 Feb 2025 03:09PM UTC coverage: 66.563% (+2.5%) from 64.062%

Build # 13459599702

Build Type

push

github

Committed by

torand

Commit Message

feat: add support for modulo operator

Run Details

213 of 404 branches covered (52.72%)

Branch coverage included in aggregate %.

26 of 35 new or added lines in 10 files covered. (74.29%)

1067 of 1519 relevant lines covered (70.24%)

3.73 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

81.25

/src/main/java/io/github/torand/fastersql/expression/arithmetic/Modulo.java

package io.github.torand.fastersql.expression.arithmetic;

import io.github.torand.fastersql.Context;
import io.github.torand.fastersql.Field;
import io.github.torand.fastersql.expression.Expression;
import io.github.torand.fastersql.projection.Projection;

import java.util.Random;
import java.util.stream.Stream;

import static io.github.torand.fastersql.dialect.Capability.MODULO_OPERATOR;
import static io.github.torand.fastersql.util.contract.Requires.requireNonBlank;
import static java.util.Objects.nonNull;
import static java.util.Objects.requireNonNull;

public class Modulo implements Expression {
    private final Expression left;
    private final Expression right;
    private final String alias;

    Modulo(Expression left, Expression right, String alias) {
        this.left = requireNonNull(left, "No left operand specified");
        this.right = requireNonNull(right, "No right operand specified");
        this.alias = nonNull(alias) ? alias : defaultAlias();
    }

    // Sql

    @Override
    public String sql(Context context) {
        if (context.getDialect().supports(MODULO_OPERATOR)) {
            String leftSql = left.sql(context);
            if (left instanceof Addition || left instanceof Subtraction) {
                leftSql = "(" + leftSql + ")";
            }

            String rightSql = right.sql(context);
            if (right instanceof Addition || right instanceof Subtraction) {
                rightSql = "(" + rightSql + ")";
            }

            return leftSql + " % " + rightSql;
        }

        return context.getDialect().formatModuloFunction(left.sql(context), right.sql(context));
    }

    @Override
    public Stream<Object> params(Context context) {
        return Stream.concat(left.params(context), right.params(context));
    }

    // Projection

    @Override
    public Projection as(String alias) {
        requireNonBlank(alias, "No alias specified");
        return new Modulo(left, right, alias);
    }

    @Override
    public String alias() {
        return alias;
    }

    // Expression

    @Override
    public Stream<Field> fieldRefs() {
        return Stream.concat(left.fieldRefs(), right.fieldRefs());
    }

    private String defaultAlias() {
        return "MODULO_" + (new Random().nextInt(999) + 1);
    }
}

1	package io.github.torand.fastersql.expression.arithmetic;
2
3	import io.github.torand.fastersql.Context;
4	import io.github.torand.fastersql.Field;
5	import io.github.torand.fastersql.expression.Expression;
6	import io.github.torand.fastersql.projection.Projection;
7
8	import java.util.Random;
9	import java.util.stream.Stream;
10
11	import static io.github.torand.fastersql.dialect.Capability.MODULO_OPERATOR;
12	import static io.github.torand.fastersql.util.contract.Requires.requireNonBlank;
13	import static java.util.Objects.nonNull;
14	import static java.util.Objects.requireNonNull;
15
16	public class Modulo implements Expression {
17	private final Expression left;
18	private final Expression right;
19	private final String alias;
20
21	Modulo(Expression left, Expression right, String alias) {	2✔
22	this.left = requireNonNull(left, "No left operand specified");	6✔
23	this.right = requireNonNull(right, "No right operand specified");	6✔
24	this.alias = nonNull(alias) ? alias : defaultAlias();	9✔
25	}	1✔
26
27	// Sql
28
29	@Override
30	public String sql(Context context) {
31	if (context.getDialect().supports(MODULO_OPERATOR)) {	5✔
32	String leftSql = left.sql(context);	5✔
33	if (left instanceof Addition \|\| left instanceof Subtraction) {	8!
NEW 34	leftSql = "(" + leftSql + ")";	×
35	}
36
37	String rightSql = right.sql(context);	5✔
38	if (right instanceof Addition \|\| right instanceof Subtraction) {	8!
NEW 39	rightSql = "(" + rightSql + ")";	×
40	}
41
42	return leftSql + " % " + rightSql;	4✔
43	}
44
45	return context.getDialect().formatModuloFunction(left.sql(context), right.sql(context));	12✔
46	}
47
48	@Override
49	public Stream<Object> params(Context context) {
50	return Stream.concat(left.params(context), right.params(context));	10✔
51	}
52
53	// Projection
54
55	@Override
56	public Projection as(String alias) {
57	requireNonBlank(alias, "No alias specified");	6✔
58	return new Modulo(left, right, alias);	9✔
59	}
60
61	@Override
62	public String alias() {
63	return alias;	3✔
64	}
65
66	// Expression
67
68	@Override
69	public Stream<Field> fieldRefs() {
70	return Stream.concat(left.fieldRefs(), right.fieldRefs());	8✔
71	}
72
73	private String defaultAlias() {
74	return "MODULO_" + (new Random().nextInt(999) + 1);	9✔
75	}
76	}

torand / FasterSQL / 13459599702

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous