dbeaver/pro#3237 Nested records edit fix (FQN generation)

dbeaver · serge-rider · Sep 23, 2024 · Aug 30, 2024 · Aug 30, 2024 · Sep 2, 2024
commit 296ea2ad8854be59e80b80982b8fc97580ffcc83
diff --git a/....postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataBoundTypeAttribute.java b/....postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataBoundTypeAttribute.java
@@ -27,7 +27,8 @@
 import org.jkiss.dbeaver.model.struct.DBSContextBoundAttribute;
 import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Provides information about context for data type attribute
@@ -56,23 +57,22 @@ public String formatMemberReference(
         @Nullable String containerAliasOrNull,
         @NotNull DBPAttributeReferencePurpose purpose
     ) {
-        LinkedList<String> parts = new LinkedList<>();
-        parts.addLast(DBUtils.getQuotedIdentifier(member));
+        List<String> parts = new ArrayList<>();
+        parts.add(DBUtils.getQuotedIdentifier(member));
         DBSEntityAttribute context = this.context;
-        while (context instanceof PostgreDataBoundTypeAttribute) {
-            PostgreDataBoundTypeAttribute boundAttr = (PostgreDataBoundTypeAttribute) context;
-            parts.addFirst(DBUtils.getQuotedIdentifier(boundAttr.member));
+        while (context instanceof PostgreDataBoundTypeAttribute boundAttr) {
+            parts.add(0, DBUtils.getQuotedIdentifier(boundAttr.member));
             context = boundAttr.context;
         } 
-        parts.addFirst(DBUtils.getQuotedIdentifier(context));
+        parts.add(0, DBUtils.getQuotedIdentifier(context));
         if (isIncludeContainerName) {
             if (containerAliasOrNull == null) {
                 if (context.getParentObject() != this.getTable()) {
-                    parts.addFirst(DBUtils.getQuotedIdentifier(context.getParentObject()));
+                    parts.add(0, DBUtils.getQuotedIdentifier(context.getParentObject()));
                 }
-                parts.addFirst(DBUtils.getObjectFullName(this.getTable(), DBPEvaluationContext.DML));
+                parts.add(0, DBUtils.getObjectFullName(this.getTable(), DBPEvaluationContext.DML));
             } else {
-                parts.addFirst(containerAliasOrNull);
+                parts.add(0, containerAliasOrNull);
             }
         }
         if (purpose.equals(DBPAttributeReferencePurpose.DATA_SELECTION)) {

diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeBinding.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeBinding.java
@@ -234,8 +234,9 @@ public String getFullyQualifiedName(DBPEvaluationContext context) {
      */
     @NotNull
     public String getFullyQualifiedName(DBPEvaluationContext context, @NotNull DBPAttributeReferencePurpose purpose) {
-        if (this.getEntityAttribute() instanceof DBSContextBoundAttribute) {
-            return DBUtils.getQuotedIdentifier(this.getEntityAttribute(), purpose);
+        if (this.getEntityAttribute() instanceof DBSContextBoundAttribute cba && purpose != DBPAttributeReferencePurpose.UNSPECIFIED) {
+            // FIXME: we shouldn't use formatMemberReference here
+            return cba.formatMemberReference(false, null, purpose);
         }
         final DBPDataSource dataSource = getDataSource();
         if (getParentObject() == null) {