Merge pull request #34 from LabKey/fb_getselectname

getselectname

Author: labkey-matthewb

LDK/src/org/labkey/ldk/LDKServiceImpl.java

@@ -258,7 +258,7 @@ public List<String> validateContainerScopedTables(boolean onlyReportErrors)
             }
 
             // group data based on pseudoPK and effective container (ie. workbooks go with parent) and return duplicates
-            SQLFragment sql = new SQLFragment("SELECT ").append(pseudoPk.getValueSql("t")).append(" as keyField, count(*) as total FROM " + ti.getSelectName() + " t " +
+            SQLFragment sql = new SQLFragment("SELECT ").append(pseudoPk.getValueSql("t")).append(" as keyField, count(*) as total FROM ").append(ti.getFromSQL("t")).append(
             " LEFT JOIN core.containers c ON t.container = c.entityid " +
             " GROUP BY ").append(pseudoPk.getValueSql("t")).append(", CASE WHEN c.type = 'workbook' THEN c.parent ELSE c.entityid END " +
             " HAVING count(*) > 1");

LDK/src/org/labkey/ldk/query/DefaultTableCustomizer.java

@@ -240,7 +240,7 @@ private static void appendEnddate(AbstractTableInfo ti, String sourceColName)
         String name = sourceCol.getName();
         if (ti.getColumn(name + "Coalesced", false) == null)
         {
-            SQLFragment sql = new SQLFragment("CAST(COALESCE(" + ExprColumn.STR_TABLE_ALIAS + "." + sourceCol.getSelectName() + ", {fn curdate()}) as date)");
+            SQLFragment sql = new SQLFragment("CAST(COALESCE(").append(sourceCol.getValueSql(ExprColumn.STR_TABLE_ALIAS)).append(", {fn curdate()}) as date)");
             ExprColumn col = new ExprColumn(ti, name + "Coalesced", sql, JdbcType.DATE);
             col.setCalculated(true);
             col.setUserEditable(false);
@@ -255,7 +255,7 @@ private static void appendEnddate(AbstractTableInfo ti, String sourceColName)
 
         if (ti.getColumn(name + "timeCoalesced", false) == null)
         {
-            SQLFragment sql = new SQLFragment("COALESCE(" + ExprColumn.STR_TABLE_ALIAS + "." + sourceCol.getSelectName() + ", {fn now()})");
+            SQLFragment sql = new SQLFragment("COALESCE(").append(sourceCol.getValueSql(ExprColumn.STR_TABLE_ALIAS)).append(", {fn now()})");
             ExprColumn col = new ExprColumn(ti, name + "timeCoalesced", sql, JdbcType.DATE);
             col.setCalculated(true);
             col.setUserEditable(false);
@@ -279,7 +279,7 @@ private static void appendDateOnly(AbstractTableInfo ti, String sourceColName)
         String name = sourceCol.getName().equals("date") ? "dateOnly" : sourceCol.getName() + "DatePart";
         if (ti.getColumn(name, false) == null)
         {
-            SQLFragment sql = new SQLFragment(ti.getSqlDialect().getDateTimeToDateCast(ExprColumn.STR_TABLE_ALIAS + "." + sourceCol.getSelectName()));
+            SQLFragment sql = ti.getSqlDialect().getDateTimeToDateCast(sourceCol.getValueSql(ExprColumn.STR_TABLE_ALIAS));
             ExprColumn col = new ExprColumn(ti, name, sql, JdbcType.DATE);
             col.setCalculated(true);
             col.setUserEditable(false);

laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java

@@ -14,6 +14,7 @@
 import org.labkey.api.data.DisplayColumn;
 import org.labkey.api.data.DisplayColumnFactory;
 import org.labkey.api.data.JdbcType;
+import org.labkey.api.data.MutableColumnInfo;
 import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.TableCustomizer;
 import org.labkey.api.data.TableInfo;
@@ -356,10 +357,10 @@ private void appendMajorEventsCol(final UserSchema us, AbstractTableInfo ds, fin
             return;
         }
         ColumnInfo pk = pks.get(0);
-        final String pkColSelectName = pk.getSelectName();
+        final String pkColSelectName = pk.getFieldKey().toSQLString();
         final String pkColRawName = pk.getName();
 
-        WrappedColumn col = new WrappedColumn(pk, name);
+        MutableColumnInfo col = new WrappedColumn(pk, name);
         col.setLabel("Major Events");
         col.setDescription("This column shows all major events recorded in this subject\'s history and will calculate the time elapsed between the current sample and these dates.");
         col.setReadOnly(true);
@@ -426,7 +427,7 @@ private void appendOverlapingProjectsCol(final UserSchema us, AbstractTableInfo
             return;
         }
         ColumnInfo pk = pks.get(0);
-        final String pkColSelectName = pk.getSelectName();
+        final String pkColSelectName = pk.getFieldKey().toSQLString();
         final String pkColRawName = pk.getName();
         final String publicTableName = ds.getPublicName();
         final String colName = ds.getName() + "_overlappingProjects";
@@ -538,7 +539,7 @@ public void appendProjectsCol(final UserSchema us, AbstractTableInfo ds, final S
             return;
         }
         ColumnInfo pk = pks.get(0);
-        final String pkColSelectName = pk.getSelectName();
+        final String pkColSelectName = pk.getFieldKey().toSQLString();
         final String pkColRawName = pk.getName();
         final String schemaName = ds.getUserSchema().getSchemaPath().toSQLString();
         final String querySelectName = ds.getSqlDialect().makeLegalIdentifier(ds.getPublicName());
@@ -735,7 +736,7 @@ private void appendRelativeDatesCol(final UserSchema us, AbstractTableInfo ds, f
             return;
         }
         ColumnInfo pk = pks.get(0);
-        final String pkColSelectName = pk.getSelectName();
+        final String pkColSelectName = pk.getFieldKey().toSQLString();
         final String pkColRawName = pk.getName();
 
         WrappedColumn col = new WrappedColumn(pk, name);
@@ -859,9 +860,9 @@ private void appendAgeInMonthsCol(AbstractTableInfo ti, ColumnInfo birthCol, Col
     //NOTE: patterned off of AgeInMonthsMethodInfo
     public SQLFragment getAgeInMonthsSQL(DbSchema schema, ColumnInfo column, @Nullable ColumnInfo deathCol)
     {
-        SQLFragment yearA = new SQLFragment(schema.getSqlDialect().getDatePart(Calendar.YEAR, ExprColumn.STR_TABLE_ALIAS + "." + column.getSelectName()));
-        SQLFragment monthA = new SQLFragment(schema.getSqlDialect().getDatePart(Calendar.MONTH, ExprColumn.STR_TABLE_ALIAS + "." + column.getSelectName()));
-        SQLFragment dayA = new SQLFragment(schema.getSqlDialect().getDatePart(Calendar.DATE, ExprColumn.STR_TABLE_ALIAS + "." + column.getSelectName()));
+        SQLFragment yearA = schema.getSqlDialect().getDatePart(Calendar.YEAR, column.getValueSql(ExprColumn.STR_TABLE_ALIAS));
+        SQLFragment monthA = schema.getSqlDialect().getDatePart(Calendar.MONTH, column.getValueSql(ExprColumn.STR_TABLE_ALIAS));
+        SQLFragment dayA = schema.getSqlDialect().getDatePart(Calendar.DATE, column.getValueSql(ExprColumn.STR_TABLE_ALIAS));
 
         String curDateExpr = getCurDateExpr(deathCol);
         SQLFragment yearB = new SQLFragment(schema.getSqlDialect().getDatePart(Calendar.YEAR, curDateExpr));