Make the SelectRenderer work for sub-queries

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/render/RendererFactory.java

@@ -35,10 +35,10 @@
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
 import org.mybatis.dynamic.sql.select.MultiSelectModel;
 import org.mybatis.dynamic.sql.select.SelectModel;
+import org.mybatis.dynamic.sql.select.render.DefaultSelectStatementProvider;
 import org.mybatis.dynamic.sql.select.render.MultiSelectRenderer;
 import org.mybatis.dynamic.sql.select.render.SelectRenderer;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.dynamic.sql.select.render.SubQueryRenderer;
 import org.mybatis.dynamic.sql.update.UpdateModel;
 import org.mybatis.dynamic.sql.update.render.UpdateRenderer;
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
@@ -102,22 +102,24 @@ static Renderer<RenderingStrategy, SelectStatementProvider> createMultiSelectRen
     }
 
     static Renderer<RenderingStrategy, SelectStatementProvider> createSelectRenderer(SelectModel selectModel) {
-        return renderingStrategy -> SelectRenderer.withSelectModel(selectModel)
-                .withRenderingStrategy(renderingStrategy)
-                .build()
-                .render();
-    }
+        return renderingStrategy -> {
+            RenderingContext renderingContext = RenderingContext.withRenderingStrategy(renderingStrategy)
+                    .withStatementConfiguration(selectModel.statementConfiguration())
+                    .build();
 
-    static Renderer<RenderingContext, FragmentAndParameters> createSubQueryRenderer(SelectModel selectModel) {
-        return renderingContext -> SubQueryRenderer.withSelectModel(selectModel)
-                .withRenderingContext(renderingContext)
-                .build()
-                .render();
+            FragmentAndParameters fragmentAndParameters = createSubQueryRenderer(selectModel,
+                    "", "") //$NON-NLS-1$ //$NON-NLS-2$
+                    .render(renderingContext);
+
+            return DefaultSelectStatementProvider.withSelectStatement(fragmentAndParameters.fragment())
+                    .withParameters(fragmentAndParameters.parameters())
+                    .build();
+        };
     }
 
     static Renderer<RenderingContext, FragmentAndParameters> createSubQueryRenderer(SelectModel selectModel,
                                                                                     String prefix, String suffix) {
-        return renderingContext -> SubQueryRenderer.withSelectModel(selectModel)
+        return renderingContext -> SelectRenderer.withSelectModel(selectModel)
                 .withRenderingContext(renderingContext)
                 .build()
                 .render(prefix, suffix);

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

@@ -15,31 +15,65 @@
  */
 package org.mybatis.dynamic.sql.select.render;
 
-import java.util.Objects;
-
-import org.mybatis.dynamic.sql.render.RendererFactory;
+import org.mybatis.dynamic.sql.common.OrderByModel;
+import org.mybatis.dynamic.sql.common.OrderByRenderer;
 import org.mybatis.dynamic.sql.render.RenderingContext;
-import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.select.PagingModel;
+import org.mybatis.dynamic.sql.select.QueryExpressionModel;
 import org.mybatis.dynamic.sql.select.SelectModel;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
+import org.mybatis.dynamic.sql.util.FragmentCollector;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 public class SelectRenderer {
     private final SelectModel selectModel;
     private final RenderingContext renderingContext;
 
     private SelectRenderer(Builder builder) {
         selectModel = Objects.requireNonNull(builder.selectModel);
-        renderingContext = RenderingContext.withRenderingStrategy(builder.renderingStrategy)
-                .withStatementConfiguration(selectModel.statementConfiguration())
-                .build();
+        renderingContext = Objects.requireNonNull(builder.renderingContext);
+    }
+
+    public FragmentAndParameters render(String prefix, String suffix) {
+        FragmentCollector fragmentCollector = selectModel
+                .queryExpressions()
+                .map(this::renderQueryExpression)
+                .collect(FragmentCollector.collect());
+
+        renderOrderBy().ifPresent(fragmentCollector::add);
+        renderPagingModel().ifPresent(fragmentCollector::add);
+
+        return fragmentCollector.toFragmentAndParameters(Collectors.joining(" ", prefix, suffix)); //$NON-NLS-1$
+    }
+
+    private FragmentAndParameters renderQueryExpression(QueryExpressionModel queryExpressionModel) {
+        return QueryExpressionRenderer.withQueryExpression(queryExpressionModel)
+                .withRenderingContext(renderingContext)
+                .build()
+                .render();
+    }
+
+    private Optional<FragmentAndParameters> renderOrderBy() {
+        return selectModel.orderByModel().map(this::renderOrderBy);
+    }
+
+    private FragmentAndParameters renderOrderBy(OrderByModel orderByModel) {
+        return new OrderByRenderer(renderingContext).render(orderByModel);
+    }
+
+    private Optional<FragmentAndParameters> renderPagingModel() {
+        return selectModel.pagingModel().map(this::renderPagingModel);
     }
 
-    public SelectStatementProvider render() {
-        FragmentAndParameters fragmentAndParameters = RendererFactory.createSubQueryRenderer(selectModel)
-                .render(renderingContext);
-        return DefaultSelectStatementProvider.withSelectStatement(fragmentAndParameters.fragment())
-                .withParameters(fragmentAndParameters.parameters())
-                .build();
+    private FragmentAndParameters renderPagingModel(PagingModel pagingModel) {
+        return new PagingModelRenderer.Builder()
+                .withPagingModel(pagingModel)
+                .withRenderingContext(renderingContext)
+                .build()
+                .render();
     }
 
     public static Builder withSelectModel(SelectModel selectModel) {
@@ -48,10 +82,10 @@ public static Builder withSelectModel(SelectModel selectModel) {
 
     public static class Builder {
         private SelectModel selectModel;
-        private RenderingStrategy renderingStrategy;
+        private RenderingContext renderingContext;
 
-        public Builder withRenderingStrategy(RenderingStrategy renderingStrategy) {
-            this.renderingStrategy = renderingStrategy;
+        public Builder withRenderingContext(RenderingContext renderingContext) {
+            this.renderingContext = renderingContext;
             return this;
         }