Skip to content

Commit d19bff6

Browse files
bbimberbbimber
authored
Merge pull request #220 from LabKey/fb_merge_24.7_to_develop
Merge discvr-24.7 to develop
2 parents 2bccf94 + 46f6fe5 commit d19bff6

File tree

1 file changed

+23
-18
lines changed

1 file changed

+23
-18
lines changed

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

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -385,15 +385,16 @@ private void appendMajorEventsCol(final UserSchema us, AbstractTableInfo ds, fin
385385
public TableInfo getLookupTableInfo()
386386
{
387387
Container target = us.getContainer().isWorkbookOrTab() ? us.getContainer().getParent() : us.getContainer();
388-
QueryDefinition qd = QueryService.get().createQueryDef(us.getUser(), target, us, colName);
388+
UserSchema effectiveUs = us.getContainer().isWorkbookOrTab() ? QueryService.get().getUserSchema(us.getUser(), target, us.getSchemaPath()) : us;
389+
QueryDefinition qd = QueryService.get().createQueryDef(us.getUser(), target, effectiveUs, colName);
389390

390391
qd.setSql(getMajorEventsSql(target, schemaName, querySelectName, pkColSelectName, subjectSelectName, dateSelectName));
391392
qd.setIsTemporary(true);
392393

393-
List<QueryException> errors = new ArrayList<QueryException>();
394+
List<QueryException> errors = new ArrayList<>();
394395
TableInfo ti = qd.getTable(errors, true);
395396

396-
if (errors.size() > 0){
397+
if (!errors.isEmpty()){
397398
_log.error("Problem with table customizer: " + publicTableName);
398399
for (QueryException e : errors)
399400
{
@@ -454,15 +455,16 @@ private void appendOverlapingProjectsCol(final UserSchema us, AbstractTableInfo
454455
public TableInfo getLookupTableInfo()
455456
{
456457
Container target = us.getContainer().isWorkbookOrTab() ? us.getContainer().getParent() : us.getContainer();
457-
QueryDefinition qd = QueryService.get().createQueryDef(us.getUser(), target, us, colName);
458+
UserSchema effectiveUs = us.getContainer().isWorkbookOrTab() ? QueryService.get().getUserSchema(us.getUser(), target, us.getSchemaPath()) : us;
459+
QueryDefinition qd = QueryService.get().createQueryDef(us.getUser(), target, effectiveUs, colName);
458460

459461
qd.setSql(getOverlapSql(target, schemaName, querySelectName, pkColSelectName, subjectSelectName, dateSelectName));
460462
qd.setIsTemporary(true);
461463

462-
List<QueryException> errors = new ArrayList<QueryException>();
464+
List<QueryException> errors = new ArrayList<>();
463465
TableInfo ti = qd.getTable(errors, true);
464466

465-
if (errors.size() > 0){
467+
if (!errors.isEmpty()){
466468
_log.error("Problem with table customizer: " + publicTableName);
467469
for (QueryException e : errors)
468470
{
@@ -506,10 +508,10 @@ public TableInfo getLookupTableInfo()
506508
qd.setSql(getOverlapPivotSql(target, schemaName, querySelectName, pkColSelectName, subjectColName, dateColName));
507509
qd.setIsTemporary(true);
508510

509-
List<QueryException> errors = new ArrayList<QueryException>();
511+
List<QueryException> errors = new ArrayList<>();
510512
TableInfo ti = qd.getTable(errors, true);
511513

512-
if (errors.size() > 0){
514+
if (!errors.isEmpty()){
513515
_log.error("Problem with table customizer: " + publicTableName);
514516
for (QueryException e : errors)
515517
{
@@ -564,15 +566,16 @@ public void appendProjectsCol(final UserSchema us, AbstractTableInfo ds, final S
564566
public TableInfo getLookupTableInfo()
565567
{
566568
Container target = us.getContainer().isWorkbookOrTab() ? us.getContainer().getParent() : us.getContainer();
567-
QueryDefinition qd = QueryService.get().createQueryDef(us.getUser(), target, us, colName);
569+
UserSchema effectiveUs = us.getContainer().isWorkbookOrTab() ? QueryService.get().getUserSchema(us.getUser(), target, us.getSchemaPath()) : us;
570+
QueryDefinition qd = QueryService.get().createQueryDef(us.getUser(), target, effectiveUs, colName);
568571

569572
qd.setSql(getOverlapSql(target, schemaName, querySelectName, pkColSelectName, subjectSelectName, null));
570573
qd.setIsTemporary(true);
571574

572-
List<QueryException> errors = new ArrayList<QueryException>();
575+
List<QueryException> errors = new ArrayList<>();
573576
TableInfo ti = qd.getTable(errors, true);
574577

575-
if (errors.size() > 0){
578+
if (!errors.isEmpty()){
576579
_log.error("Problem with table customizer: " + publicTableName);
577580
for (QueryException e : errors)
578581
{
@@ -611,15 +614,16 @@ public TableInfo getLookupTableInfo()
611614
public TableInfo getLookupTableInfo()
612615
{
613616
Container target = us.getContainer().isWorkbookOrTab() ? us.getContainer().getParent() : us.getContainer();
614-
QueryDefinition qd = QueryService.get().createQueryDef(us.getUser(), target, us, lookupName);
617+
UserSchema effectiveUs = us.getContainer().isWorkbookOrTab() ? QueryService.get().getUserSchema(us.getUser(), target, us.getSchemaPath()) : us;
618+
QueryDefinition qd = QueryService.get().createQueryDef(us.getUser(), target, effectiveUs, lookupName);
615619

616620
qd.setSql(getOverlapPivotSql(target, schemaName, querySelectName, pkColSelectName, subjectSelectName, null));
617621
qd.setIsTemporary(true);
618622

619-
List<QueryException> errors = new ArrayList<QueryException>();
623+
List<QueryException> errors = new ArrayList<>();
620624
TableInfo ti = qd.getTable(errors, true);
621625

622-
if (errors.size() > 0){
626+
if (!errors.isEmpty()){
623627
_log.error("Problem with table customizer: " + publicTableName);
624628
for (QueryException e : errors)
625629
{
@@ -670,7 +674,7 @@ private String getOverlapSql(Container source, String schemaName, String querySe
670674
"\n" +
671675
") s\n" +
672676
"\n" +
673-
"GROUP BY s." + pkColSelectName + "";
677+
"GROUP BY s." + pkColSelectName;
674678
}
675679

676680
private String getOverlapPivotSql(Container source, String schemaName, String querySelectName, String pkColSelectName, String subjectSelectName, @Nullable String dateSelectName)
@@ -762,7 +766,8 @@ private void appendRelativeDatesCol(final UserSchema us, AbstractTableInfo ds, f
762766
public TableInfo getLookupTableInfo()
763767
{
764768
Container target = us.getContainer().isWorkbookOrTab() ? us.getContainer().getParent() : us.getContainer();
765-
QueryDefinition qd = QueryService.get().createQueryDef(us.getUser(), target, us, colName);
769+
UserSchema effectiveUs = us.getContainer().isWorkbookOrTab() ? QueryService.get().getUserSchema(us.getUser(), target, us.getSchemaPath()) : us;
770+
QueryDefinition qd = QueryService.get().createQueryDef(us.getUser(), target, effectiveUs, colName);
766771

767772
qd.setSql("SELECT\n" +
768773
"t." + pkColSelectName + ",\n" +
@@ -801,9 +806,9 @@ public TableInfo getLookupTableInfo()
801806

802807
qd.setIsTemporary(true);
803808

804-
List<QueryException> errors = new ArrayList<QueryException>();
809+
List<QueryException> errors = new ArrayList<>();
805810
TableInfo ti = qd.getTable(errors, true);
806-
if (errors.size() > 0){
811+
if (!errors.isEmpty()){
807812
_log.error("Problem with table customizer: " + publicTableName);
808813
for (QueryException e : errors)
809814
{

0 commit comments

Comments
 (0)