diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java index c707b92e6..11a4b776e 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java @@ -252,7 +252,10 @@ public class BaseTableDdl implements TableDdl { if ((pk.size() == 1)) { final IdentityMode identityMode = MTableIdentity.fromCreateTable(createTable); IdType idType = platformDdl.useIdentityType(identityMode.getIdType()); - String sequenceName = (IdType.SEQUENCE != idType) ? null : sequenceName(createTable, pk, identity); + String sequenceName = identityMode.getSequenceName(); + if (IdType.SEQUENCE == idType && (sequenceName == null || sequenceName.isEmpty())) { + sequenceName = sequenceName(createTable, pk); + } identity = new DdlIdentity(idType, identityMode, sequenceName); } @@ -308,12 +311,8 @@ public class BaseTableDdl implements TableDdl { } } - private String sequenceName(CreateTable createTable, List pk, DdlIdentity identity) { - String seqName = identity.getSequenceName(); - if (seqName == null || seqName.isEmpty()) { - seqName = namingConvention.getSequenceName(createTable.getName(), pk.get(0).getName()); - } - return seqName; + private String sequenceName(CreateTable createTable, List pk) { + return namingConvention.getSequenceName(createTable.getName(), pk.get(0).getName()); } /**