Skip to content

Commit 0908e31

Browse files
committed
fix statement related to incremental key
1 parent 7445c4b commit 0908e31

File tree

3 files changed

+10
-27
lines changed

3 files changed

+10
-27
lines changed

storage/sql/core/src/main/java/me/hsgamer/topper/storage/sql/core/SqlDataStorageSupplier.java

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -258,34 +258,17 @@ public void onRegister() {
258258
}
259259
}
260260
statement.append(", ");
261-
if (incrementalKey != null) {
262-
statement.append("PRIMARY KEY (`")
263-
.append(incrementalKey)
264-
.append("`), ");
265-
statement.append("UNIQUE KEY (");
266-
for (int i = 0; i < keyColumns.length; i++) {
267-
statement.append("`")
268-
.append(keyColumns[i])
269-
.append("`");
270-
if (i != keyColumns.length - 1) {
271-
statement.append(", ");
272-
}
273-
}
274-
statement.append(")");
275-
} else {
276-
statement.append("PRIMARY KEY (");
277-
for (int i = 0; i < keyColumns.length; i++) {
278-
statement.append("`")
279-
.append(keyColumns[i])
280-
.append("`");
281-
if (i != keyColumns.length - 1) {
282-
statement.append(", ");
283-
}
261+
statement.append(incrementalKey != null ? "UNIQUE (" : "PRIMARY KEY (");
262+
for (int i = 0; i < keyColumns.length; i++) {
263+
statement.append("`")
264+
.append(keyColumns[i])
265+
.append("`");
266+
if (i != keyColumns.length - 1) {
267+
statement.append(", ");
284268
}
285-
statement.append(")");
286269
}
270+
statement.append(")");
287271
statement.append(");");
288-
logger.log(LogLevel.INFO, "Creating table: " + statement);
289272
StatementBuilder.create(connection)
290273
.setStatement(statement.toString())
291274
.update();

storage/sql/mysql/src/main/java/me/hsgamer/topper/storage/sql/mysql/MySqlDataStorageSupplier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public MySqlDataStorageSupplier(SqlDatabaseSetting databaseSetting, Function<Set
2121

2222
@Override
2323
protected String getIncrementalKeyDefinition() {
24-
return "INTEGER AUTO_INCREMENT";
24+
return "INTEGER PRIMARY KEY AUTO_INCREMENT";
2525
}
2626

2727
@Override

storage/sql/sqlite/src/main/java/me/hsgamer/topper/storage/sql/sqlite/SqliteDataStorageSupplier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ protected boolean isSingleThread() {
2727

2828
@Override
2929
protected String getIncrementalKeyDefinition() {
30-
return "INTEGER AUTOINCREMENT";
30+
return "INTEGER PRIMARY KEY AUTOINCREMENT";
3131
}
3232

3333
@Override

0 commit comments

Comments
 (0)