Merge pull request #12251 from dbeaver/oracleColumnConfigurator#11542

#11542 check editable property for column configurator dialog

Former-commit-id: e4313ece

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/runtime/properties/ObjectPropertyDescriptor.java

@@ -306,6 +306,15 @@ public class ObjectPropertyDescriptor extends ObjectAttributeDescriptor implemen
         return object instanceof DBPPersistedObject && !((DBPPersistedObject) object).isPersisted();
     }
 
+    public boolean isEditPossible(Object context)
+    {
+        String expr = propInfo.editableExpr();
+        if (!CommonUtils.isEmpty(expr)) {
+            return Boolean.TRUE.equals(evaluateExpression(context, expr));
+        }
+        return propInfo.editable();
+    }
+
     @Override
     public String getCategory()
     {

plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/object/struct/AttributeEditPage.java

@@ -109,7 +109,7 @@ public class AttributeEditPage extends BaseObjectEditPage {
         pc.collectProperties();
         for (DBPPropertyDescriptor prop : pc.getProperties()) {
             if (prop instanceof ObjectPropertyDescriptor) {
-                if (((ObjectPropertyDescriptor) prop).isEditPossible() && !((ObjectPropertyDescriptor) prop).isNameProperty()) {
+                if (((ObjectPropertyDescriptor) prop).isEditPossible(attribute) && !((ObjectPropertyDescriptor) prop).isNameProperty()) {
                     continue;
                 }
             }