Long identifier truncation improvements

api/schemas/expTypes.xsd

@@ -436,7 +436,8 @@
     <xs:complexType name="SampleSetType">
         <xs:sequence>
             <xs:element name="Name" type="string" minOccurs="1"/>
-            <xs:element name="MaterialLSIDPrefix" type="string" minOccurs="1"/>
+            <xs:element name="TableTitle" type="xs:string" minOccurs="0" />
+			<xs:element name="MaterialLSIDPrefix" type="string" minOccurs="1"/>
             <xs:element name="Description" type="string" minOccurs="0" />
 			<xs:element name="KeyField" type="string" minOccurs="0" maxOccurs="3" />
 			<xs:element name="ParentField" type="string" minOccurs="0" maxOccurs="1" />
@@ -461,6 +462,7 @@
 	<xs:complexType name="DataClassType">
 		<xs:sequence>
 			<xs:element name="Name" type="string" minOccurs="1"/>
+			<xs:element name="TableTitle" type="xs:string" minOccurs="0" />
 			<xs:element name="Description" type="string" minOccurs="0" />
 			<xs:element name="NameExpression" type="string" minOccurs="0" maxOccurs="1"/>
 			<xs:element name="Category" type="string" minOccurs="0" />
@@ -487,7 +489,8 @@
 	<xs:complexType name="DomainDescriptorType">
         <xs:sequence>
             <xs:element name="Name" type="string" minOccurs="0"/>
-            <xs:element name="DomainURI" type="string" minOccurs="0"/>
+			<xs:element name="TableTitle" type="xs:string" minOccurs="0" />
+			<xs:element name="DomainURI" type="string" minOccurs="0"/>
             <xs:element name="Description" type="string" minOccurs="0"/>
             <xs:element name="PropertyDescriptor" type="exp:PropertyDescriptorType" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>

api/src/org/labkey/api/ApiModule.java

@@ -419,7 +419,6 @@ public void registerServlets(ServletContext servletCtx)
             RReport.TestCase.class,
             RemoveDuplicatesDataIterator.DeDuplicateTestCase.class,
             ReplacedRunFilter.TestCase.class,
-            ResultSetUtil.TestCase.class,
             SQLFragment.UnitTestCase.class,
             Sampler.TestCase.class,
             SchemaKey.TestCase.class,

api/src/org/labkey/api/assay/AbstractAssayProvider.java

