fixed createTable (create a key for autoIncrementColumn)

de-jaggl · Jan 12, 2020 · 2a93089 · 2a93089
1 parent 7e8b822
commit 2a93089
Show file tree

Hide file tree

Showing 15 changed files with 73 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>de.jaggl.sqlbuilder</groupId>
   <artifactId>sqlbuilder-core</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.2</version>
 
   <packaging>jar</packaging>
 

diff --git a/src/main/java/de/jaggl/sqlbuilder/conditions/DateTimeConditions.java b/src/main/java/de/jaggl/sqlbuilder/conditions/DateTimeConditions.java
@@ -21,6 +21,11 @@
 import de.jaggl.sqlbuilder.columns.Column;
 import de.jaggl.sqlbuilder.domain.Placeholder;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.1.0
+ */
 public interface DateTimeConditions extends LikeConditions
 {
     Function<ZonedDateTime, Temporal> getDateConversion();

diff --git a/src/main/java/de/jaggl/sqlbuilder/conditions/EqualityConditions.java b/src/main/java/de/jaggl/sqlbuilder/conditions/EqualityConditions.java
@@ -6,6 +6,11 @@
 import de.jaggl.sqlbuilder.columns.Column;
 import de.jaggl.sqlbuilder.domain.Placeholder;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.1.0
+ */
 public interface EqualityConditions
 {
     default Condition isEqualTo(Column otherColumn)

diff --git a/src/main/java/de/jaggl/sqlbuilder/conditions/LikeConditions.java b/src/main/java/de/jaggl/sqlbuilder/conditions/LikeConditions.java
@@ -8,6 +8,11 @@
 import de.jaggl.sqlbuilder.domain.LikeType;
 import de.jaggl.sqlbuilder.domain.Placeholder;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.1.0
+ */
 public interface LikeConditions
 {
     default Condition isLike(CharSequence value)

diff --git a/src/main/java/de/jaggl/sqlbuilder/conditions/NullableConditions.java b/src/main/java/de/jaggl/sqlbuilder/conditions/NullableConditions.java
@@ -3,6 +3,11 @@
 import static de.jaggl.sqlbuilder.conditions.GenericCondition.GenericConditionType.IS_NOT_NULL;
 import static de.jaggl.sqlbuilder.conditions.GenericCondition.GenericConditionType.IS_NULL;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.1.0
+ */
 public interface NullableConditions
 {
     default Condition isNull()

diff --git a/src/main/java/de/jaggl/sqlbuilder/conditions/NumberConditions.java b/src/main/java/de/jaggl/sqlbuilder/conditions/NumberConditions.java
@@ -13,6 +13,11 @@
 import de.jaggl.sqlbuilder.columns.Column;
 import de.jaggl.sqlbuilder.domain.Placeholder;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.1.0
+ */
 public interface NumberConditions
 {
     default Condition isEqualTo(Number value)

diff --git a/src/main/java/de/jaggl/sqlbuilder/conditions/StringConditions.java b/src/main/java/de/jaggl/sqlbuilder/conditions/StringConditions.java
@@ -11,6 +11,11 @@
 import de.jaggl.sqlbuilder.domain.Placeholder;
 import de.jaggl.sqlbuilder.utils.ArrayUtils;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.1.0
+ */
 public interface StringConditions extends LikeConditions
 {
     default Condition isEqualTo(String value)

diff --git a/src/main/java/de/jaggl/sqlbuilder/dialect/DefaultDialect.java b/src/main/java/de/jaggl/sqlbuilder/dialect/DefaultDialect.java
@@ -110,6 +110,15 @@ public String build(CreateTable createTable, Indentation indentation)
             builder.append(buildColumnDefinition(column.getColumnDefinition(), context, indentation));
             isFirst = false;
         }
+        createTable.getTable()
+                .getColumns()
+                .stream()
+                .filter(col -> col.getColumnDefinition().isAutoIncrement())
+                .findFirst()
+                .ifPresent(column -> builder.append(",")
+                        .append(indentation.getDelimiter())
+                        .append(indentation.indent().getIndent())
+                        .append("PRIMARY KEY (" + BuilderUtils.columnApostrophe(column.getName(), context) + ")"));
         if (indentation.isEnabled())
         {
             builder.append(indentation.getDelimiter());

diff --git a/src/main/java/de/jaggl/sqlbuilder/dialect/SybaseDialect.java b/src/main/java/de/jaggl/sqlbuilder/dialect/SybaseDialect.java
@@ -11,6 +11,11 @@
 import de.jaggl.sqlbuilder.queries.Select;
 import de.jaggl.sqlbuilder.utils.Indentation;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.0.0
+ */
 public class SybaseDialect extends DefaultDialect
 {
     private static final SybaseDialect instance;

diff --git a/src/main/java/de/jaggl/sqlbuilder/domain/Placeholder.java b/src/main/java/de/jaggl/sqlbuilder/domain/Placeholder.java
@@ -2,6 +2,11 @@
 
 import de.jaggl.sqlbuilder.columns.Column;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.5.0
+ */
 public class Placeholder extends PlainValuable
 {
     private Placeholder(String value)

diff --git a/src/main/java/de/jaggl/sqlbuilder/domain/Plain.java b/src/main/java/de/jaggl/sqlbuilder/domain/Plain.java
@@ -3,6 +3,11 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.6.0
+ */
 @AllArgsConstructor
 @Getter
 public class Plain

diff --git a/src/main/java/de/jaggl/sqlbuilder/domain/SqlTypeSupplier.java b/src/main/java/de/jaggl/sqlbuilder/domain/SqlTypeSupplier.java
@@ -1,5 +1,10 @@
 package de.jaggl.sqlbuilder.domain;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.4.0
+ */
 public interface SqlTypeSupplier
 {
     int getSqlType();

diff --git a/src/main/java/de/jaggl/sqlbuilder/queries/CreateTable.java b/src/main/java/de/jaggl/sqlbuilder/queries/CreateTable.java
@@ -5,6 +5,11 @@
 import de.jaggl.sqlbuilder.utils.Indentation;
 import lombok.Getter;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.4.0
+ */
 @Getter
 public class CreateTable implements ExecutableQuery
 {

diff --git a/src/main/java/de/jaggl/sqlbuilder/queries/Query.java b/src/main/java/de/jaggl/sqlbuilder/queries/Query.java
@@ -10,6 +10,11 @@
 import de.jaggl.sqlbuilder.dialect.Dialect;
 import de.jaggl.sqlbuilder.utils.Indentation;
 
+/**
+ * @author Martin Schumacher
+ *
+ * @since 2.3.0
+ */
 public interface Query
 {
     String build(Dialect dialect, Indentation indentation);

diff --git a/src/test/java/de/jaggl/sqlbuilder/queries/CreateTableTest.java b/src/test/java/de/jaggl/sqlbuilder/queries/CreateTableTest.java
@@ -37,7 +37,7 @@ void testCreateTable()
         createTable.println(SYBASE, enabled());
 
         assertThat(createTable.build(MYSQL))
-                .isEqualTo("CREATE TABLE `dba`.`persons` (`forename` VARCHAR(50), `lastname` VARCHAR(50) DEFAULT NULL, `nickname` VARCHAR(30) DEFAULT 'Schubi', `age` INT(5) UNSIGNED NOT NULL AUTO_INCREMENT, `size` DOUBLE(2,2) UNSIGNED NOT NULL DEFAULT 55.8, `birthday` DATE NOT NULL, `happening` DATETIME NOT NULL)");
+                .isEqualTo("CREATE TABLE `dba`.`persons` (`forename` VARCHAR(50), `lastname` VARCHAR(50) DEFAULT NULL, `nickname` VARCHAR(30) DEFAULT 'Schubi', `age` INT(5) UNSIGNED NOT NULL AUTO_INCREMENT, `size` DOUBLE(2,2) UNSIGNED NOT NULL DEFAULT 55.8, `birthday` DATE NOT NULL, `happening` DATETIME NOT NULL, PRIMARY KEY (`age`))");
 
         assertThat(createTable.build(MYSQL, enabled()))
                 .isEqualTo("CREATE TABLE `dba`.`persons`\n" //
@@ -48,7 +48,8 @@ void testCreateTable()
                         + "  `age` INT(5) UNSIGNED NOT NULL AUTO_INCREMENT,\n" //
                         + "  `size` DOUBLE(2,2) UNSIGNED NOT NULL DEFAULT 55.8,\n" //
                         + "  `birthday` DATE NOT NULL,\n" //
-                        + "  `happening` DATETIME NOT NULL\n" //
+                        + "  `happening` DATETIME NOT NULL,\n" //
+                        + "  PRIMARY KEY (`age`)\n" //
                         + ")");
 
         assertThat(createTable.build(MYSQL)).isEqualTo(createTable.build(SYBASE));