Skip to content

Commit 2a93089

Browse files
committed
fixed createTable (create a key for autoIncrementColumn)
1 parent 7e8b822 commit 2a93089

15 files changed

Lines changed: 73 additions & 3 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>de.jaggl.sqlbuilder</groupId>
55
<artifactId>sqlbuilder-core</artifactId>
6-
<version>2.6.1</version>
6+
<version>2.6.2</version>
77

88
<packaging>jar</packaging>
99

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
import de.jaggl.sqlbuilder.columns.Column;
2222
import de.jaggl.sqlbuilder.domain.Placeholder;
2323

24+
/**
25+
* @author Martin Schumacher
26+
*
27+
* @since 2.1.0
28+
*/
2429
public interface DateTimeConditions extends LikeConditions
2530
{
2631
Function<ZonedDateTime, Temporal> getDateConversion();

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
import de.jaggl.sqlbuilder.columns.Column;
77
import de.jaggl.sqlbuilder.domain.Placeholder;
88

9+
/**
10+
* @author Martin Schumacher
11+
*
12+
* @since 2.1.0
13+
*/
914
public interface EqualityConditions
1015
{
1116
default Condition isEqualTo(Column otherColumn)

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
import de.jaggl.sqlbuilder.domain.LikeType;
99
import de.jaggl.sqlbuilder.domain.Placeholder;
1010

11+
/**
12+
* @author Martin Schumacher
13+
*
14+
* @since 2.1.0
15+
*/
1116
public interface LikeConditions
1217
{
1318
default Condition isLike(CharSequence value)

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
import static de.jaggl.sqlbuilder.conditions.GenericCondition.GenericConditionType.IS_NOT_NULL;
44
import static de.jaggl.sqlbuilder.conditions.GenericCondition.GenericConditionType.IS_NULL;
55

6+
/**
7+
* @author Martin Schumacher
8+
*
9+
* @since 2.1.0
10+
*/
611
public interface NullableConditions
712
{
813
default Condition isNull()

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
import de.jaggl.sqlbuilder.columns.Column;
1414
import de.jaggl.sqlbuilder.domain.Placeholder;
1515

16+
/**
17+
* @author Martin Schumacher
18+
*
19+
* @since 2.1.0
20+
*/
1621
public interface NumberConditions
1722
{
1823
default Condition isEqualTo(Number value)

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
import de.jaggl.sqlbuilder.domain.Placeholder;
1212
import de.jaggl.sqlbuilder.utils.ArrayUtils;
1313

14+
/**
15+
* @author Martin Schumacher
16+
*
17+
* @since 2.1.0
18+
*/
1419
public interface StringConditions extends LikeConditions
1520
{
1621
default Condition isEqualTo(String value)

src/main/java/de/jaggl/sqlbuilder/dialect/DefaultDialect.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,15 @@ public String build(CreateTable createTable, Indentation indentation)
110110
builder.append(buildColumnDefinition(column.getColumnDefinition(), context, indentation));
111111
isFirst = false;
112112
}
113+
createTable.getTable()
114+
.getColumns()
115+
.stream()
116+
.filter(col -> col.getColumnDefinition().isAutoIncrement())
117+
.findFirst()
118+
.ifPresent(column -> builder.append(",")
119+
.append(indentation.getDelimiter())
120+
.append(indentation.indent().getIndent())
121+
.append("PRIMARY KEY (" + BuilderUtils.columnApostrophe(column.getName(), context) + ")"));
113122
if (indentation.isEnabled())
114123
{
115124
builder.append(indentation.getDelimiter());

src/main/java/de/jaggl/sqlbuilder/dialect/SybaseDialect.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
import de.jaggl.sqlbuilder.queries.Select;
1212
import de.jaggl.sqlbuilder.utils.Indentation;
1313

14+
/**
15+
* @author Martin Schumacher
16+
*
17+
* @since 2.0.0
18+
*/
1419
public class SybaseDialect extends DefaultDialect
1520
{
1621
private static final SybaseDialect instance;

src/main/java/de/jaggl/sqlbuilder/domain/Placeholder.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
import de.jaggl.sqlbuilder.columns.Column;
44

5+
/**
6+
* @author Martin Schumacher
7+
*
8+
* @since 2.5.0
9+
*/
510
public class Placeholder extends PlainValuable
611
{
712
private Placeholder(String value)

0 commit comments

Comments
 (0)