@@ -2150,7 +2150,7 @@ private void updateResultFiles(FilteredTable assayResultTable, List<ExpRun> runs
                     var realFileColumn = realTable.getColumn(fileField);
                     updateSql = new SQLFragment("UPDATE ").append(assayResultTable.getRealTable())
                             .append(" SET ")
-                            .appendIdentifier(realFileColumn.getSelectName())
+                            .appendIdentifier(realFileColumn.getSelectIdentifier())
                             .append(" = ").appendValue(updatedFile.getAbsolutePath())
                             .append(" WHERE rowId = ").appendValue(resultRowId);
                     new SqlExecutor(assayResultTable.getSchema()).execute(updateSql);

api/src/org/labkey/api/assay/AssayDataCollectorDisplayColumn.java

@@ -22,6 +22,8 @@
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.data.SimpleDisplayColumn;
+import org.labkey.api.data.TableInfo;
+import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.view.HttpView;
@@ -33,11 +35,11 @@ public class AssayDataCollectorDisplayColumn extends SimpleDisplayColumn
     private final AssayRunUploadForm _form;
     private ColumnInfo _col;
 
-    public AssayDataCollectorDisplayColumn(AssayRunUploadForm form)
+    public AssayDataCollectorDisplayColumn(TableInfo table, AssayRunUploadForm form)
     {
         _form = form;
         setCaption("Run Data");
-        var col = new BaseColumnInfo("Run Data");
+        var col = new BaseColumnInfo(FieldKey.fromParts("Run Data"), table);
         col.setInputType("file");
         _col = col;
     }

api/src/org/labkey/api/assay/actions/UploadWizardAction.java

@@ -643,7 +643,7 @@ protected ModelAndView getRunPropertiesView(FormType newRunForm, boolean errorRe
         addSampleInputColumns(newRunForm, insertView);
         if (shouldShowDataCollectorUI(newRunForm))
         {
-            insertView.getDataRegion().addDisplayColumn(new AssayDataCollectorDisplayColumn(newRunForm));
+            insertView.getDataRegion().addDisplayColumn(new AssayDataCollectorDisplayColumn(table, newRunForm));
         }
 
         if (warnings)

api/src/org/labkey/api/assay/sample/AssaySampleLookupContext.java

@@ -373,7 +373,6 @@ private SQLFragment getLookupColumnSql(TableInfoKey tableInfoKey, SampleLookup s
 
         var column = sampleLookup.columnInfo;
         var table = tableInfoKey.table;
-        var columnName = table.getSqlDialect().getColumnSelectName(column.getAlias());
 
         var tableFilter = new SimpleFilter(tableInfoKey.keyColumn.getFieldKey(), expRunRowId);
         tableFilter.addCondition(column.getFieldKey(), null, CompareType.NONBLANK);
@@ -387,16 +386,16 @@ private SQLFragment getLookupColumnSql(TableInfoKey tableInfoKey, SampleLookup s
 
         if (column.getJdbcType().isInteger())
         {
-            sql.append("SELECT DA.").append(columnName).append(" AS MaterialRowId");
+            sql.append("SELECT DA.").appendIdentifier(column.getAlias()).append(" AS MaterialRowId");
             sql.append(", ?").add(role).append(" AS MaterialInputRole\n");
             sql.append(" FROM (").append(tableSql).append(") DA");
         }
         else if (column.getJdbcType().isText())
         {
-            sql.append("SELECT MA.RowId").append(" AS MaterialRowId");
-            sql.append(", ?").add(role).append(" AS MaterialInputRole\n");
+            sql.append("SELECT MA.RowId AS MaterialRowId");
+            sql.append(", ").appendValue(role).append(" AS MaterialInputRole\n");
             sql.append(" FROM exp.Material MA\n");
-            sql.append(" INNER JOIN (").append(tableSql).append(") DA ON MA.name = DA.").append(columnName).append("\n");
+            sql.append(" INNER JOIN (").append(tableSql).append(") DA ON MA.name = DA.").appendIdentifier(column.getAlias()).append("\n");
 
             if (sampleLookup.expSampleType != null)
                 sql.append(" WHERE MA.MaterialSourceId = ?").add(sampleLookup.expSampleType.getRowId()).append("\n");

api/src/org/labkey/api/audit/AuditHandler.java

@@ -70,7 +70,7 @@ static Pair<Map<String, Object>, Map<String, Object>> getOldAndNewRecordForMerge
             String nameFromAlias = null != col
                     ? col.getName()
                     : columns.stream()
-                        .filter(column -> column.getAlias().equalsIgnoreCase(key))
+                        .filter(column -> column.getAlias().getId().equalsIgnoreCase(key))
                         .map((ColumnInfo::getName))
                         .findFirst()
                         .orElse(key);

api/src/org/labkey/api/data/AbstractPropertyStore.java

@@ -119,10 +119,10 @@ public WritablePropertyMap getWritableProperties(String category, boolean create
     // Delete properties associated with this store
     void deleteProperties(Container c)
     {
-        String setSelectName = _prop.getTableInfoProperties().getColumn("Set").getSelectName();   // Keyword in some dialects
-        SQLFragment deleteProps = new SQLFragment("DELETE FROM " + _prop.getTableInfoProperties().getSelectName() +
-                " WHERE " + setSelectName +  " IN " +
-                "(SELECT " + setSelectName + " FROM " + _prop.getTableInfoPropertySets().getSelectName() + " WHERE ObjectId = ? AND ", c);
+        var setSelectName = _prop.getTableInfoProperties().getColumn("Set").getSelectIdentifier();   // Keyword in some dialects
+        SQLFragment deleteProps = new SQLFragment("DELETE FROM ").append(_prop.getTableInfoProperties().getSQLName())
+                .append(" WHERE ").appendIdentifier(setSelectName).append(" IN ")
+                .append("(SELECT ").appendIdentifier(setSelectName).append(" FROM ").append(_prop.getTableInfoPropertySets().getSQLName()).append(" WHERE ObjectId = ? AND ").add(c);
         appendWhereFilter(deleteProps);
         deleteProps.append(")");
         new SqlExecutor(_prop.getSchema()).execute(deleteProps);
@@ -217,10 +217,10 @@ private record PropertySet(int set, String encryption){}
     public PropertyMap getPropertyMapFromDatabase(User user, Container container, String category)
     {
         ColumnInfo setColumn = _prop.getTableInfoProperties().getColumn("Set");
-        String setSelectName = setColumn.getSelectName();   // Keyword in some dialects
+        var setSelectName = setColumn.getSelectIdentifier();   // Keyword in some dialects
 
-        SQLFragment sql = new SQLFragment("SELECT " + setSelectName + ", Encryption FROM " + _prop.getTableInfoPropertySets() +
-                " WHERE UserId = ? AND ObjectId = ? AND Category = ?", user, container, category);
+        SQLFragment sql = new SQLFragment("SELECT ").appendIdentifier(setSelectName).append(", Encryption FROM ").append(_prop.getTableInfoPropertySets())
+                .append(" WHERE UserId = ? AND ObjectId = ? AND Category = ?").addAll(user, container, category);
 
         PropertySet propertySet = new SqlSelector(_prop.getSchema(), sql).getObject(PropertySet.class);
         if (propertySet == null)

api/src/org/labkey/api/data/AbstractTableInfo.java

@@ -372,9 +372,9 @@ public DatabaseTableType getTableType()
     public SQLFragment getFromSQL(String alias)
     {
         if (null != getSelectName())
-            return new SQLFragment().appendIdentifier(getSelectName()).append(" ").append(alias);
+            return new SQLFragment().appendIdentifier(getSelectName()).append(" ").appendIdentifier(alias);
         else
-            return new SQLFragment().append("(").append(getFromSQL()).append(") ").append(alias);
+            return new SQLFragment().append("(").append(getFromSQL()).append(") ").appendIdentifier(alias);
     }
 
     /** When a table a) overrides (String alias, Set<FieldKey> cols) b) has CalculatedColumns we need to make sure that
@@ -1741,9 +1741,8 @@ public void overlayMetadata(Collection<TableType> metadata, UserSchema schema, C
         }
     }
 
-    @Nullable
     @Override
-    public String getMetaDataName()
+    public @Nullable DatabaseIdentifier getMetaDataIdentifier()
     {
         return null;
     }

api/src/org/labkey/api/data/AbstractWrappedColumnInfo.java

@@ -68,21 +68,21 @@ public boolean isAliasSet()
     }
 
     @Override
-    public String getAlias()
+    public DatabaseIdentifier getAlias()
     {
         return delegate.getAlias();
     }
 
     @Override
-    public String getMetaDataName()
+    public DatabaseIdentifier getMetaDataIdentifier()
     {
-        return delegate.getMetaDataName();
+        return delegate.getMetaDataIdentifier();
     }
 
     @Override
-    public String getSelectName()
+    public DatabaseIdentifier getSelectIdentifier()
     {
-        return delegate.getSelectName();
+        return delegate.getSelectIdentifier();
     }
 
     @Override
@@ -387,6 +387,12 @@ public String getColumnName()
         return getName();
     }
 
+    @Override
+    public int findColumn(ResultSet rs) throws SQLException
+    {
+        return delegate.findColumn(rs);
+    }
+
     @Override
     public Object getValue(ResultSet rs) throws SQLException
     {
@@ -412,7 +418,7 @@ public Object getValue(RenderContext context)
     }
 
     @Override
-    public Object getValue(Map<String, ?> map)
+    public Object getValue(Map<?, ?> map)
     {
         return delegate.getValue(map);
     }