Make Delete, Insert, Where support model driven

This allows pluggable renderers

Author: jeffgbutler

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

@@ -16,7 +16,6 @@
 package org.mybatis.dynamic.sql;
 
 import java.sql.JDBCType;
-import java.util.Optional;
 
 /**
  * 
@@ -25,21 +24,16 @@
  */
 public class MyBatis3Column<T> extends SqlColumn<T> {
 
-    protected String typeHandler;
 
     protected MyBatis3Column(MyBatis3Column<?> myBatis3Column) {
         super(myBatis3Column);
-        this.typeHandler = myBatis3Column.typeHandler;
     }
 
     protected MyBatis3Column(String name, JDBCType jdbcType) {
         super(name, jdbcType);
     }
 
-    public Optional<String> typeHandler() {
-        return Optional.ofNullable(typeHandler);
-    }
-    
+    @Override
     public <S> MyBatis3Column<S> withTypeHandler(String typeHandler) {
         MyBatis3Column<S> column = new MyBatis3Column<>(this);
         column.typeHandler = typeHandler;

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

@@ -15,20 +15,20 @@
  */
 package org.mybatis.dynamic.sql;
 
-import org.mybatis.dynamic.sql.delete.DeleteSupportBuilder;
-import org.mybatis.dynamic.sql.insert.InsertSupportBuilder;
+import org.mybatis.dynamic.sql.delete.DeleteModelBuilder;
+import org.mybatis.dynamic.sql.insert.InsertModelBuilder;
 import org.mybatis.dynamic.sql.select.SelectCountOrDistinctBuilder;
 import org.mybatis.dynamic.sql.select.SelectSupportBuilder;
 import org.mybatis.dynamic.sql.update.UpdateSupportBuilder;
 
 public interface SqlBuilder {
 
-    public static DeleteSupportBuilder deleteFrom(SqlTable table) {
-        return DeleteSupportBuilder.of(table);
+    public static DeleteModelBuilder deleteFrom(SqlTable table) {
+        return DeleteModelBuilder.of(table);
     }
 
-    public static <T> InsertSupportBuilder<T> insert(T record) {
-        return InsertSupportBuilder.of(record);
+    public static <T> InsertModelBuilder<T> insert(T record) {
+        return InsertModelBuilder.insert(record);
     }
 
     public static SelectSupportBuilder select(SqlColumn<?>...columns) {

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

@@ -32,13 +32,15 @@ public class SqlColumn<T> extends AbstractColumn<T> {
     protected JDBCType jdbcType;
     protected String sortOrder = ASCENDING;
     protected String alias;
+    protected String typeHandler;
 
     protected SqlColumn(SqlColumn<?> sqlColumn) {
         super(sqlColumn.name);
         this.table = sqlColumn.table;
         this.jdbcType = sqlColumn.jdbcType;
         this.sortOrder = sqlColumn.sortOrder;
         this.alias = sqlColumn.alias;
+        this.typeHandler = sqlColumn.typeHandler;
     }
 
     protected SqlColumn(String name, JDBCType jdbcType) {
@@ -71,6 +73,10 @@ public Optional<String> columnAlias() {
         return Optional.ofNullable(alias);
     }
 
+    public Optional<String> typeHandler() {
+        return Optional.ofNullable(typeHandler);
+    }
+    
     public <S> SqlColumn<S> inTable(SqlTable table) {
         SqlColumn<S> column = new SqlColumn<>(this);
         column.table = table;
@@ -89,6 +95,12 @@ public <S> SqlColumn<S> withAlias(String alias) {
         return column;
     }
 
+    public <S> SqlColumn<S> withTypeHandler(String typeHandler) {
+        SqlColumn<S> column = new SqlColumn<>(this);
+        column.typeHandler = typeHandler;
+        return column;
+    }
+    
     public String getFormattedJdbcPlaceholder(String prefix, String parameterName) {
         return "{" + prefix + "." + parameterName + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }

src/main/java/org/mybatis/dynamic/sql/delete/DeleteModel.java

@@ -0,0 +1,49 @@
+/**
+ *    Copyright 2016-2017 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.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.delete;
+
+import java.util.Optional;
+
+import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.where.WhereModel;
+
+public class DeleteModel {
+    private SqlTable table;
+    private WhereModel whereModel;
+    
+    private DeleteModel() {
+        super();
+    }
+    
+    public SqlTable table() {
+        return table;
+    }
+    
+    public Optional<WhereModel> whereModel() {
+        return Optional.ofNullable(whereModel);
+    }
+    
+    public static DeleteModel of(SqlTable table) {
+        return of(table, null);
+    }
+
+    public static DeleteModel of(SqlTable table, WhereModel whereModel) {
+        DeleteModel deleteModel = new DeleteModel();
+        deleteModel.table = table;
+        deleteModel.whereModel = whereModel;
+        return deleteModel;
+    }
+}

src/main/java/org/mybatis/dynamic/sql/delete/DeleteSupportBuilder.java src/main/java/org/mybatis/dynamic/sql/delete/DeleteModelBuilder.java

@@ -19,14 +19,15 @@
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.SqlTable;
-import org.mybatis.dynamic.sql.where.AbstractWhereBuilder;
-import org.mybatis.dynamic.sql.where.WhereSupport;
+import org.mybatis.dynamic.sql.delete.render.DeleteRenderer;
+import org.mybatis.dynamic.sql.delete.render.DeleteSupport;
+import org.mybatis.dynamic.sql.where.AbstractWhereModelBuilder;
 
-public class DeleteSupportBuilder {
+public class DeleteModelBuilder {
 
     private SqlTable table;
 
-    private DeleteSupportBuilder(SqlTable table) {
+    private DeleteModelBuilder(SqlTable table) {
         this.table = table;
     }
 
@@ -35,28 +36,35 @@ public <T> DeleteSupportWhereBuilder where(SqlColumn<T> column, Condition<T> con
     }
 
     /**
-     * WARNING! Calling this method will result in an delete statement that deletes
+     * WARNING! Calling this method could result in an delete statement that deletes
      * all rows in a table.
      * 
      * @return
      */
-    public DeleteSupport build() {
-        return DeleteSupport.of(table);
+    public DeleteModel build() {
+        return DeleteModel.of(table);
     }
 
-    public static DeleteSupportBuilder of(SqlTable table) {
-        return new DeleteSupportBuilder(table);
+    public DeleteSupport buildAndRender() {
+        return DeleteRenderer.of(build()).render();
     }
 
-    public class DeleteSupportWhereBuilder extends AbstractWhereBuilder<DeleteSupportWhereBuilder> {
+    public static DeleteModelBuilder of(SqlTable table) {
+        return new DeleteModelBuilder(table);
+    }
+    
+    public class DeleteSupportWhereBuilder extends AbstractWhereModelBuilder<DeleteSupportWhereBuilder> {
 
         private <T> DeleteSupportWhereBuilder(SqlColumn<T> column, Condition<T> condition, SqlCriterion<?>...subCriteria) {
             super(column, condition, subCriteria);
         }
 
-        public DeleteSupport build() {
-            WhereSupport whereSupport = renderCriteriaIgnoringTableAlias();
-            return DeleteSupport.of(whereSupport.getWhereClause(), whereSupport.getParameters(), table);
+        public DeleteModel build() {
+            return DeleteModel.of(table, buildWhereModel());
+        }
+        
+        public DeleteSupport buildAndRender() {
+            return DeleteRenderer.of(build()).render();
         }
 
         @Override

src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteRenderer.java

@@ -0,0 +1,44 @@
+/**
+ *    Copyright 2016-2017 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.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.delete.render;
+
+import org.mybatis.dynamic.sql.delete.DeleteModel;
+import org.mybatis.dynamic.sql.where.WhereModel;
+import org.mybatis.dynamic.sql.where.render.WhereRenderer;
+import org.mybatis.dynamic.sql.where.render.WhereSupport;
+
+public class DeleteRenderer {
+    private DeleteModel deleteModel;
+    
+    private DeleteRenderer(DeleteModel deleteModel) {
+        this.deleteModel = deleteModel;
+    }
+    
+    public DeleteSupport render() {
+        return deleteModel.whereModel().map(this::renderWithWhereClause)
+                .orElse(DeleteSupport.of(deleteModel.table()));
+    }
+    
+    private DeleteSupport renderWithWhereClause(WhereModel whereModel) {
+        WhereRenderer whereRenderer = WhereRenderer.of(whereModel);
+        WhereSupport whereSupport = whereRenderer.renderCriteriaIgnoringTableAlias();
+        return DeleteSupport.of(whereSupport.getWhereClause(), whereSupport.getParameters(), deleteModel.table());
+    }
+    
+    public static DeleteRenderer of(DeleteModel deleteModel) {
+        return new DeleteRenderer(deleteModel);
+    }
+}

src/main/java/org/mybatis/dynamic/sql/delete/DeleteSupport.java src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteSupport.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.mybatis.dynamic.sql.delete;
+package org.mybatis.dynamic.sql.delete.render;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/org/mybatis/dynamic/sql/insert/AbstractColumnMapping.java

@@ -0,0 +1,33 @@
+/**
+ *    Copyright 2016-2017 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.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.insert;
+
+import org.mybatis.dynamic.sql.SqlColumn;
+
+public abstract class AbstractColumnMapping {
+    protected SqlColumn<?> column;
+    
+    protected AbstractColumnMapping(SqlColumn<?> column) {
+        this.column = column;
+    }
+    
+    public SqlColumn<?> column() {
+        return column;
+    }
+    
+    public abstract <R> R accept(ColumnMappingVisitor<R> visitor);
+}
+ 

src/main/java/org/mybatis/dynamic/sql/insert/ColumnMappingVisitor.java

@@ -0,0 +1,22 @@
+/**
+ *    Copyright 2016-2017 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.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.insert;
+
+public interface ColumnMappingVisitor<T> {
+    T visit(NullMapping mapping);
+    T visit(ConstantMapping mapping);
+    T visit(PropertyMapping mapping);
+}

src/main/java/org/mybatis/dynamic/sql/insert/ConstantMapping.java

@@ -0,0 +1,41 @@
+/**
+ *    Copyright 2016-2017 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.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.insert;
+
+import org.mybatis.dynamic.sql.SqlColumn;
+
+public class ConstantMapping extends AbstractColumnMapping {
+    private String constant;
+    
+    private ConstantMapping(SqlColumn<?> column) {
+        super(column);
+    }
+
+    @Override
+    public <S> S accept(ColumnMappingVisitor<S> visitor) {
+        return visitor.visit(this);
+    }
+    
+    public String constant() {
+        return constant;
+    }
+    
+    public static ConstantMapping of(SqlColumn<?> column, String constant) {
+        ConstantMapping mapping = new ConstantMapping(column);
+        mapping.constant = constant;
+        return mapping;
+    }
+}