Skip to content

Fix some date compare clauses #6106

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-adam merged 1 commit into from
Nov 28, 2024
Merged

Fix some date compare clauses #6106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 2 additions & 31 deletions api/src/org/labkey/api/data/CompareType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,17 +1653,12 @@ private abstract static class DateCompareClause extends CompareClause
@Override
String toWhereClause(SqlDialect dialect, String alias)
{
// See Issue 51472
return dialect.isSqlServer() ?
dialect.getColumnSelectName(alias) + getSqlServerComparison() :
dialect.getColumnSelectName(alias) + _comparison.getSql().replace("?", SS_CAST) :
super.toWhereClause(dialect, alias);
}

// See Issue 51472
protected String getSqlServerComparison()
{
throw new IllegalStateException("Must override either toWhereClause() or getSqlServerComparison()");
}

@Override
protected void appendFilterText(StringBuilder sb, ColumnNameFormatter formatter)
{
Expand Down Expand Up @@ -1776,12 +1771,6 @@ static class DateGtCompareClause extends DateCompareClause
super(fieldKey, DATE_GT, " > ", rawFilterValue, addOneDay(startValue));
}

@Override
protected String getSqlServerComparison()
{
return " > " + SS_CAST;
}

@Override
protected boolean meetsCriteria(ColumnRenderProperties col, Object value)
{
Expand All @@ -1806,12 +1795,6 @@ static class DateGteCompareClause extends DateCompareClause
super(fieldKey, DATE_GTE, " >= ", rawFilterValue, startValue);
}

@Override
protected String getSqlServerComparison()
{
return " >= " + SS_CAST;
}

@Override
protected boolean meetsCriteria(ColumnRenderProperties col, Object value)
{
Expand All @@ -1836,12 +1819,6 @@ static class DateLtCompareClause extends DateCompareClause
super(fieldKey, DATE_LT, " < ", rawFilterValue, startValue);
}

@Override
protected String getSqlServerComparison()
{
return " < " + SS_CAST;
}

@Override
protected boolean meetsCriteria(ColumnRenderProperties col, Object value)
{
Expand All @@ -1866,12 +1843,6 @@ static class DateLteCompareClause extends DateCompareClause
super(fieldKey, DATE_LTE, " <= ", rawFilterValue, addOneDay(startValue));
}

@Override
protected String getSqlServerComparison()
{
return " <= " + SS_CAST;
}

@Override
protected boolean meetsCriteria(ColumnRenderProperties col, Object value)
{
Expand Down