Merge 24.7 to 24.11

LabKey · Dec 2, 2024 · fdbe07d · fdbe07d
2 parents 0f4b42e + c25ea3b
commit fdbe07d
Showing 1 changed file with 2 additions and 31 deletions.
diff --git a/api/src/org/labkey/api/data/CompareType.java b/api/src/org/labkey/api/data/CompareType.java
@@ -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)
         {
@@ -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)
         {
@@ -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)
         {
@@ -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)
         {
@@ -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)
         {