Browse Source

Merge pull request #2695 in CORE/base-third from feature/10.0 to feature/x

* commit 'bc8c98edb16ce0e53d8bb91a840900770310820a':
  DEC-19255 fix 对之前主键丢失的客户表做npe处理
  DEC-19255 fix 对之前主键丢失的客户表做npe处理
research/11.0
superman 3 years ago
parent
commit
35fac376be
  1. 4
      fine-hibernate/src/main/java/com/fr/third/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java

4
fine-hibernate/src/main/java/com/fr/third/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java

@ -362,7 +362,9 @@ public abstract class AbstractSchemaMigrator implements SchemaMigrator {
Set<Identifier> identifiers = getUniqueKeyIdentifiers(table);
if (tableInfo != null) {
for (IndexInformation indexInfo : tableInfo.getIndexes()) {
if (!indexInfo.isUnique() || indexInfo.getIndexIdentifier().equals(tableInfo.getPrimaryKey().getPrimaryKeyIdentifier())) {
PrimaryKeyInformation primaryKey = tableInfo.getPrimaryKey();
//主键不存在时npe处理
if (!indexInfo.isUnique() || (primaryKey != null && indexInfo.getIndexIdentifier().equals(primaryKey.getPrimaryKeyIdentifier()))) {
continue;
}
//如果旧的唯一键已经不存在, 则删除

Loading…
Cancel
Save