#11426 Cleanup code

上级 4b80c495
...@@ -85,9 +85,6 @@ public class SQLServerTableColumnManager extends SQLTableColumnManager<SQLServer ...@@ -85,9 +85,6 @@ public class SQLServerTableColumnManager extends SQLTableColumnManager<SQLServer
if (CommonUtils.isNotEmpty(definition)) { if (CommonUtils.isNotEmpty(definition)) {
sql.append(" AS ").append(definition); sql.append(" AS ").append(definition);
} }
};
protected final ColumnModifier<SQLServerTableColumn> PersistedModifier = (monitor, column, sql, command) -> {
if (column.isComputedPersisted()) { if (column.isComputedPersisted()) {
sql.append(" PERSISTED"); sql.append(" PERSISTED");
} }
...@@ -103,7 +100,7 @@ public class SQLServerTableColumnManager extends SQLTableColumnManager<SQLServer ...@@ -103,7 +100,7 @@ public class SQLServerTableColumnManager extends SQLTableColumnManager<SQLServer
protected ColumnModifier[] getSupportedModifiers(SQLServerTableColumn column, Map<String, Object> options) protected ColumnModifier[] getSupportedModifiers(SQLServerTableColumn column, Map<String, Object> options)
{ {
if (CommonUtils.isNotEmpty(column.getComputedDefinition())) { if (CommonUtils.isNotEmpty(column.getComputedDefinition())) {
return new ColumnModifier[]{ComputedModifier, PersistedModifier, NotNullModifier}; return new ColumnModifier[]{ComputedModifier, NotNullModifier};
} }
return new ColumnModifier[] {DataTypeModifier, IdentityModifier, CollateModifier, SQLServerDefaultModifier, NullNotNullModifier}; return new ColumnModifier[] {DataTypeModifier, IdentityModifier, CollateModifier, SQLServerDefaultModifier, NullNotNullModifier};
} }
......
...@@ -163,10 +163,8 @@ public class SQLServerTableColumn extends JDBCTableColumn<SQLServerTableBase> im ...@@ -163,10 +163,8 @@ public class SQLServerTableColumn extends JDBCTableColumn<SQLServerTableBase> im
this.setDefaultValue(dv); this.setDefaultValue(dv);
} }
this.description = JDBCUtils.safeGetString(dbResult, "description"); this.description = JDBCUtils.safeGetString(dbResult, "description");
if (JDBCUtils.safeGetInt(dbResult, "is_computed") != 0) { this.computedPersisted = JDBCUtils.safeGetInt(dbResult, "is_persisted") != 0;
this.computedPersisted = JDBCUtils.safeGetInt(dbResult, "is_persisted") != 0; this.computedDefinition = JDBCUtils.safeGetString(dbResult, "computed_definition");
this.computedDefinition = JDBCUtils.safeGetString(dbResult, "computed_definition");
}
} }
@NotNull @NotNull
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册