From dbd8dab1099443f827c152a1e16ef178a3c8bacd Mon Sep 17 00:00:00 2001 From: labkey-matthewb Date: Wed, 14 Oct 2026 17:46:06 -0700 Subject: [PATCH 1/2] Remove "implements Appendable, CharSequence" from SQLFragment These result in some odd and probably unexpected behavior. --- src/org/labkey/targetedms/query/TargetedMSTable.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/targetedms/query/TargetedMSTable.java b/src/org/labkey/targetedms/query/TargetedMSTable.java index ab9e6d57b..7f99cfeea 100644 --- a/src/org/labkey/targetedms/query/TargetedMSTable.java +++ b/src/org/labkey/targetedms/query/TargetedMSTable.java @@ -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)); From f3f3021f6cb7fe8f5735196336c8cda94e1b9192 Mon Sep 17 00:00:00 2001 From: labkey-matthewb Date: Thu, 15 Oct 2026 09:27:39 -0700 Subject: [PATCH 2/2] address more implicit casts SQLFragment->CharSequence --- .../query/GeneralMoleculePrecursorChromatogramsTableInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/targetedms/query/GeneralMoleculePrecursorChromatogramsTableInfo.java b/src/org/labkey/targetedms/query/GeneralMoleculePrecursorChromatogramsTableInfo.java index 8103a6a75..dedf2b860 100644 --- a/src/org/labkey/targetedms/query/GeneralMoleculePrecursorChromatogramsTableInfo.java +++ b/src/org/labkey/targetedms/query/GeneralMoleculePrecursorChromatogramsTableInfo.java @@ -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;