Merge pull request #36 from jeffgbutler/master

Add column comparison conditions

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/AbstractColumnComparisonCondition.java

@@ -0,0 +1,38 @@
+/**
+ *    Copyright 2016-2018 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql;
+
+import org.mybatis.dynamic.sql.render.TableAliasCalculator;
+
+public abstract class AbstractColumnComparisonCondition<T> implements VisitableCondition<T> {
+
+    protected BasicColumn column;
+    
+    protected AbstractColumnComparisonCondition(BasicColumn column) {
+        this.column = column;
+    }
+
+    @Override
+    public <R> R accept(ConditionVisitor<T,R> visitor) {
+        return visitor.visit(this);
+    }
+    
+    public String renderCondition(String columnName, TableAliasCalculator tableAliasCalculator) {
+        return renderCondition(columnName, column.renderWithTableAlias(tableAliasCalculator));
+    }
+    
+    protected abstract String renderCondition(String leftColumn, String rightColumn);
+}

src/main/java/org/mybatis/dynamic/sql/ConditionVisitor.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -25,4 +25,6 @@ public interface ConditionVisitor<T, R> {
     R visit(AbstractTwoValueCondition<T> condition);
 
     R visit(AbstractSubselectCondition<T> condition);
+
+    R visit(AbstractColumnComparisonCondition<T> condition);
 }

src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java

@@ -50,22 +50,28 @@
 import org.mybatis.dynamic.sql.where.WhereDSL;
 import org.mybatis.dynamic.sql.where.condition.IsBetween;
 import org.mybatis.dynamic.sql.where.condition.IsEqualTo;
+import org.mybatis.dynamic.sql.where.condition.IsEqualToColumn;
 import org.mybatis.dynamic.sql.where.condition.IsEqualToWithSubselect;
 import org.mybatis.dynamic.sql.where.condition.IsGreaterThan;
+import org.mybatis.dynamic.sql.where.condition.IsGreaterThanColumn;
 import org.mybatis.dynamic.sql.where.condition.IsGreaterThanOrEqualTo;
+import org.mybatis.dynamic.sql.where.condition.IsGreaterThanOrEqualToColumn;
 import org.mybatis.dynamic.sql.where.condition.IsGreaterThanOrEqualToWithSubselect;
 import org.mybatis.dynamic.sql.where.condition.IsGreaterThanWithSubselect;
 import org.mybatis.dynamic.sql.where.condition.IsIn;
 import org.mybatis.dynamic.sql.where.condition.IsInCaseInsensitive;
 import org.mybatis.dynamic.sql.where.condition.IsInWithSubselect;
 import org.mybatis.dynamic.sql.where.condition.IsLessThan;
+import org.mybatis.dynamic.sql.where.condition.IsLessThanColumn;
 import org.mybatis.dynamic.sql.where.condition.IsLessThanOrEqualTo;
+import org.mybatis.dynamic.sql.where.condition.IsLessThanOrEqualToColumn;
 import org.mybatis.dynamic.sql.where.condition.IsLessThanOrEqualToWithSubselect;
 import org.mybatis.dynamic.sql.where.condition.IsLessThanWithSubselect;
 import org.mybatis.dynamic.sql.where.condition.IsLike;
 import org.mybatis.dynamic.sql.where.condition.IsLikeCaseInsensitive;
 import org.mybatis.dynamic.sql.where.condition.IsNotBetween;
 import org.mybatis.dynamic.sql.where.condition.IsNotEqualTo;
+import org.mybatis.dynamic.sql.where.condition.IsNotEqualToColumn;
 import org.mybatis.dynamic.sql.where.condition.IsNotEqualToWithSubselect;
 import org.mybatis.dynamic.sql.where.condition.IsNotIn;
 import org.mybatis.dynamic.sql.where.condition.IsNotInCaseInsensitive;
@@ -256,6 +262,10 @@ static <T> IsEqualTo<T> isEqualTo(Supplier<T> valueSupplier) {
     static <T> IsEqualToWithSubselect<T> isEqualTo(Buildable<SelectModel> selectModelBuilder) {
         return IsEqualToWithSubselect.of(selectModelBuilder);
     }
+    
+    static <T> IsEqualToColumn<T> isEqualTo(BasicColumn column) {
+        return IsEqualToColumn.of(column);
+    }
 
     static <T> IsNotEqualTo<T> isNotEqualTo(T value) {
         return isNotEqualTo(() -> value);
@@ -269,6 +279,10 @@ static <T> IsNotEqualToWithSubselect<T> isNotEqualTo(Buildable<SelectModel> sele
         return IsNotEqualToWithSubselect.of(selectModelBuilder);
     }
 
+    static <T> IsNotEqualToColumn<T> isNotEqualTo(BasicColumn column) {
+        return IsNotEqualToColumn.of(column);
+    }
+
     static <T> IsGreaterThan<T> isGreaterThan(T value) {
         return isGreaterThan(() -> value);
     }
@@ -281,6 +295,10 @@ static <T> IsGreaterThanWithSubselect<T> isGreaterThan(Buildable<SelectModel> se
         return IsGreaterThanWithSubselect.of(selectModelBuilder);
     }
 
+    static <T> IsGreaterThanColumn<T> isGreaterThan(BasicColumn column) {
+        return IsGreaterThanColumn.of(column);
+    }
+
     static <T> IsGreaterThanOrEqualTo<T> isGreaterThanOrEqualTo(T value) {
         return isGreaterThanOrEqualTo(() -> value);
     }
@@ -294,6 +312,10 @@ static <T> IsGreaterThanOrEqualToWithSubselect<T> isGreaterThanOrEqualTo(
         return IsGreaterThanOrEqualToWithSubselect.of(selectModelBuilder);
     }
 
+    static <T> IsGreaterThanOrEqualToColumn<T> isGreaterThanOrEqualTo(BasicColumn column) {
+        return IsGreaterThanOrEqualToColumn.of(column);
+    }
+
     static <T> IsLessThan<T> isLessThan(T value) {
         return isLessThan(() -> value);
     }
@@ -306,6 +328,10 @@ static <T> IsLessThanWithSubselect<T> isLessThan(Buildable<SelectModel> selectMo
         return IsLessThanWithSubselect.of(selectModelBuilder);
     }
 
+    static <T> IsLessThanColumn<T> isLessThan(BasicColumn column) {
+        return IsLessThanColumn.of(column);
+    }
+
     static <T> IsLessThanOrEqualTo<T> isLessThanOrEqualTo(T value) {
         return isLessThanOrEqualTo(() -> value);
     }
@@ -318,6 +344,10 @@ static <T> IsLessThanOrEqualToWithSubselect<T> isLessThanOrEqualTo(Buildable<Sel
         return IsLessThanOrEqualToWithSubselect.of(selectModelBuilder);
     }
 
+    static <T> IsLessThanOrEqualToColumn<T> isLessThanOrEqualTo(BasicColumn column) {
+        return IsLessThanOrEqualToColumn.of(column);
+    }
+
     @SafeVarargs
     static <T> IsIn<T> isIn(T...values) {
         return isIn(Arrays.asList(values));

src/main/java/org/mybatis/dynamic/sql/where/condition/IsEqualToColumn.java

@@ -0,0 +1,35 @@
+/**
+ *    Copyright 2016-2018 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.where.condition;
+
+import org.mybatis.dynamic.sql.AbstractColumnComparisonCondition;
+import org.mybatis.dynamic.sql.BasicColumn;
+
+public class IsEqualToColumn<T> extends AbstractColumnComparisonCondition<T> {
+
+    protected IsEqualToColumn(BasicColumn column) {
+        super(column);
+    }
+
+    @Override
+    protected String renderCondition(String leftColumn, String rightColumn) {
+        return leftColumn + " = " + rightColumn; //$NON-NLS-1$
+    }
+    
+    public static <T> IsEqualToColumn<T> of(BasicColumn column) {
+        return new IsEqualToColumn<>(column);
+    }
+}

src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanColumn.java

@@ -0,0 +1,35 @@
+/**
+ *    Copyright 2016-2018 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.where.condition;
+
+import org.mybatis.dynamic.sql.AbstractColumnComparisonCondition;
+import org.mybatis.dynamic.sql.BasicColumn;
+
+public class IsGreaterThanColumn<T> extends AbstractColumnComparisonCondition<T> {
+
+    protected IsGreaterThanColumn(BasicColumn column) {
+        super(column);
+    }
+
+    @Override
+    protected String renderCondition(String leftColumn, String rightColumn) {
+        return leftColumn + " > " + rightColumn; //$NON-NLS-1$
+    }
+    
+    public static <T> IsGreaterThanColumn<T> of(BasicColumn column) {
+        return new IsGreaterThanColumn<>(column);
+    }
+}

src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanOrEqualToColumn.java

@@ -0,0 +1,35 @@
+/**
+ *    Copyright 2016-2018 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.where.condition;
+
+import org.mybatis.dynamic.sql.AbstractColumnComparisonCondition;
+import org.mybatis.dynamic.sql.BasicColumn;
+
+public class IsGreaterThanOrEqualToColumn<T> extends AbstractColumnComparisonCondition<T> {
+
+    protected IsGreaterThanOrEqualToColumn(BasicColumn column) {
+        super(column);
+    }
+
+    @Override
+    protected String renderCondition(String leftColumn, String rightColumn) {
+        return leftColumn + " >= " + rightColumn; //$NON-NLS-1$
+    }
+    
+    public static <T> IsGreaterThanOrEqualToColumn<T> of(BasicColumn column) {
+        return new IsGreaterThanOrEqualToColumn<>(column);
+    }
+}

src/main/java/org/mybatis/dynamic/sql/where/condition/IsLessThanColumn.java

@@ -0,0 +1,35 @@
+/**
+ *    Copyright 2016-2018 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.where.condition;
+
+import org.mybatis.dynamic.sql.AbstractColumnComparisonCondition;
+import org.mybatis.dynamic.sql.BasicColumn;
+
+public class IsLessThanColumn<T> extends AbstractColumnComparisonCondition<T> {
+
+    protected IsLessThanColumn(BasicColumn column) {
+        super(column);
+    }
+
+    @Override
+    protected String renderCondition(String leftColumn, String rightColumn) {
+        return leftColumn + " < " + rightColumn; //$NON-NLS-1$
+    }
+    
+    public static <T> IsLessThanColumn<T> of(BasicColumn column) {
+        return new IsLessThanColumn<>(column);
+    }
+}

src/main/java/org/mybatis/dynamic/sql/where/condition/IsLessThanOrEqualToColumn.java

@@ -0,0 +1,35 @@
+/**
+ *    Copyright 2016-2018 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.where.condition;
+
+import org.mybatis.dynamic.sql.AbstractColumnComparisonCondition;
+import org.mybatis.dynamic.sql.BasicColumn;
+
+public class IsLessThanOrEqualToColumn<T> extends AbstractColumnComparisonCondition<T> {
+
+    protected IsLessThanOrEqualToColumn(BasicColumn column) {
+        super(column);
+    }
+
+    @Override
+    protected String renderCondition(String leftColumn, String rightColumn) {
+        return leftColumn + " <= " + rightColumn; //$NON-NLS-1$
+    }
+    
+    public static <T> IsLessThanOrEqualToColumn<T> of(BasicColumn column) {
+        return new IsLessThanOrEqualToColumn<>(column);
+    }
+}

src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotEqualToColumn.java

@@ -0,0 +1,35 @@
+/**
+ *    Copyright 2016-2018 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.where.condition;
+
+import org.mybatis.dynamic.sql.AbstractColumnComparisonCondition;
+import org.mybatis.dynamic.sql.BasicColumn;
+
+public class IsNotEqualToColumn<T> extends AbstractColumnComparisonCondition<T> {
+
+    protected IsNotEqualToColumn(BasicColumn column) {
+        super(column);
+    }
+
+    @Override
+    protected String renderCondition(String leftColumn, String rightColumn) {
+        return leftColumn + " <> " + rightColumn; //$NON-NLS-1$
+    }
+    
+    public static <T> IsNotEqualToColumn<T> of(BasicColumn column) {
+        return new IsNotEqualToColumn<>(column);
+    }
+}

src/main/java/org/mybatis/dynamic/sql/where/render/WhereConditionVisitor.java

@@ -19,6 +19,7 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.mybatis.dynamic.sql.AbstractColumnComparisonCondition;
 import org.mybatis.dynamic.sql.AbstractListValueCondition;
 import org.mybatis.dynamic.sql.AbstractNoValueCondition;
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
@@ -106,6 +107,12 @@ public FragmentAndParameters visit(AbstractSubselectCondition<T> condition) {
                 .build();
     }
 
+    @Override
+    public FragmentAndParameters visit(AbstractColumnComparisonCondition<T> condition) {
+        String fragment = condition.renderCondition(columnName(), tableAliasCalculator);
+        return FragmentAndParameters.withFragment(fragment).build();
+    }
+    
     private FragmentAndParameters toFragmentAndParameters(Object value) {
         String mapKey = formatParameterMapKey(sequence.getAndIncrement());