From c3c9977ec0542ddf01b20db40e466500331bffc1 Mon Sep 17 00:00:00 2001 From: ShadelessFox Date: Wed, 21 Apr 2021 13:52:49 +0300 Subject: [PATCH] #11426 Cleanup code --- .../dbeaver/ext/mssql/edit/SQLServerTableColumnManager.java | 5 +---- .../jkiss/dbeaver/ext/mssql/model/SQLServerTableColumn.java | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerTableColumnManager.java b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerTableColumnManager.java index def349bb76..574b6d8a0a 100644 --- a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerTableColumnManager.java +++ b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerTableColumnManager.java @@ -85,9 +85,6 @@ public class SQLServerTableColumnManager extends SQLTableColumnManager PersistedModifier = (monitor, column, sql, command) -> { if (column.isComputedPersisted()) { sql.append(" PERSISTED"); } @@ -103,7 +100,7 @@ public class SQLServerTableColumnManager extends SQLTableColumnManager options) { if (CommonUtils.isNotEmpty(column.getComputedDefinition())) { - return new ColumnModifier[]{ComputedModifier, PersistedModifier, NotNullModifier}; + return new ColumnModifier[]{ComputedModifier, NotNullModifier}; } return new ColumnModifier[] {DataTypeModifier, IdentityModifier, CollateModifier, SQLServerDefaultModifier, NullNotNullModifier}; } diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerTableColumn.java b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerTableColumn.java index 244f6e4552..1d3117f68c 100644 --- a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerTableColumn.java +++ b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerTableColumn.java @@ -163,10 +163,8 @@ public class SQLServerTableColumn extends JDBCTableColumn im this.setDefaultValue(dv); } this.description = JDBCUtils.safeGetString(dbResult, "description"); - if (JDBCUtils.safeGetInt(dbResult, "is_computed") != 0) { - this.computedPersisted = JDBCUtils.safeGetInt(dbResult, "is_persisted") != 0; - this.computedDefinition = JDBCUtils.safeGetString(dbResult, "computed_definition"); - } + this.computedPersisted = JDBCUtils.safeGetInt(dbResult, "is_persisted") != 0; + this.computedDefinition = JDBCUtils.safeGetString(dbResult, "computed_definition"); } @NotNull -- GitLab