Add key value to list item descriptions. Add name to data class descriptions.

Author: labkey-adam

experiment/src/org/labkey/experiment/api/ExpDataClassType.java

@@ -22,6 +22,7 @@
 import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.data.TableSelector;
+import org.labkey.api.data.dialect.SqlDialect;
 import org.labkey.api.exp.Lsid;
 import org.labkey.api.exp.PropertyType;
 import org.labkey.api.exp.api.ExperimentService;
@@ -56,6 +57,7 @@ public static AttachmentParentType get()
     public @NotNull SQLFragment getSelectEntityIdAndDescriptionSql()
     {
         TableInfo tableInfo = ExperimentService.get().getTinfoDataClass();
+        SqlDialect dialect = tableInfo.getSqlDialect();
 
         // Get a dialect-specific expression that can extract an ObjectId from the LSID column and a WHERE clause to
         // filter the rows to LSIDs containing ObjectIds
@@ -78,7 +80,13 @@ public static AttachmentParentType get()
                 selectStatements.add(
                     new SQLFragment("\n    SELECT ")
                         .append(expressionToExtractObjectId)
-                        .append(" AS EntityId, Name AS Description FROM expdataclass.")
+                        .append(" AS EntityId, ")
+                        .append(dialect.concatenate(
+                            new SQLFragment("?", domain.getName()),
+                            new SQLFragment("':'"),
+                            new SQLFragment("Name")
+                        ))
+                        .append(" AS Description FROM expdataclass.")
                         .append(domain.getStorageTableName())
                         .append(" WHERE ").append(where)
                 );

list/src/org/labkey/list/view/ListItemType.java

@@ -18,12 +18,14 @@
 import org.jetbrains.annotations.NotNull;
 import org.labkey.api.attachments.AttachmentParentType;
 import org.labkey.api.data.SQLFragment;
+import org.labkey.api.data.dialect.SqlDialect;
 import org.labkey.api.exp.PropertyType;
 import org.labkey.api.exp.list.ListDefinition;
 import org.labkey.api.exp.list.ListService;
 import org.labkey.api.exp.property.Domain;
 import org.labkey.api.exp.property.PropertyService;
 import org.labkey.list.model.IntegerListDomainKind;
+import org.labkey.list.model.ListSchema;
 import org.labkey.list.model.PicklistDomainKind;
 import org.labkey.list.model.VarcharListDomainKind;
 
@@ -56,15 +58,22 @@ private ListItemType()
     {
         ListService svc = ListService.get();
         assert null != svc;
-
+        SqlDialect dialect = ListSchema.getInstance().getSchema().getSqlDialect();
         List<SQLFragment> selectStatements = new LinkedList<>();
 
         PropertyService.get().getContainersWithDomains(Set.of(IntegerListDomainKind.NAMESPACE_PREFIX, VarcharListDomainKind.NAMESPACE_PREFIX, PicklistDomainKind.NAMESPACE_PREFIX)).forEach(c -> {
             Map<String, ListDefinition> map = svc.getLists(c, null, false);
             map.forEach((k, v) -> {
                 Domain domain = v.getDomain();
                 if (null != domain && domain.getProperties().stream().anyMatch(p -> p.getPropertyType() == PropertyType.ATTACHMENT))
-                    selectStatements.add(new SQLFragment("\n    SELECT EntityId, ? AS Description FROM list.", domain.getName()).append(domain.getStorageTableName()));
+                    selectStatements.add(new SQLFragment("\n    SELECT EntityId, ")
+                        .append(dialect.concatenate(
+                            new SQLFragment("?", domain.getName()),
+                            new SQLFragment("':'"),
+                            new SQLFragment("CAST(").append(dialect.makeDatabaseIdentifier(v.getKeyName()).getSql())).append(" AS VARCHAR)")
+                        )
+                        .append(" AS Description FROM list.").append(domain.getStorageTableName())
+                    );
             });
         });