Skip to content

Commit ffa209f

Browse files
committed
Merge remote-tracking branch 'origin/develop' into fb_redirectGH1023
2 parents 790646d + 46da741 commit ffa209f

6 files changed

Lines changed: 309 additions & 75 deletions

File tree

api/src/org/labkey/api/data/LookupColumn.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,9 @@ protected SQLFragment getJoinCondition(String tableAliasName, ColumnInfo fk, Col
216216
@SuppressWarnings({"ConstantConditions"})
217217
public void declareJoins(String baseAlias, Map<String, SQLFragment> map)
218218
{
219-
boolean assertEnabled = false; // needed to generate SQL for logging
220-
assert assertEnabled = true;
221-
222219
String colTableAlias = getTableAlias(baseAlias);
223220

224-
if (assertEnabled || !map.containsKey(colTableAlias))
221+
if (!map.containsKey(colTableAlias))
225222
{
226223
_foreignKey.declareJoins(baseAlias, map);
227224
for (ColumnInfo columnInfo : _additionalJoins.keySet())

0 commit comments

Comments
 (0)