Add another coalesce() term in case name and label are blank

Author: bbimber

Studies/resources/schemas/studies.xml

@@ -140,6 +140,7 @@
             </column>
             <column columnName="studyName">
                 <columnTitle>Study Name</columnTitle>
+                <nullable>false</nullable>
             </column>
             <column columnName="label">
                 <columnTitle>Label</columnTitle>

Studies/src/org/labkey/studies/query/StudiesUserSchema.java

@@ -173,7 +173,8 @@ private TableInfo createCohortsTable(String name, ContainerFilter cf)
     {
         CustomPermissionsTable<?> ret = createStudyDesignTable(name, cf, true);
 
-        SQLFragment sql2 = new SQLFragment("coalesce(" + ExprColumn.STR_TABLE_ALIAS + ".label, " + ExprColumn.STR_TABLE_ALIAS + ".cohortName)");
+        SQLFragment lastTerm = ret.getSqlDialect().concatenate(new SQLFragment("'Cohort-'"), new SQLFragment("CAST(" + ExprColumn.STR_TABLE_ALIAS + ".rowId AS VARCHAR)"));
+        SQLFragment sql2 = new SQLFragment("coalesce(" + ExprColumn.STR_TABLE_ALIAS + ".label, " + ExprColumn.STR_TABLE_ALIAS + ".cohortName, ").append(lastTerm).append(new SQLFragment(")"));
         ExprColumn col2 = new ExprColumn(ret, "labelOrName", sql2, JdbcType.VARCHAR, ret.getColumn("cohortName"), ret.getColumn("label"));
         col2.setLabel("Cohort Name");
         col2.setHidden(true);