Skip to content

Remove deprecated methods from SQLFragment #7080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 2 commits into from
Sep 29, 2025
Merged

Remove deprecated methods from SQLFragment #7080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d1e495
Remove deprecated methods from SQLFragment
labkey-jeckels Sep 27, 2025
c628745
Another deprecated method to remove
labkey-jeckels Sep 27, 2025
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
24 changes: 5 additions & 19 deletions api/src/org/labkey/api/data/SQLFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.labkey.api.data;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
Expand Down Expand Up @@ -207,11 +208,11 @@ private String replaceCteTokens(String self, String select, List<Pair<String,CTE
CTE cte = pair.second;
for (String token : cte.tokens)
{
select = StringUtils.replace(select, token, alias);
select = Strings.CS.replace(select, token, alias);
}
}
if (null != self)
select = StringUtils.replace(select, "$SELF$", self);
select = Strings.CS.replace(select, "$SELF$", self);
return select;
}

Expand Down Expand Up @@ -409,11 +410,6 @@ public SQLFragment append(CharSequence charseq)
return this;
}

@Deprecated
public SQLFragment append(DatabaseIdentifier id)
{
return append(id.getSql());
}
public SQLFragment appendIdentifier(DatabaseIdentifier id)
{
return append(id.getSql());
Expand Down Expand Up @@ -599,12 +595,11 @@ public SQLFragment appendValue(Number N)

if (N instanceof BigDecimal || N instanceof BigInteger || N instanceof Long)
{
getStringBuilder().append(String.valueOf(N));
getStringBuilder().append(N);
}
else if (Double.isFinite(N.doubleValue()))
{
// Do we know that default java toString() for all numbers creates a valid SQL literal?
getStringBuilder().append(String.valueOf(N));
getStringBuilder().append(N);
}
else
{
Expand Down Expand Up @@ -1346,13 +1341,4 @@ public static SQLFragment join(Iterable<SQLFragment> fragments, String separator

return new SQLFragment(sql, params);
}



/* REMOVE THIS - These methods are going away, but this allows us to merge w/o doing 100 modules at the same time */
// @Deprecated public SQLFragment append(@NotNull Container c) {return appendValue(c);}
@Deprecated public SQLFragment append(Integer i) {return appendValue(i);}
// @Deprecated public SQLFragment append(java.util.Date date) {return appendValue(date);}
@Deprecated public SQLFragment appendStringLiteral(CharSequence s) {return appendValue(s);}
/* END OF REMOVE THIS */
}
7 changes: 0 additions & 7 deletions query/src/org/labkey/query/sql/SqlBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,6 @@ public SQLFragment appendValue(CharSequence s)
return super.appendValue(s, _dialect);
}

// @Override
@Override
public SQLFragment appendStringLiteral(CharSequence s)
{
return super.appendStringLiteral(s, _dialect);
}

@Override
public SQLFragment appendStringLiteral(CharSequence s, @NotNull SqlDialect d)
{
Expand Down
18 changes: 9 additions & 9 deletions specimen/src/org/labkey/specimen/importer/SpecimenImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,7 @@ private SQLFragment getVialColsSql(List<SpecimenColumn> availableColumns)
SQLFragment cols = new SQLFragment();
for (SpecimenColumn col : getVialCols(availableColumns))
{
cols.append(sep).append(col.getLegalDbColumnName(getSqlDialect()));
cols.append(sep).appendIdentifier(col.getLegalDbColumnName(getSqlDialect()));
sep = ",\n ";
}
_vialColsSql = cols;
Expand Down Expand Up @@ -1246,7 +1246,7 @@ private SQLFragment getSpecimenEventColsSql(List<SpecimenColumn> availableColumn
SQLFragment cols = new SQLFragment();
for (SpecimenColumn col : getSpecimenEventCols(availableColumns))
{
cols.append(sep).append(col.getLegalDbColumnName(getSqlDialect()));
cols.append(sep).appendIdentifier(col.getLegalDbColumnName(getSqlDialect()));
sep = ",\n ";
}
_vialEventColsSql = cols;
Expand Down Expand Up @@ -1422,7 +1422,7 @@ private void appendConflictResolvingSQL(SqlDialect dialect, SQLFragment sql, Spe
{
if (null != castColumn)
{
sql.append(" COUNT(DISTINCT ").append(tempTableName).append(".").append(castColumn.getLegalDbColumnName(getSqlDialect())).append(") = 1 THEN ");
sql.append(" COUNT(DISTINCT ").append(tempTableName).append(".").appendIdentifier(castColumn.getLegalDbColumnName(getSqlDialect())).append(") = 1 THEN ");
sql.append("CAST(MIN(").append(selectCol).append(") AS ").append(castColumn.getDbType()).append(")");
}
else
Expand All @@ -1436,9 +1436,9 @@ private void appendConflictResolvingSQL(SqlDialect dialect, SQLFragment sql, Spe
sql.append(" AS ");

if (null != castColumn)
sql.append(castColumn.getLegalDbColumnName(getSqlDialect()));
sql.appendIdentifier(castColumn.getLegalDbColumnName(getSqlDialect()));
else
sql.append(col.getLegalDbColumnName(getSqlDialect()));
sql.appendIdentifier(col.getLegalDbColumnName(getSqlDialect()));
}


Expand Down Expand Up @@ -1591,7 +1591,7 @@ private void populateVials(SpecimenLoadInfo info, boolean merge, boolean seenVis
.add(Boolean.TRUE);

for (SpecimenColumn col : getVialCols(info.getAvailableColumns()))
insertSelectSql.append(prefix).append("VialList.").append(col.getLegalDbColumnName(getSqlDialect()));
insertSelectSql.append(prefix).append("VialList.").appendIdentifier(col.getLegalDbColumnName(getSqlDialect()));

insertSelectSql
.append(" FROM (").append(getVialListFromTempTableSql(info, false, seenVisitValue))
Expand Down Expand Up @@ -2412,10 +2412,10 @@ protected void remapTempTableLookupIndexes(DbSchema schema, String tempTable, Li
{
if (col.getFkTable() != null)
{
remapExternalIdsSql.append(sep).append(col.getLegalDbColumnName(getSqlDialect())).append(" = (SELECT RowId FROM ")
remapExternalIdsSql.append(sep).appendIdentifier(col.getLegalDbColumnName(getSqlDialect())).append(" = (SELECT RowId FROM ")
.append(getTableInfoFromFkTableName(col.getFkTable()).getSelectName()).append(" ").append(col.getFkTableAlias())
.append(" WHERE ").append("(").append(tempTable).append(".")
.append(col.getLegalDbColumnName(getSqlDialect())).append(" = ").append(col.getFkTableAlias()).append(".").append(col.getFkColumn())
.appendIdentifier(col.getLegalDbColumnName(getSqlDialect())).append(" = ").append(col.getFkTableAlias()).append(".").append(col.getFkColumn())
.append("))");
sep = ",\n\t";
}
Expand Down Expand Up @@ -2610,7 +2610,7 @@ private void updateTempTableSpecimenHash(TempTablesHolder tempTablesHolder, List
conflictResolvingSubselect.append(singletonAggregate);
conflictResolvingSubselect.append(" ELSE NULL END");
}
conflictResolvingSubselect.append(" AS ").append(col.getLegalDbColumnName(getSqlDialect()));
conflictResolvingSubselect.append(" AS ").appendIdentifier(col.getLegalDbColumnName(getSqlDialect()));
}
}
conflictResolvingSubselect.append("\nFROM ").append(tempTableName).append("\nGROUP BY GlobalUniqueId");
Expand Down