Allow rendering parameters that aren't columns

jeffgbutler · jeffgbutler · commit 7ff0d1d1045c · 2019-03-18T21:41:21.000-04:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/SqlColumn.java b/src/main/java/org/mybatis/dynamic/sql/SqlColumn.java
@@ -33,7 +33,7 @@ public class SqlColumn<T> implements BindableColumn<T>, SortSpecification {
     private SqlColumn(Builder builder) {
         name = Objects.requireNonNull(builder.name);
         jdbcType = builder.jdbcType;
-        table = builder.table;
+        table = Objects.requireNonNull(builder.table);
         typeHandler = builder.typeHandler;
     }
     
@@ -89,14 +89,9 @@ public String aliasOrName() {
         return alias().orElse(name);
     }
     
-    public Optional<SqlTable> table() {
-        return Optional.ofNullable(table);
-    }
-    
     @Override
     public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
-        return table()
-                .flatMap(tableAliasCalculator::aliasForColumn)
+        return tableAliasCalculator.aliasForColumn(table)
                 .map(this::applyTableAlias)
                 .orElseGet(this::name);
     }
@@ -111,10 +106,6 @@ private String applyTableAlias(String tableAlias) {
         return tableAlias + "." + name(); //$NON-NLS-1$
     }
     
-    public static <T> SqlColumn<T> of(String name) {
-        return SqlColumn.withName(name).build();
-    }
-
     public static <T> SqlColumn<T> of(String name, SqlTable table) {
         return SqlColumn.withName(name)
                 .withTable(table)
diff --git a/src/main/java/org/mybatis/dynamic/sql/render/MyBatis3RenderingStrategy.java b/src/main/java/org/mybatis/dynamic/sql/render/MyBatis3RenderingStrategy.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -15,11 +15,13 @@
  */
 package org.mybatis.dynamic.sql.render;
 
+import java.util.Optional;
+
 import org.mybatis.dynamic.sql.BindableColumn;
 
 public class MyBatis3RenderingStrategy extends RenderingStrategy {
     @Override
-    public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String prefix, String parameterName) {
+    public String getFormattedJdbcPlaceholder(Optional<BindableColumn<?>> column, String prefix, String parameterName) {
         return "#{" //$NON-NLS-1$
                 + prefix
                 + "." //$NON-NLS-1$
@@ -29,13 +31,17 @@ public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String prefi
                 + "}"; //$NON-NLS-1$
     }
     
-    private String renderTypeHandler(BindableColumn<?> column) {
-        return column.typeHandler().map(th -> ",typeHandler=" + th) //$NON-NLS-1$
+    private String renderTypeHandler(Optional<BindableColumn<?>> column) {
+        return column
+                .flatMap(BindableColumn::typeHandler)
+                .map(th -> ",typeHandler=" + th) //$NON-NLS-1$
                 .orElse(""); //$NON-NLS-1$
     }
     
-    private String renderJdbcType(BindableColumn<?> column) {
-        return column.jdbcType().map(jt -> ",jdbcType=" + jt.getName()) //$NON-NLS-1$
+    private String renderJdbcType(Optional<BindableColumn<?>> column) {
+        return column
+                .flatMap(BindableColumn::jdbcType)
+                .map(jt -> ",jdbcType=" + jt.getName()) //$NON-NLS-1$
                 .orElse(""); //$NON-NLS-1$
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/render/RenderingStrategy.java b/src/main/java/org/mybatis/dynamic/sql/render/RenderingStrategy.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -15,11 +15,21 @@
  */
 package org.mybatis.dynamic.sql.render;
 
+import java.util.Optional;
+
 import org.mybatis.dynamic.sql.BindableColumn;
 
 public abstract class RenderingStrategy {
     public static final RenderingStrategy MYBATIS3 = new MyBatis3RenderingStrategy();
     public static final RenderingStrategy SPRING_NAMED_PARAMETER = new SpringNamedParameterRenderingStrategy();
     
-    public abstract String getFormattedJdbcPlaceholder(BindableColumn<?> column, String prefix, String parameterName);
+    public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String prefix, String parameterName) {
+        return getFormattedJdbcPlaceholder(Optional.of(column), prefix, parameterName);
+    }
+
+    public String getFormattedJdbcPlaceholder(String prefix, String parameterName) {
+        return getFormattedJdbcPlaceholder(Optional.empty(), prefix, parameterName);
+    }
+
+    public abstract String getFormattedJdbcPlaceholder(Optional<BindableColumn<?>> column, String prefix, String parameterName);
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/render/SpringNamedParameterRenderingStrategy.java b/src/main/java/org/mybatis/dynamic/sql/render/SpringNamedParameterRenderingStrategy.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -15,13 +15,14 @@
  */
 package org.mybatis.dynamic.sql.render;
 
+import java.util.Optional;
+
 import org.mybatis.dynamic.sql.BindableColumn;
 
 public class SpringNamedParameterRenderingStrategy extends RenderingStrategy {
     
     @Override
-    public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String prefix, String parameterName) {
+    public String getFormattedJdbcPlaceholder(Optional<BindableColumn<?>> column, String prefix, String parameterName) {
         return ":" + parameterName; //$NON-NLS-1$
     }
-
 }
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
@@ -20,9 +20,7 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.SortSpecification;
-import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.OrderByModel;
 import org.mybatis.dynamic.sql.select.QueryExpressionModel;
@@ -81,15 +79,13 @@ private String orderByPhrase(SortSpecification column) {
     }
     
     private String renderLimit(Map<String, Object> parameters, Long limit) {
-        BindableColumn<Integer> bc = SqlColumn.of(LIMIT_PARAMETER);
-        String placeholder = renderingStrategy.getFormattedJdbcPlaceholder(bc, "parameters", LIMIT_PARAMETER); //$NON-NLS-1$ 
+        String placeholder = renderingStrategy.getFormattedJdbcPlaceholder("parameters", LIMIT_PARAMETER); //$NON-NLS-1$ 
         parameters.put(LIMIT_PARAMETER, limit);
         return "limit " + placeholder; //$NON-NLS-1$
     }
     
     private String renderOffset(Map<String, Object> parameters, Long offset) {
-        BindableColumn<Integer> bc = SqlColumn.of(OFFSET_PARAMETER);
-        String placeholder = renderingStrategy.getFormattedJdbcPlaceholder(bc, "parameters", OFFSET_PARAMETER); //$NON-NLS-1$
+        String placeholder = renderingStrategy.getFormattedJdbcPlaceholder("parameters", OFFSET_PARAMETER); //$NON-NLS-1$
         parameters.put(OFFSET_PARAMETER, offset);
         return "offset " + placeholder; //$NON-NLS-1$
     }
