diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ConditionalBuilder.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ConditionalBuilder.java index da34835..163f351 100644 --- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ConditionalBuilder.java +++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ConditionalBuilder.java @@ -19,8 +19,6 @@ public interface ConditionalBuilder extends SQLBuilder { ConditionalBuilder addCondition(@Nullable String condition); - ConditionalBuilder addNotNullCondition(@NotNull String queryName); - ConditionalBuilder addCondition(@NotNull String queryName, @NotNull String operator, @Nullable Object queryValue); default ConditionalBuilder addCondition(@NotNull String queryName, @Nullable Object queryValue) { @@ -29,6 +27,8 @@ public interface ConditionalBuilder extends SQLBuilder { ConditionalBuilder addCondition(@NotNull String[] queryNames, @Nullable Object[] queryValues); + ConditionalBuilder addNotNullCondition(@NotNull String queryName); + default ConditionalBuilder addTimeCondition(@NotNull String queryName, long startMillis, long endMillis) { return addTimeCondition(queryName, startMillis > 0 ? new Date(startMillis) : null, diff --git a/easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/AbstractConditionalBuilder.java b/easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/AbstractConditionalBuilder.java index 9a21163..0a16231 100644 --- a/easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/AbstractConditionalBuilder.java +++ b/easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/AbstractConditionalBuilder.java @@ -45,12 +45,6 @@ public abstract class AbstractConditionalBuilder extends AbstractSQLBuilder i return this; } - @Override - public AbstractConditionalBuilder addNotNullCondition(@NotNull String queryName) { - return addCondition("`" + queryName + "` IS NOT NULL"); - } - - @Override public AbstractConditionalBuilder addCondition( @NotNull String queryName, @NotNull String operator, @Nullable Object queryValue @@ -73,6 +67,13 @@ public abstract class AbstractConditionalBuilder extends AbstractSQLBuilder i return this; } + + @Override + public AbstractConditionalBuilder addNotNullCondition(@NotNull String queryName) { + return addCondition("`" + queryName + "` IS NOT NULL"); + } + + @Override public AbstractConditionalBuilder addTimeCondition( @NotNull String queryName, @Nullable Date startDate, @Nullable Date endDate