finished execute-api (#19)

* finished execute-api

* added a missing test

* added another missing test-case

README.md

@@ -22,7 +22,7 @@ A Java-Library to build SQL-Statements
 <dependency>
   <groupId>de.jaggl.sqlbuilder</groupId>
   <artifactId>sqlbuilder-core</artifactId>
-  <version>2.5.2</version>
+  <version>2.6.0</version>
 </dependency>
 ```
 

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>de.jaggl.sqlbuilder</groupId>
   <artifactId>sqlbuilder-core</artifactId>
-  <version>2.5.2</version>
+  <version>2.6.0</version>
 
   <packaging>jar</packaging>
 

src/main/java/de/jaggl/sqlbuilder/columns/Column.java

@@ -6,6 +6,7 @@
 import de.jaggl.sqlbuilder.domain.Definable;
 import de.jaggl.sqlbuilder.domain.Groupable;
 import de.jaggl.sqlbuilder.domain.Selectable;
+import de.jaggl.sqlbuilder.domain.SqlTypeSupplier;
 import de.jaggl.sqlbuilder.schema.Table;
 import de.jaggl.sqlbuilder.utils.BuilderUtils;
 import de.jaggl.sqlbuilder.utils.Indentation;
@@ -21,7 +22,7 @@
 @AllArgsConstructor
 @Getter
 @ToString
-public abstract class Column implements Groupable, Selectable, Definable, NullableConditions, EqualityConditions
+public abstract class Column implements Groupable, Selectable, Definable, NullableConditions, EqualityConditions, SqlTypeSupplier
 {
     @ToString.Exclude
     protected Table table;
@@ -31,6 +32,8 @@ public abstract class Column implements Groupable, Selectable, Definable, Nullab
 
     protected ColumnDefinition columnDefinition;
 
+    private int sqlType;
+
     @Override
     public String getValue(BuildingContext context, Indentation indentation)
     {

src/main/java/de/jaggl/sqlbuilder/columns/datetime/DateColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.datetime;
 
+import static java.sql.Types.DATE;
+
 import java.time.ZonedDateTime;
 import java.time.temporal.Temporal;
 import java.util.function.Function;
@@ -26,7 +28,7 @@ public Function<ZonedDateTime, Temporal> getDateConversion()
 
     public DateColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, DATE);
     }
 
     public DateColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/datetime/DateTimeColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.datetime;
 
+import static java.sql.Types.TIMESTAMP;
+
 import java.time.ZonedDateTime;
 import java.time.temporal.Temporal;
 import java.util.function.Function;
@@ -26,7 +28,7 @@ public Function<ZonedDateTime, Temporal> getDateConversion()
 
     public DateTimeColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, TIMESTAMP);
     }
 
     public DateTimeColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/number/NumberColumn.java

@@ -14,8 +14,8 @@
 @ToString(callSuper = true)
 public abstract class NumberColumn<T extends NumberColumn<T, N>, N extends Number> extends Column implements NumberConditions
 {
-    public NumberColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
+    public NumberColumn(Table table, String name, String alias, ColumnDefinition columnDefinition, int sqlType)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, sqlType);
     }
 }

src/main/java/de/jaggl/sqlbuilder/columns/number/doubletype/DecimalColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.number.doubletype;
 
+import static java.sql.Types.DECIMAL;
+
 import de.jaggl.sqlbuilder.columns.ColumnDefinition;
 import de.jaggl.sqlbuilder.schema.Table;
 import lombok.ToString;
@@ -14,7 +16,7 @@ public class DecimalColumn extends DoubleTypeColumn<DecimalColumn>
 {
     public DecimalColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, DECIMAL);
     }
 
     public DecimalColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/number/doubletype/DoubleColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.number.doubletype;
 
+import static java.sql.Types.DOUBLE;
+
 import de.jaggl.sqlbuilder.columns.ColumnDefinition;
 import de.jaggl.sqlbuilder.schema.Table;
 import lombok.ToString;
@@ -14,7 +16,7 @@ public class DoubleColumn extends DoubleTypeColumn<DoubleColumn>
 {
     public DoubleColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, DOUBLE);
     }
 
     public DoubleColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/number/doubletype/DoubleTypeColumn.java

@@ -24,8 +24,8 @@ public abstract class DoubleTypeColumn<T extends DoubleTypeColumn<T>> extends Nu
         FORMAT.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.GERMAN));
     }
 
-    public DoubleTypeColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
+    public DoubleTypeColumn(Table table, String name, String alias, ColumnDefinition columnDefinition, int sqlType)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, sqlType);
     }
 }

src/main/java/de/jaggl/sqlbuilder/columns/number/doubletype/FloatColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.number.doubletype;
 
+import static java.sql.Types.FLOAT;
+
 import de.jaggl.sqlbuilder.columns.ColumnDefinition;
 import de.jaggl.sqlbuilder.schema.Table;
 import lombok.ToString;
@@ -14,7 +16,7 @@ public class FloatColumn extends DoubleTypeColumn<FloatColumn>
 {
     public FloatColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, FLOAT);
     }
 
     public FloatColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/number/integer/BigIntColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.number.integer;
 
+import static java.sql.Types.BIGINT;
+
 import de.jaggl.sqlbuilder.columns.ColumnDefinition;
 import de.jaggl.sqlbuilder.schema.Table;
 import lombok.ToString;
@@ -14,7 +16,7 @@ public class BigIntColumn extends IntegerColumn<BigIntColumn>
 {
     public BigIntColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, BIGINT);
     }
 
     public BigIntColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/number/integer/IntColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.number.integer;
 
+import static java.sql.Types.INTEGER;
+
 import de.jaggl.sqlbuilder.columns.ColumnDefinition;
 import de.jaggl.sqlbuilder.schema.Table;
 import lombok.ToString;
@@ -14,7 +16,7 @@ public class IntColumn extends IntegerColumn<IntColumn>
 {
     public IntColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, INTEGER);
     }
 
     public IntColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/number/integer/IntegerColumn.java

@@ -13,8 +13,8 @@
 @ToString(callSuper = true)
 public abstract class IntegerColumn<T extends IntegerColumn<T>> extends NumberColumn<T, Integer>
 {
-    public IntegerColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
+    public IntegerColumn(Table table, String name, String alias, ColumnDefinition columnDefinition, int sqlType)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, sqlType);
     }
 }

src/main/java/de/jaggl/sqlbuilder/columns/number/integer/MediumIntColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.number.integer;
 
+import static java.sql.Types.INTEGER;
+
 import de.jaggl.sqlbuilder.columns.ColumnDefinition;
 import de.jaggl.sqlbuilder.schema.Table;
 import lombok.ToString;
@@ -14,7 +16,7 @@ public class MediumIntColumn extends IntegerColumn<MediumIntColumn>
 {
     public MediumIntColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, INTEGER);
     }
 
     public MediumIntColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/number/integer/SmallIntColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.number.integer;
 
+import static java.sql.Types.SMALLINT;
+
 import de.jaggl.sqlbuilder.columns.ColumnDefinition;
 import de.jaggl.sqlbuilder.schema.Table;
 import lombok.ToString;
@@ -14,7 +16,7 @@ public class SmallIntColumn extends IntegerColumn<SmallIntColumn>
 {
     public SmallIntColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, SMALLINT);
     }
 
     public SmallIntColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/number/integer/TinyIntColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.number.integer;
 
+import static java.sql.Types.TINYINT;
+
 import de.jaggl.sqlbuilder.columns.ColumnDefinition;
 import de.jaggl.sqlbuilder.schema.Table;
 import lombok.ToString;
@@ -14,7 +16,7 @@ public class TinyIntColumn extends IntegerColumn<TinyIntColumn>
 {
     public TinyIntColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, TINYINT);
     }
 
     public TinyIntColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/string/CharColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.string;
 
+import static java.sql.Types.CHAR;
+
 import de.jaggl.sqlbuilder.columns.ColumnDefinition;
 import de.jaggl.sqlbuilder.schema.Table;
 import lombok.ToString;
@@ -14,7 +16,7 @@ public class CharColumn extends StringColumn<CharColumn>
 {
     CharColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, CHAR);
     }
 
     public CharColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/string/StringColumn.java

@@ -14,8 +14,8 @@
 @ToString(callSuper = true)
 public abstract class StringColumn<T extends StringColumn<T>> extends Column implements StringConditions
 {
-    public StringColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
+    public StringColumn(Table table, String name, String alias, ColumnDefinition columnDefinition, int sqlType)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, sqlType);
     }
 }

src/main/java/de/jaggl/sqlbuilder/columns/string/TextColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.string;
 
+import static java.sql.Types.VARCHAR;
+
 import de.jaggl.sqlbuilder.columns.ColumnDefinition;
 import de.jaggl.sqlbuilder.schema.Table;
 import lombok.ToString;
@@ -14,7 +16,7 @@ public class TextColumn extends StringColumn<TextColumn>
 {
     TextColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, VARCHAR);
     }
 
     public TextColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/columns/string/VarCharColumn.java

@@ -1,5 +1,7 @@
 package de.jaggl.sqlbuilder.columns.string;
 
+import static java.sql.Types.VARCHAR;
+
 import de.jaggl.sqlbuilder.columns.ColumnDefinition;
 import de.jaggl.sqlbuilder.schema.Table;
 import lombok.ToString;
@@ -14,7 +16,7 @@ public class VarCharColumn extends StringColumn<VarCharColumn>
 {
     VarCharColumn(Table table, String name, String alias, ColumnDefinition columnDefinition)
     {
-        super(table, name, alias, columnDefinition);
+        super(table, name, alias, columnDefinition, VARCHAR);
     }
 
     public VarCharColumn as(String alias)

src/main/java/de/jaggl/sqlbuilder/conditions/CombinedCondition.java

@@ -26,11 +26,13 @@ public class CombinedCondition extends Condition
     public CombinedCondition(Condition condition)
     {
         this.conditions.add(condition);
+        addPlaceholderSqlTypes(condition.getPlaceholderSqlTypes());
     }
 
     public void append(Condition condition)
     {
         conditions.add(condition);
+        addPlaceholderSqlTypes(condition.getPlaceholderSqlTypes());
     }
 
     @Override
@@ -77,6 +79,7 @@ public static Condition getCopy(Condition condition)
             copy.conditions = conditions;
             copy.setType(condition.getType());
             copy.setConcatenation(condition.getConcatenation());
+            copy.addPlaceholderSqlTypes(condition.getPlaceholderSqlTypes());
             return copy;
         }
         return condition;