From 82a9232703043928db9b0e49094f2be751481562 Mon Sep 17 00:00:00 2001 From: labkey-martyp Date: Wed, 5 Aug 2020 10:06:54 -0700 Subject: [PATCH 1/2] Change SimpleTableDomainKind to use getValueSql --- internal/src/org/labkey/api/query/SimpleTableDomainKind.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/src/org/labkey/api/query/SimpleTableDomainKind.java b/internal/src/org/labkey/api/query/SimpleTableDomainKind.java index 753c0d3ed4d..bd3ec8b1aa2 100644 --- a/internal/src/org/labkey/api/query/SimpleTableDomainKind.java +++ b/internal/src/org/labkey/api/query/SimpleTableDomainKind.java @@ -165,7 +165,7 @@ public SQLFragment sqlObjectIdsInDomain(Domain domain) TableInfo schemaTable = table.getRealTable(); SQLFragment sql = new SQLFragment(); - sql.append("SELECT o.ObjectId FROM " + schemaTable + " me, exp.object o WHERE me." + objectUriColumn.getSelectName() + " = o.ObjectURI AND me.Container = ?"); + sql.append("SELECT o.ObjectId FROM " + schemaTable + " me, exp.object o WHERE " + objectUriColumn.getValueSql("me") + " = o.ObjectURI AND me.Container = ?"); sql.add(domain.getContainer().getId()); return sql; } From e881bc10599321440676125c69e4a74de8ec594b Mon Sep 17 00:00:00 2001 From: labkey-martyp Date: Wed, 5 Aug 2020 12:34:48 -0700 Subject: [PATCH 2/2] Update sql generation. Don't need raw table --- internal/src/org/labkey/api/query/SimpleTableDomainKind.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/internal/src/org/labkey/api/query/SimpleTableDomainKind.java b/internal/src/org/labkey/api/query/SimpleTableDomainKind.java index bd3ec8b1aa2..02bf261cb2f 100644 --- a/internal/src/org/labkey/api/query/SimpleTableDomainKind.java +++ b/internal/src/org/labkey/api/query/SimpleTableDomainKind.java @@ -162,10 +162,8 @@ public SQLFragment sqlObjectIdsInDomain(Domain domain) ColumnInfo objectUriColumn = table.getObjectUriColumn(); if (objectUriColumn != null) { - TableInfo schemaTable = table.getRealTable(); - SQLFragment sql = new SQLFragment(); - sql.append("SELECT o.ObjectId FROM " + schemaTable + " me, exp.object o WHERE " + objectUriColumn.getValueSql("me") + " = o.ObjectURI AND me.Container = ?"); + sql.append("SELECT o.ObjectId FROM ").append(table.getFromSQL("me")).append(", exp.object o WHERE ").append(objectUriColumn.getValueSql("me")).append(" = o.ObjectURI AND me.Container = ?"); sql.add(domain.getContainer().getId()); return sql; }