Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ private static TableInfo getPivotByPrecursorChromInfoTable(Container container,
{
sb.append(qe.getMessage()).append('\n');
}
throw new IllegalStateException(sb + "\n.SQL: " + sql);
throw new IllegalStateException(sb + "\n.SQL: " + sql.toDebugString());
}

return tableInfo;
Expand Down
3 changes: 2 additions & 1 deletion src/org/labkey/targetedms/query/TargetedMSTable.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ public SQLFragment getFromSQL(String alias)
// See issue 38134 - don't filter if we don't need to because we're on the other side of a FK/lookup
if ((getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter() && !(getContainerFilter() instanceof TargetedMSForeignKey.AnnotationsContainerFilter)) || _containerTableFilter != null)
{
sql.append(_joinType != null ? _joinType.getSQL() : "");
if (_joinType != null)
sql.append(_joinType.getSQL());

sql.append(" WHERE ");
sql.append(getContainerFilter().getSQLFragment(getSchema(), _containerSQL));
Expand Down
Loading