SelectRenderer should return FragmentAndParameters

jeffgbutler · jeffgbutler · commit 283f0a5f281c · 2024-11-19T10:27:56.000-05:00
Many usages of the select renderer are for sub queries - no need to build an intermediate statement provider in those cases.
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/InsertSelectRenderer.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/InsertSelectRenderer.java
@@ -27,7 +27,7 @@
 import org.mybatis.dynamic.sql.insert.InsertSelectModel;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
-import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.StringUtilities;
 
 public class InsertSelectRenderer {
@@ -43,18 +43,18 @@ private InsertSelectRenderer(Builder builder) {
     }
 
     public InsertSelectStatementProvider render() {
-        SelectStatementProvider selectStatement = model.selectModel().render(renderingContext);
+        FragmentAndParameters selectStatement = model.selectModel().render(renderingContext);
 
         String statementStart = InsertRenderingUtilities.calculateInsertStatementStart(model.table());
         Optional<String> columnsPhrase = calculateColumnsPhrase();
-        String renderedSelectStatement = selectStatement.getSelectStatement();
+        String renderedSelectStatement = selectStatement.fragment();
 
         String insertStatement = statementStart
                 + columnsPhrase.map(StringUtilities::spaceBefore).orElse("") //$NON-NLS-1$
                 + spaceBefore(renderedSelectStatement);
 
         return DefaultGeneralInsertStatementProvider.withInsertStatement(insertStatement)
-                .withParameters(selectStatement.getParameters())
+                .withParameters(selectStatement.parameters())
                 .build();
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/render/RendererFactory.java b/src/main/java/org/mybatis/dynamic/sql/render/RendererFactory.java
@@ -42,6 +42,7 @@
 import org.mybatis.dynamic.sql.update.UpdateModel;
 import org.mybatis.dynamic.sql.update.render.UpdateRenderer;
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
+import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 
 public interface RendererFactory {
     static Renderer<RenderingStrategy, DeleteStatementProvider> createDeleteRenderer(DeleteModel deleteModel,
@@ -105,7 +106,7 @@ static Renderer<RenderingStrategy, SelectStatementProvider> createMultiSelectRen
                 .render();
     }
 
-    static Renderer<RenderingContext, SelectStatementProvider> createSelectRenderer(
+    static Renderer<RenderingContext, FragmentAndParameters> createSelectRenderer(
             SelectModel selectModel) {
         return renderingContext -> SelectRenderer.withSelectModel(selectModel)
                 .withRenderingContext(renderingContext)
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/SelectModel.java b/src/main/java/org/mybatis/dynamic/sql/select/SelectModel.java
@@ -24,7 +24,9 @@
 import org.mybatis.dynamic.sql.render.RendererFactory;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.select.render.DefaultSelectStatementProvider;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.Validator;
 
 public class SelectModel extends AbstractSelectModel {
@@ -45,7 +47,10 @@ public SelectStatementProvider render(RenderingStrategy renderingStrategy) {
         RenderingContext renderingContext = RenderingContext.withRenderingStrategy(renderingStrategy)
                 .withStatementConfiguration(statementConfiguration)
                 .build();
-        return render(renderingContext);
+        FragmentAndParameters fragmentAndParameters = render(renderingContext);
+        return DefaultSelectStatementProvider.withSelectStatement(fragmentAndParameters.fragment())
+                .withParameters(fragmentAndParameters.parameters())
+                .build();
     }
 
     /**
@@ -55,7 +60,7 @@ public SelectStatementProvider render(RenderingStrategy renderingStrategy) {
      * @return a rendered select statement and parameters
      */
     @NotNull
-    public SelectStatementProvider render(RenderingContext renderingContext) {
+    public FragmentAndParameters render(RenderingContext renderingContext) {
         return RendererFactory.createSelectRenderer(this).render(renderingContext);
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/render/MultiSelectRenderer.java b/src/main/java/org/mybatis/dynamic/sql/select/render/MultiSelectRenderer.java
@@ -65,21 +65,13 @@ private SelectStatementProvider toSelectStatementProvider(FragmentCollector frag
     }
 
     private FragmentAndParameters renderSelect(SelectModel selectModel) {
-        SelectStatementProvider selectStatement = selectModel.render(renderingContext);
-
-        return FragmentAndParameters
-                .withFragment("(" + selectStatement.getSelectStatement() + ")") //$NON-NLS-1$ //$NON-NLS-2$
-                .withParameters(selectStatement.getParameters())
-                .build();
+        return selectModel.render(renderingContext)
+                .mapFragment(f -> "(" + f + ")"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     private FragmentAndParameters renderSelect(UnionQuery unionQuery) {
-        SelectStatementProvider selectStatement = unionQuery.selectModel().render(renderingContext);
-
-        return FragmentAndParameters.withFragment(
-                unionQuery.connector() + " (" + selectStatement.getSelectStatement() + ")") //$NON-NLS-1$ //$NON-NLS-2$
-                .withParameters(selectStatement.getParameters())
-                .build();
+        return unionQuery.selectModel().render(renderingContext)
+                .mapFragment(f -> unionQuery.connector() + " (" + f + ")"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     private Optional<FragmentAndParameters> renderOrderBy() {
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/render/SelectRenderer.java b/src/main/java/org/mybatis/dynamic/sql/select/render/SelectRenderer.java
@@ -37,7 +37,7 @@ private SelectRenderer(Builder builder) {
         renderingContext = Objects.requireNonNull(builder.renderingContext);
     }
 
-    public SelectStatementProvider render() {
+    public FragmentAndParameters render() {
         FragmentCollector fragmentCollector = selectModel
                 .queryExpressions()
                 .map(this::renderQueryExpression)
@@ -46,14 +46,7 @@ public SelectStatementProvider render() {
         renderOrderBy().ifPresent(fragmentCollector::add);
         renderPagingModel().ifPresent(fragmentCollector::add);
 
-        return toSelectStatementProvider(fragmentCollector);
-    }
-
-    private SelectStatementProvider toSelectStatementProvider(FragmentCollector fragmentCollector) {
-        return DefaultSelectStatementProvider
-                .withSelectStatement(fragmentCollector.collectFragments(Collectors.joining(" "))) //$NON-NLS-1$
-                .withParameters(fragmentCollector.parameters())
-                .build();
+        return fragmentCollector.toFragmentAndParameters(Collectors.joining(" ")); //$NON-NLS-1$
     }
 
     private FragmentAndParameters renderQueryExpression(QueryExpressionModel queryExpressionModel) {
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/render/TableExpressionRenderer.java b/src/main/java/org/mybatis/dynamic/sql/select/render/TableExpressionRenderer.java
@@ -39,15 +39,8 @@ public FragmentAndParameters visit(SqlTable table) {
 
     @Override
     public FragmentAndParameters visit(SubQuery subQuery) {
-        SelectStatementProvider selectStatement = subQuery.selectModel().render(renderingContext);
-
-        String fragment = "(" + selectStatement.getSelectStatement() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-
-        fragment = applyAlias(fragment, subQuery);
-
-        return FragmentAndParameters.withFragment(fragment)
-                .withParameters(selectStatement.getParameters())
-                .build();
+        return subQuery.selectModel().render(renderingContext)
+                .mapFragment(f -> applyAlias("(" + f + ")", subQuery)); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     private String applyAlias(String fragment, SubQuery subQuery) {
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/render/SetPhraseVisitor.java b/src/main/java/org/mybatis/dynamic/sql/update/render/SetPhraseVisitor.java
@@ -20,7 +20,6 @@
 
 import org.mybatis.dynamic.sql.render.RenderedParameterInfo;
 import org.mybatis.dynamic.sql.render.RenderingContext;
-import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 import org.mybatis.dynamic.sql.util.ColumnToColumnMapping;
 import org.mybatis.dynamic.sql.util.ConstantMapping;
@@ -84,28 +83,15 @@ public <T> Optional<FragmentAndParameters> visit(ValueWhenPresentMapping<T> mapp
 
     @Override
     public Optional<FragmentAndParameters> visit(SelectMapping mapping) {
-        SelectStatementProvider selectStatement = mapping.selectModel().render(renderingContext);
-        String fragment = renderingContext.aliasedColumnName(mapping.column())
-                + " = (" //$NON-NLS-1$
-                + selectStatement.getSelectStatement()
-                + ")"; //$NON-NLS-1$
-
-        return FragmentAndParameters.withFragment(fragment)
-                .withParameters(selectStatement.getParameters())
-                .buildOptional();
+        return Optional.of(mapping.selectModel().render(renderingContext)
+                .mapFragment(f -> renderingContext.aliasedColumnName(mapping.column())
+                        + " = (" + f + ")")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
     public Optional<FragmentAndParameters> visit(ColumnToColumnMapping mapping) {
-        FragmentAndParameters renderedColumn = mapping.rightColumn().render(renderingContext);
-
-        String setPhrase = renderingContext.aliasedColumnName(mapping.column())
-                + " = "  //$NON-NLS-1$
-                + renderedColumn.fragment();
-
-        return FragmentAndParameters.withFragment(setPhrase)
-                .withParameters(renderedColumn.parameters())
-                .buildOptional();
+        return Optional.of(mapping.rightColumn().render(renderingContext)
+                .mapFragment(f -> renderingContext.aliasedColumnName(mapping.column()) + " = " + f)); //$NON-NLS-1$
     }
 
     private <T> Optional<FragmentAndParameters> buildValueFragment(AbstractColumnMapping mapping, T value) {
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/render/CriterionRenderer.java b/src/main/java/org/mybatis/dynamic/sql/where/render/CriterionRenderer.java
@@ -30,7 +30,6 @@
 import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.SqlCriterionVisitor;
 import org.mybatis.dynamic.sql.render.RenderingContext;
-import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
 
@@ -120,17 +119,8 @@ private <T> Optional<FragmentAndParameters> renderColumnAndCondition(ColumnAndCo
     private FragmentAndParameters renderExists(ExistsCriterion criterion) {
         ExistsPredicate existsPredicate = criterion.existsPredicate();
 
-        SelectStatementProvider selectStatement = existsPredicate.selectModelBuilder().build().render(renderingContext);
-
-        String fragment = existsPredicate.operator()
-                + " (" //$NON-NLS-1$
-                + selectStatement.getSelectStatement()
-                + ")"; //$NON-NLS-1$
-
-        return FragmentAndParameters
-                .withFragment(fragment)
-                .withParameters(selectStatement.getParameters())
-                .build();
+        return existsPredicate.selectModelBuilder().build().render(renderingContext)
+                .mapFragment(f -> existsPredicate.operator() + " (" + f + ")"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     private List<RenderedCriterion> renderSubCriteria(List<AndOrCriteriaGroup> subCriteria) {
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/render/DefaultConditionVisitor.java b/src/main/java/org/mybatis/dynamic/sql/where/render/DefaultConditionVisitor.java
@@ -30,7 +30,6 @@
 import org.mybatis.dynamic.sql.ConditionVisitor;
 import org.mybatis.dynamic.sql.render.RenderedParameterInfo;
 import org.mybatis.dynamic.sql.render.RenderingContext;
-import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
 
@@ -95,16 +94,8 @@ public FragmentAndParameters visit(AbstractTwoValueCondition<T> condition) {
 
     @Override
     public FragmentAndParameters visit(AbstractSubselectCondition<T> condition) {
-        SelectStatementProvider selectStatement = condition.selectModel().render(renderingContext);
-
-        String finalFragment = condition.operator()
-                + " (" //$NON-NLS-1$
-                + selectStatement.getSelectStatement()
-                + ")"; //$NON-NLS-1$
-
-        return FragmentAndParameters.withFragment(finalFragment)
-                .withParameters(selectStatement.getParameters())
-                .build();
+        return condition.selectModel().render(renderingContext)
+                .mapFragment(f -> condition.operator() + " (" + f + ")"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
