Merge pull request mybatis#108 from jeffgbutler/master

jeffgbutler · web-flow · commit b18f7dbc339b · 2019-07-03T07:14:44.000-04:00
Add support for calling where with no parameters
diff --git a/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java b/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java
@@ -133,6 +133,10 @@ static UpdateDSL<UpdateModel> update(SqlTable table) {
         return UpdateDSL.update(table);
     }
 
+    static WhereDSL where() {
+        return WhereDSL.where();
+    }
+    
     static <T> WhereDSL where(BindableColumn<T> column, VisitableCondition<T> condition) {
         return WhereDSL.where(column, condition);
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java b/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.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.
@@ -35,6 +35,10 @@ private DeleteDSL(SqlTable table, Function<DeleteModel, R> adapterFunction) {
         this.adapterFunction = Objects.requireNonNull(adapterFunction);
     }
     
+    public DeleteWhereBuilder where() {
+        return new DeleteWhereBuilder();
+    }
+    
     public <T> DeleteWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition) {
         return new DeleteWhereBuilder(column, condition);
     }
@@ -70,6 +74,10 @@ public static <T> DeleteDSL<MyBatis3DeleteModelAdapter<T>> deleteFromWithMapper(
     
     public class DeleteWhereBuilder extends AbstractWhereDSL<DeleteWhereBuilder> {
         
+        private <T> DeleteWhereBuilder() {
+            super();
+        }
+        
         private <T> DeleteWhereBuilder(BindableColumn<T> column, VisitableCondition<T> condition) {
             super(column, condition);
         }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java
@@ -82,6 +82,10 @@ public static <R> FromGatherer<R> selectDistinct(SelectDSL<R> selectDSL, BasicCo
                 .build();
     }
     
+    public QueryExpressionWhereBuilder where() {
+        return new QueryExpressionWhereBuilder();
+    }
+
     public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition) {
         return new QueryExpressionWhereBuilder(column, condition);
     }
@@ -261,6 +265,10 @@ public FromGatherer<R> build() {
     
     public class QueryExpressionWhereBuilder extends AbstractWhereDSL<QueryExpressionWhereBuilder>
             implements Buildable<R> {
+        private <T> QueryExpressionWhereBuilder() {
+            buildDelegateMethod = this::internalBuild;
+        }
+
         private <T> QueryExpressionWhereBuilder(BindableColumn<T> column, VisitableCondition<T> condition) {
             super(column, condition);
             buildDelegateMethod = this::internalBuild;
@@ -413,6 +421,11 @@ private R internalbuild() {
             return selectDSL.build();
         }
         
+        public QueryExpressionWhereBuilder where() {
+            joinModel = buildJoinModel();
+            return new QueryExpressionWhereBuilder();
+        }
+        
         public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition) {
             joinModel = buildJoinModel();
             return new QueryExpressionWhereBuilder(column, condition);
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java b/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.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.
@@ -54,6 +54,10 @@ public <T> SetClauseFinisher<T> set(SqlColumn<T> column) {
         return new SetClauseFinisher<>(column);
     }
     
+    public UpdateWhereBuilder where() {
+        return new UpdateWhereBuilder();
+    }
+    
     public <T> UpdateWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition) {
         return new UpdateWhereBuilder(column, condition);
     }
@@ -145,6 +149,10 @@ public UpdateDSL<R> equalToWhenPresent(Supplier<T> valueSupplier) {
 
     public class UpdateWhereBuilder extends AbstractWhereDSL<UpdateWhereBuilder> {
         
+        public <T> UpdateWhereBuilder() {
+            super();
+        }
+        
         public <T> UpdateWhereBuilder(BindableColumn<T> column, VisitableCondition<T> condition) {
             super(column, condition);
         }
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java b/src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.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.
@@ -26,6 +26,10 @@
 public abstract class AbstractWhereDSL<T extends AbstractWhereDSL<T>> {
     private List<SqlCriterion<?>> criteria = new ArrayList<>();
     
+    protected <S> AbstractWhereDSL() {
+        super();
+    }
+    
     protected <S> AbstractWhereDSL(BindableColumn<S> column, VisitableCondition<S> condition) {
         SqlCriterion<S> criterion = SqlCriterion.withColumn(column)
                 .withCondition(condition)
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/WhereDSL.java b/src/main/java/org/mybatis/dynamic/sql/where/WhereDSL.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.
@@ -21,6 +21,10 @@
 
 public class WhereDSL extends AbstractWhereDSL<WhereDSL> {
 
+    private WhereDSL() {
+        super();
+    }
+
     private <T> WhereDSL(BindableColumn<T> column, VisitableCondition<T> condition) {
         super(column, condition);
     }
@@ -34,6 +38,10 @@ protected WhereDSL getThis() {
         return this;
     }
 
+    public static WhereDSL where() {
+        return new WhereDSL();
+    }
+
     public static <T> WhereDSL where(BindableColumn<T> column, VisitableCondition<T> condition) {
         return new WhereDSL(column, condition);
     }
diff --git a/src/test/java/examples/emptywhere/EmptyWhereTest.java b/src/test/java/examples/emptywhere/EmptyWhereTest.java
diff --git a/src/test/java/examples/emptywhere/OrderDynamicSqlSupport.java b/src/test/java/examples/emptywhere/OrderDynamicSqlSupport.java
diff --git a/src/test/java/examples/emptywhere/PersonDynamicSqlSupport.java b/src/test/java/examples/emptywhere/PersonDynamicSqlSupport.java

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,10 @@ static UpdateDSL<UpdateModel> update(SqlTable table) {`
`133`	`133`	`return UpdateDSL.update(table);`
`134`	`134`	`}`
`135`	`135`
	`136`	`+ static WhereDSL where() {`
	`137`	`+ return WhereDSL.where();`
	`138`	`+ }`
	`139`	`+`
`136`	`140`	`static <T> WhereDSL where(BindableColumn<T> column, VisitableCondition<T> condition) {`
`137`	`141`	`return WhereDSL.where(column, condition);`
`138`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * Copyright 2016-2017 the original author or authors.`
	`2`	`+ * Copyright 2016-2019 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -35,6 +35,10 @@ private DeleteDSL(SqlTable table, Function<DeleteModel, R> adapterFunction) {`
`35`	`35`	`this.adapterFunction = Objects.requireNonNull(adapterFunction);`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ public DeleteWhereBuilder where() {`
	`39`	`+ return new DeleteWhereBuilder();`
	`40`	`+ }`
	`41`	`+`
`38`	`42`	`public <T> DeleteWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition) {`
`39`	`43`	`return new DeleteWhereBuilder(column, condition);`
`40`	`44`	`}`
`@@ -70,6 +74,10 @@ public static <T> DeleteDSL<MyBatis3DeleteModelAdapter<T>> deleteFromWithMapper(`
`70`	`74`
`71`	`75`	`public class DeleteWhereBuilder extends AbstractWhereDSL<DeleteWhereBuilder> {`
`72`	`76`
	`77`	`+ private <T> DeleteWhereBuilder() {`
	`78`	`+ super();`
	`79`	`+ }`
	`80`	`+`
`73`	`81`	`private <T> DeleteWhereBuilder(BindableColumn<T> column, VisitableCondition<T> condition) {`
`74`	`82`	`super(column, condition);`
`75`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * Copyright 2016-2018 the original author or authors.`
	`2`	`+ * Copyright 2016-2019 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -54,6 +54,10 @@ public <T> SetClauseFinisher<T> set(SqlColumn<T> column) {`
`54`	`54`	`return new SetClauseFinisher<>(column);`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ public UpdateWhereBuilder where() {`
	`58`	`+ return new UpdateWhereBuilder();`
	`59`	`+ }`
	`60`	`+`
`57`	`61`	`public <T> UpdateWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition) {`
`58`	`62`	`return new UpdateWhereBuilder(column, condition);`
`59`	`63`	`}`
`@@ -145,6 +149,10 @@ public UpdateDSL<R> equalToWhenPresent(Supplier<T> valueSupplier) {`
`145`	`149`
`146`	`150`	`public class UpdateWhereBuilder extends AbstractWhereDSL<UpdateWhereBuilder> {`
`147`	`151`
	`152`	`+ public <T> UpdateWhereBuilder() {`
	`153`	`+ super();`
	`154`	`+ }`
	`155`	`+`
`148`	`156`	`public <T> UpdateWhereBuilder(BindableColumn<T> column, VisitableCondition<T> condition) {`
`149`	`157`	`super(column, condition);`
`150`	`158`	`}`