This commit is contained in:
@@ -36,6 +36,10 @@ public class FilterNode {
|
|||||||
}
|
}
|
||||||
|
|
||||||
FilterNode(String col, FilterExpress exp, Serializable val) {
|
FilterNode(String col, FilterExpress exp, Serializable val) {
|
||||||
|
this(col, exp, true, val);
|
||||||
|
}
|
||||||
|
|
||||||
|
FilterNode(String col, FilterExpress exp, boolean likefit, Serializable val) {
|
||||||
Objects.requireNonNull(col);
|
Objects.requireNonNull(col);
|
||||||
if (exp == null) {
|
if (exp == null) {
|
||||||
if (val instanceof Range) {
|
if (val instanceof Range) {
|
||||||
@@ -50,6 +54,7 @@ public class FilterNode {
|
|||||||
}
|
}
|
||||||
this.column = col;
|
this.column = col;
|
||||||
this.express = exp;
|
this.express = exp;
|
||||||
|
this.likefit = likefit;
|
||||||
this.value = val;
|
this.value = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,6 +70,10 @@ public class FilterNode {
|
|||||||
return and(new FilterNode(column, express, value));
|
return and(new FilterNode(column, express, value));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public final FilterNode and(String column, FilterExpress express, boolean likefit, Serializable value) {
|
||||||
|
return and(new FilterNode(column, express, likefit, value));
|
||||||
|
}
|
||||||
|
|
||||||
public final FilterNode or(FilterNode node) {
|
public final FilterNode or(FilterNode node) {
|
||||||
return any(node, false);
|
return any(node, false);
|
||||||
}
|
}
|
||||||
@@ -77,6 +86,10 @@ public class FilterNode {
|
|||||||
return or(new FilterNode(column, express, value));
|
return or(new FilterNode(column, express, value));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public final FilterNode or(String column, FilterExpress express, boolean likefit, Serializable value) {
|
||||||
|
return or(new FilterNode(column, express, likefit, value));
|
||||||
|
}
|
||||||
|
|
||||||
protected final FilterNode any(FilterNode node, boolean sign) {
|
protected final FilterNode any(FilterNode node, boolean sign) {
|
||||||
Objects.requireNonNull(node);
|
Objects.requireNonNull(node);
|
||||||
if (nodes == null) {
|
if (nodes == null) {
|
||||||
@@ -99,6 +112,7 @@ public class FilterNode {
|
|||||||
FilterNode newnode = new FilterNode(this.column, this.express, this.value);
|
FilterNode newnode = new FilterNode(this.column, this.express, this.value);
|
||||||
newnode.signand = this.signand;
|
newnode.signand = this.signand;
|
||||||
newnode.nodes = this.nodes;
|
newnode.nodes = this.nodes;
|
||||||
|
newnode.likefit = this.likefit;
|
||||||
this.nodes = new FilterNode[]{newnode, node};
|
this.nodes = new FilterNode[]{newnode, node};
|
||||||
this.tabalis = null;
|
this.tabalis = null;
|
||||||
this.column = null;
|
this.column = null;
|
||||||
|
|||||||
Reference in New Issue
Block a user