Use select model instead of a builder

Author: jeffgbutler

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

@@ -500,7 +500,7 @@ static CountDistinct countDistinct(BasicColumn column) {
     }
 
     static SubQueryColumn subQuery(Buildable<SelectModel> subQuery) {
-        return SubQueryColumn.of(subQuery);
+        return SubQueryColumn.of(subQuery.build());
     }
 
     static <T> Max<T> max(BindableColumn<T> column) {

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

@@ -15,21 +15,21 @@
  */
 package org.mybatis.dynamic.sql;
 
+import java.util.Objects;
 import java.util.Optional;
 
 import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.select.SelectModel;
 import org.mybatis.dynamic.sql.select.render.SubQueryRenderer;
-import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 
 public class SubQueryColumn implements BasicColumn {
-    private final Buildable<SelectModel> subQuery;
+    private final SelectModel selectModel;
     private @Nullable String alias;
 
-    private SubQueryColumn(Buildable<SelectModel> subQuery) {
-        this.subQuery = subQuery;
+    private SubQueryColumn(SelectModel selectModel) {
+        this.selectModel = Objects.requireNonNull(selectModel);
     }
 
     @Override
@@ -39,22 +39,22 @@ public Optional<String> alias() {
 
     @Override
     public SubQueryColumn as(String alias) {
-        SubQueryColumn answer = new SubQueryColumn(subQuery);
+        SubQueryColumn answer = new SubQueryColumn(selectModel);
         answer.alias = alias;
         return answer;
     }
 
     @Override
     public FragmentAndParameters render(RenderingContext renderingContext) {
-        return SubQueryRenderer.withSelectModel(subQuery.build())
+        return SubQueryRenderer.withSelectModel(selectModel)
                 .withRenderingContext(renderingContext)
                 .withPrefix("(") //$NON-NLS-1$
                 .withSuffix(")") //$NON-NLS-1$
                 .build()
                 .render();
     }
 
-    public static SubQueryColumn of(Buildable<SelectModel> subQuery) {
-        return new SubQueryColumn(subQuery);
+    public static SubQueryColumn of(SelectModel selectModel) {
+        return new SubQueryColumn(selectModel);
     }
 }

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/elements/SqlElements.kt

@@ -143,7 +143,7 @@ fun count(column: BasicColumn): Count = SqlBuilder.count(column)
 fun countDistinct(column: BasicColumn): CountDistinct = SqlBuilder.countDistinct(column)
 
 fun subQuery(subQuery: KotlinSubQueryBuilder.() -> Unit): SubQueryColumn =
-    SubQueryColumn.of(KotlinSubQueryBuilder().apply(subQuery))
+    SubQueryColumn.of(KotlinSubQueryBuilder().apply(subQuery).build())
 
 fun <T : Any> max(column: BindableColumn<T>): Max<T> = SqlBuilder.max(column)