github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for @Identity - Fix sequence name propagation

Browse Source
This commit is contained in:
rob bygrave
2020-03-04 22:49:08 +13:00
parent bfc2b57df5
commit 04adc35ccd
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+6 -7
View File
@@ -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<Column> 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<Column> pk) {
return namingConvention.getSequenceName(createTable.getName(), pk.get(0).getName());
}
/**