From d3e8cde62fa3f4459df0c584e6ab93656a00cb88 Mon Sep 17 00:00:00 2001 From: Tapac Date: Fri, 1 Nov 2019 23:45:04 +0900 Subject: [PATCH] A table column with .autoIncrement() and NO .primaryKey() does create primary key with SchemaUtils.createMissingTablesAndColumns() #649 --- exposed/src/main/kotlin/org/jetbrains/exposed/sql/Table.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/exposed/src/main/kotlin/org/jetbrains/exposed/sql/Table.kt b/exposed/src/main/kotlin/org/jetbrains/exposed/sql/Table.kt index f777be5f77..115965b031 100644 --- a/exposed/src/main/kotlin/org/jetbrains/exposed/sql/Table.kt +++ b/exposed/src/main/kotlin/org/jetbrains/exposed/sql/Table.kt @@ -553,10 +553,8 @@ open class Table(name: String = ""): ColumnSet(), DdlAware { } internal fun primaryKeyConstraint(): String? { - var pkey = columns.filter { it.indexInPK != null }.sortedWith(compareBy({ !it.columnType.isAutoInc }, { it.indexInPK })) - if (pkey.isEmpty()) { - pkey = columns.filter { it.columnType.isAutoInc } - } + val pkey = columns.filter { it.indexInPK != null }.sortedWith(compareBy({ !it.columnType.isAutoInc }, { it.indexInPK })) + if (pkey.isNotEmpty()) { val tr = TransactionManager.current() val constraint = tr.db.identifierManager.cutIfNecessaryAndQuote("pk_$tableName")