Add basic support for sub-queries in where clauses

Author: jeffgbutler

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

@@ -0,0 +1,38 @@
+/**
+ *    Copyright 2016-2017 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.select.SelectModel;
+import org.mybatis.dynamic.sql.select.SelectModelBuilder;
+
+public abstract class AbstractSubselectCondition<T> extends Condition<T> {
+    private SelectModel selectModel;
+    
+    protected AbstractSubselectCondition (SelectModelBuilder.Buildable selectModelBuilder) {
+        this.selectModel = selectModelBuilder.build();
+    }
+    
+    public SelectModel selectModel() {
+        return selectModel;
+    }
+
+    @Override
+    public <R> R accept(ConditionVisitor<T, R> visitor) {
+        return visitor.visit(this);
+    }
+
+    public abstract String renderCondition(String columnName, String renderedSelectStatement);
+}

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

@@ -23,4 +23,6 @@ public interface ConditionVisitor<T, R> {
     R visit(AbstractSingleValueCondition<T> condition);
 
     R visit(AbstractTwoValueCondition<T> condition);
+
+    R visit(AbstractSubselectCondition<T> condition);
 }

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

@@ -18,13 +18,15 @@
 import java.util.Arrays;
 import java.util.stream.Stream;
 
+import org.mybatis.dynamic.sql.select.SelectModelBuilder;
 import org.mybatis.dynamic.sql.select.aggregate.Count;
 import org.mybatis.dynamic.sql.where.condition.IsBetween;
 import org.mybatis.dynamic.sql.where.condition.IsEqualTo;
 import org.mybatis.dynamic.sql.where.condition.IsGreaterThan;
 import org.mybatis.dynamic.sql.where.condition.IsGreaterThanOrEqualTo;
 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.IsLessThanOrEqualTo;
 import org.mybatis.dynamic.sql.where.condition.IsLike;
@@ -33,6 +35,7 @@
 import org.mybatis.dynamic.sql.where.condition.IsNotEqualTo;
 import org.mybatis.dynamic.sql.where.condition.IsNotIn;
 import org.mybatis.dynamic.sql.where.condition.IsNotInCaseInsensitive;
+import org.mybatis.dynamic.sql.where.condition.IsNotInWithSubselect;
 import org.mybatis.dynamic.sql.where.condition.IsNotLike;
 import org.mybatis.dynamic.sql.where.condition.IsNotLikeCaseInsensitive;
 import org.mybatis.dynamic.sql.where.condition.IsNotNull;
@@ -120,6 +123,10 @@ static <T> IsIn<T> isIn(T...values) {
     static <T> IsIn<T> isIn(Stream<T> values) {
         return IsIn.of(values);
     }
+    
+    static <T> IsInWithSubselect<T> isIn(SelectModelBuilder.Buildable selectModelBuilder) {
+        return IsInWithSubselect.of(selectModelBuilder);
+    }
 
     @SafeVarargs
     static <T> IsNotIn<T> isNotIn(T...values) {
@@ -130,6 +137,10 @@ static <T> IsNotIn<T> isNotIn(Stream<T> values) {
         return IsNotIn.of(values);
     }
 
+    static <T> IsNotInWithSubselect<T> isNotIn(SelectModelBuilder.Buildable selectModelBuilder) {
+        return IsNotInWithSubselect.of(selectModelBuilder);
+    }
+
     static <T> IsBetween.Builder<T> isBetween(T value1) {
         return IsBetween.isBetween(value1);
     }

src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteRenderer.java

@@ -36,8 +36,9 @@ public DeleteSupport render(RenderingStrategy renderingStrategy) {
     }
 
     private DeleteSupport renderWithWhereClause(WhereModel whereModel, RenderingStrategy renderingStrategy) {
-        WhereRenderer whereRenderer = WhereRenderer.of(whereModel, renderingStrategy, Collections.emptyMap());
-        WhereSupport whereSupport = whereRenderer.render();
+        WhereSupport whereSupport = new WhereRenderer.Builder(whereModel, renderingStrategy, Collections.emptyMap())
+                .build()
+                .render();
         return DeleteSupport.of(deleteModel.table().name(), whereSupport.getWhereClause(), whereSupport.getParameters());
     }
 

src/main/java/org/mybatis/dynamic/sql/select/SelectModelBuilder.java

@@ -69,7 +69,12 @@ protected SelectModel buildModel() {
                 .build();
     }
 
-    public class SelectSupportAfterFromBuilder {
+    @FunctionalInterface
+    public interface Buildable {
+        SelectModel build();
+    }
+    
+    public class SelectSupportAfterFromBuilder implements Buildable {
         private SelectSupportAfterFromBuilder() {
             super();
         }
@@ -88,12 +93,14 @@ public SelectSupportAfterOrderByBuilder orderBy(SqlColumn<?>...columns) {
             return new SelectSupportAfterOrderByBuilder();
         }
 
+        @Override
         public SelectModel build() {
             return buildModel();
         }
     }
 
-    public class SelectSupportWhereBuilder extends AbstractWhereModelBuilder<SelectSupportWhereBuilder> {
+    public class SelectSupportWhereBuilder extends AbstractWhereModelBuilder<SelectSupportWhereBuilder> 
+            implements Buildable {
         private <T> SelectSupportWhereBuilder(SqlColumn<T> column, Condition<T> condition) {
             super(column, condition);
         }
@@ -109,6 +116,7 @@ public SelectSupportAfterOrderByBuilder orderBy(SqlColumn<?>...columns) {
             return new SelectSupportAfterOrderByBuilder();
         }
 
+        @Override
         public SelectModel build() {
             whereModel = buildWhereModel();
             return buildModel();
@@ -120,11 +128,12 @@ protected SelectSupportWhereBuilder getThis() {
         }
     }
 
-    public class SelectSupportAfterOrderByBuilder {
+    public class SelectSupportAfterOrderByBuilder implements Buildable {
         private SelectSupportAfterOrderByBuilder() {
             super();
         }
 
+        @Override
         public SelectModel build() {
             return buildModel();
         }

src/main/java/org/mybatis/dynamic/sql/select/render/SelectRenderer.java

@@ -16,6 +16,7 @@
 package org.mybatis.dynamic.sql.select.render;
 
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -35,13 +36,21 @@ private SelectRenderer(SelectModel selectModel) {
     }
 
     public SelectSupport render(RenderingStrategy renderingStrategy) {
+        return render(renderingStrategy, null);
+    }
+    
+    public SelectSupport render(RenderingStrategy renderingStrategy, AtomicInteger sequence) {
         SelectSupport.Builder builder = new SelectSupport.Builder(calculateTableName(selectModel.table()))
                 .isDistinct(selectModel.isDistinct())
                 .withColumnList(calculateColumnList())
                 .withOrderByClause(calculateOrderByPhrase());
 
         selectModel.whereModel().ifPresent(wm -> {
-            WhereSupport whereSupport = WhereRenderer.of(wm, renderingStrategy, selectModel.tableAliases()).render();
+            WhereSupport whereSupport = new WhereRenderer.Builder(wm, renderingStrategy, selectModel.tableAliases())
+                    .withSequence(sequence)
+                    .build()
+                    .render();
+            
             builder.withWhereClause(whereSupport.getWhereClause())
                 .withParameters(whereSupport.getParameters());
         });

src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java

@@ -22,6 +22,7 @@
 import org.mybatis.dynamic.sql.update.UpdateModel;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.UpdateMapping;
+import org.mybatis.dynamic.sql.where.WhereModel;
 import org.mybatis.dynamic.sql.where.render.WhereRenderer;
 import org.mybatis.dynamic.sql.where.render.WhereSupport;
 
@@ -42,8 +43,15 @@ public UpdateSupport render(RenderingStrategy renderingStrategy) {
     }
 
     private Optional<WhereSupport> renderWhere(RenderingStrategy renderingStrategy) {
-        return updateModel.whereModel().flatMap(
-                wm -> Optional.of(WhereRenderer.of(wm, renderingStrategy, Collections.emptyMap()).render()));
+        return updateModel.whereModel()
+                .flatMap(wm -> renderWhere(wm, renderingStrategy));
+    }
+    
+    private Optional<WhereSupport> renderWhere(WhereModel whereModel, RenderingStrategy renderingStrategy) {
+        WhereSupport whereSupport = new WhereRenderer.Builder(whereModel, renderingStrategy, Collections.emptyMap())
+                .build()
+                .render();
+        return Optional.of(whereSupport);
     }
 
     private FragmentAndParameters transform(UpdateMapping columnAndValue, SetPhraseVisitor visitor) {

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

@@ -0,0 +1,35 @@
+/**
+ *    Copyright 2016-2017 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.AbstractSubselectCondition;
+import org.mybatis.dynamic.sql.select.SelectModelBuilder;
+
+public class IsInWithSubselect<T> extends AbstractSubselectCondition<T> {
+    
+    protected IsInWithSubselect(SelectModelBuilder.Buildable selectModelBuilder) {
+        super(selectModelBuilder);
+    }
+
+    public static <T> IsInWithSubselect<T> of(SelectModelBuilder.Buildable selectModelBuilder) {
+        return new IsInWithSubselect<>(selectModelBuilder);
+    }
+
+    @Override
+    public String renderCondition(String columnName, String renderedSelectStatement) {
+        return columnName + " in (" + renderedSelectStatement + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+    }
+}

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

@@ -0,0 +1,35 @@
+/**
+ *    Copyright 2016-2017 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.AbstractSubselectCondition;
+import org.mybatis.dynamic.sql.select.SelectModelBuilder;
+
+public class IsNotInWithSubselect<T> extends AbstractSubselectCondition<T> {
+    
+    protected IsNotInWithSubselect(SelectModelBuilder.Buildable selectModelBuilder) {
+        super(selectModelBuilder);
+    }
+
+    public static <T> IsNotInWithSubselect<T> of(SelectModelBuilder.Buildable selectModelBuilder) {
+        return new IsNotInWithSubselect<>(selectModelBuilder);
+    }
+
+    @Override
+    public String renderCondition(String columnName, String renderedSelectStatement) {
+        return columnName + " not in (" + renderedSelectStatement + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+    }
+}

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

@@ -22,11 +22,14 @@
 import org.mybatis.dynamic.sql.AbstractListValueCondition;
 import org.mybatis.dynamic.sql.AbstractNoValueCondition;
 import org.mybatis.dynamic.sql.AbstractSingleValueCondition;
+import org.mybatis.dynamic.sql.AbstractSubselectCondition;
 import org.mybatis.dynamic.sql.AbstractTwoValueCondition;
 import org.mybatis.dynamic.sql.ConditionVisitor;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.select.render.SelectRenderer;
+import org.mybatis.dynamic.sql.select.render.SelectSupport;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.where.render.WhereFragmentCollector.Triple;
 
@@ -87,6 +90,16 @@ public FragmentAndParameters visit(AbstractTwoValueCondition<T> condition) {
                 .build();
     }
 
+
+    @Override
+    public FragmentAndParameters visit(AbstractSubselectCondition<T> condition) {
+        SelectSupport ss = SelectRenderer.of(condition.selectModel()).render(renderingStrategy, sequence);
+        
+        return new FragmentAndParameters.Builder(condition.renderCondition(columnName(), ss.getFullSelectStatement()))
+                .withParameters(ss.getParameters())
+                .build();
+    }
+    
     private Triple toTriple(Object value) {
         String mapKey = formatParameterMapKey(sequence.getAndIncrement());
         return Triple.of(mapKey, getFormattedJdbcPlaceholder(mapKey), value);

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

@@ -16,6 +16,7 @@
 package org.mybatis.dynamic.sql.where.render;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.mybatis.dynamic.sql.SqlCriterion;
@@ -26,14 +27,15 @@
 
 public class WhereRenderer {
     private WhereModel model;
-    private AtomicInteger sequence = new AtomicInteger(1);
+    private AtomicInteger sequence;
     private RenderingStrategy renderingStrategy;
     private Map<SqlTable, String> tableAliases;
 
-    private WhereRenderer(WhereModel model, RenderingStrategy renderingStrategy, Map<SqlTable, String> tableAliases) {
-        this.model = model;
-        this.renderingStrategy = renderingStrategy;
-        this.tableAliases = tableAliases;
+    private WhereRenderer(Builder builder) {
+        model = builder.model;
+        renderingStrategy = builder.renderingStrategy;
+        tableAliases = builder.tableAliases;
+        sequence = builder.sequence().orElse(new AtomicInteger(1));
     }
 
     public WhereSupport render() {
@@ -47,8 +49,30 @@ private FragmentAndParameters render(SqlCriterion<?> criterion) {
                 .render(criterion);
     }
 
-    public static WhereRenderer of(WhereModel model, RenderingStrategy renderingStrategy,
-            Map<SqlTable, String> tableAliases) {
-        return new WhereRenderer(model, renderingStrategy, tableAliases);
+    public static class Builder {
+        private WhereModel model;
+        private RenderingStrategy renderingStrategy;
+        private Map<SqlTable, String> tableAliases;
+        private AtomicInteger sequence;
+        
+        public Builder(WhereModel model, RenderingStrategy renderingStrategy,
+                Map<SqlTable, String> tableAliases) {
+            this.model = model;
+            this.renderingStrategy = renderingStrategy;
+            this.tableAliases = tableAliases;
+        }
+        
+        public Builder withSequence(AtomicInteger sequence) {
+            this.sequence = sequence;
+            return this;
+        }
+        
+        private Optional<AtomicInteger> sequence() {
+            return Optional.ofNullable(sequence);
+        }
+        
+        public WhereRenderer build() {
+            return new WhereRenderer(this);
+        }
     }
 }