Merge pull request #24 from jeffgbutler/master

Column JDBC Type Should be Optional

Author: jeffgbutler

pom.xml

@@ -142,7 +142,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>5.0.2.RELEASE</version>
+      <version>5.0.3.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -36,7 +36,7 @@ public interface BindableColumn<T> extends BasicColumn {
     @Override
     BindableColumn<T> as(String alias);
 
-    JDBCType jdbcType();
+    Optional<JDBCType> jdbcType();
 
     Optional<String> typeHandler();
 }

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

@@ -27,14 +27,14 @@ public class SqlColumn<T> implements BindableColumn<T>, SortSpecification {
     protected SqlTable table;
     protected JDBCType jdbcType;
     protected boolean isDescending = false;
-    protected Optional<String> alias = Optional.empty();
-    protected Optional<String> typeHandler;
+    protected String alias;
+    protected String typeHandler;
 
     private SqlColumn(Builder builder) {
         name = Objects.requireNonNull(builder.name);
-        jdbcType = Objects.requireNonNull(builder.jdbcType);
+        jdbcType = builder.jdbcType;
         table = Objects.requireNonNull(builder.table);
-        typeHandler = Optional.ofNullable(builder.typeHandler);
+        typeHandler = builder.typeHandler;
     }
 
     protected SqlColumn(SqlColumn<?> sqlColumn) {
@@ -51,18 +51,18 @@ public String name() {
     }
 
     @Override
-    public JDBCType jdbcType() {
-        return jdbcType;
+    public Optional<JDBCType> jdbcType() {
+        return Optional.ofNullable(jdbcType);
     }
 
     @Override
     public Optional<String> alias() {
-        return alias;
+        return Optional.ofNullable(alias);
     }
 
     @Override
     public Optional<String> typeHandler() {
-        return typeHandler;
+        return Optional.ofNullable(typeHandler);
     }
 
     @Override
@@ -75,7 +75,7 @@ public SortSpecification descending() {
     @Override
     public SqlColumn<T> as(String alias) {
         SqlColumn<T> column = new SqlColumn<>(this);
-        column.alias = Optional.of(alias);
+        column.alias = alias;
         return column;
     }
 
@@ -86,7 +86,7 @@ public boolean isDescending() {
 
     @Override
     public String aliasOrName() {
-        return alias.orElse(name);
+        return alias().orElse(name);
     }
 
     @Override
@@ -98,14 +98,20 @@ public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
 
     public <S> SqlColumn<S> withTypeHandler(String typeHandler) {
         SqlColumn<S> column = new SqlColumn<>(this);
-        column.typeHandler = Optional.of(typeHandler);
+        column.typeHandler = typeHandler;
         return column;
     }
 
     private String applyTableAlias(String tableAlias) {
         return tableAlias + "." + name(); //$NON-NLS-1$
     }
 
+    public static <T> SqlColumn<T> of(String name, SqlTable table) {
+        return SqlColumn.withName(name)
+                .withTable(table)
+                .build();
+    }
+    
     public static <T> SqlColumn<T> of(String name, SqlTable table, JDBCType jdbcType) {
         return SqlColumn.withName(name)
                 .withTable(table)

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

@@ -30,6 +30,10 @@ public String name() {
         return name;
     }
 
+    public <T> SqlColumn<T> column(String name) {
+        return SqlColumn.of(name, this);
+    }
+
     public <T> SqlColumn<T> column(String name, JDBCType jdbcType) {
         return SqlColumn.of(name, this, jdbcType);
     }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -24,10 +24,18 @@ public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String prefi
                 + prefix
                 + "." //$NON-NLS-1$
                 + parameterName
-                + ",jdbcType=" //$NON-NLS-1$
-                + column.jdbcType().getName()
-                + column.typeHandler().map(th -> ",typeHandler=" + th) //$NON-NLS-1$
-                    .orElse("") //$NON-NLS-1$
+                + renderJdbcType(column)
+                + renderTypeHandler(column)
                 + "}"; //$NON-NLS-1$
     }
+    
+    private String renderTypeHandler(BindableColumn<?> column) {
+        return column.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$
+                .orElse(""); //$NON-NLS-1$
+    }
 }

src/main/java/org/mybatis/dynamic/sql/select/aggregate/AbstractAggregate.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -30,15 +30,15 @@
  */
 public abstract class AbstractAggregate<T extends AbstractAggregate<T>> implements BasicColumn {
     protected BasicColumn column;
-    protected Optional<String> alias = Optional.empty();
+    protected String alias;
 
     protected AbstractAggregate(BasicColumn column) {
         this.column = Objects.requireNonNull(column);
     }
 
     @Override
     public Optional<String> alias() {
-        return alias;
+        return Optional.ofNullable(alias);
     }
 
     @Override
@@ -49,7 +49,7 @@ public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
     @Override
     public T as(String alias) {
         T copy = copy();
-        copy.alias = Optional.of(alias);
+        copy.alias = alias;
         return copy;
     }
 

src/main/java/org/mybatis/dynamic/sql/select/function/AbstractFunction.java

@@ -42,7 +42,7 @@ public U as(String alias) {
     }
 
     @Override
-    public JDBCType jdbcType() {
+    public Optional<JDBCType> jdbcType() {
         return column.jdbcType();
     }
 

src/test/java/examples/generated/always/spring/GeneratedAlwaysDynamicSqlSupport.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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,8 +15,6 @@
  */
 package examples.generated.always.spring;
 
-import java.sql.JDBCType;
-
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
@@ -28,10 +26,10 @@ public final class GeneratedAlwaysDynamicSqlSupport {
     public static final SqlColumn<String> fullName = generatedAlways.fullName;
 
     public static final class GeneratedAlways extends SqlTable {
-        public final SqlColumn<Integer> id = column("id", JDBCType.INTEGER);
-        public final SqlColumn<String> firstName = column("first_name", JDBCType.VARCHAR);
-        public final SqlColumn<String> lastName = column("last_name", JDBCType.VARCHAR);
-        public final SqlColumn<String> fullName = column("full_name", JDBCType.VARCHAR);
+        public final SqlColumn<Integer> id = column("id");
+        public final SqlColumn<String> firstName = column("first_name");
+        public final SqlColumn<String> lastName = column("last_name");
+        public final SqlColumn<String> fullName = column("full_name");
 
         public GeneratedAlways() {
             super("GeneratedAlways");