diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs index dae2d9f5..549873b8 100644 --- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs +++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs @@ -656,7 +656,7 @@ namespace AyaNova.Biz case FilterComparisonOperator.Equality: sb.Append(">='"); sb.Append(sLowEnd); - sb.Append("') AND ("); + sb.Append("' AND "); sb.Append(sColumn); sb.Append(" "); sb.Append("<='"); @@ -689,7 +689,7 @@ namespace AyaNova.Biz case FilterComparisonOperator.NotEqual: sb.Append("<'"); sb.Append(sLowEnd); - sb.Append("') OR ("); + sb.Append("' OR "); sb.Append(sColumn); sb.Append(" "); sb.Append(">'"); @@ -785,7 +785,7 @@ namespace AyaNova.Biz { sb.Append(">'"); sb.Append(PostgresDateFormat(dtAfter)); - sb.Append("') AND ("); + sb.Append("' AND "); sb.Append(sColumn); sb.Append(" "); sb.Append("<'"); diff --git a/test/raven-integration/DataFilter/DataFilterFilteringLists.cs b/test/raven-integration/DataFilter/DataFilterFilteringLists.cs index 8b21ad18..3c990cef 100644 --- a/test/raven-integration/DataFilter/DataFilterFilteringLists.cs +++ b/test/raven-integration/DataFilter/DataFilterFilteringLists.cs @@ -91,12 +91,11 @@ namespace raven_integration DataFilterNameStart.value = WidgetNameStart; dfilter.Add(DataFilterNameStart); - //inclusive test filter - + //## INCLUSIVE FILTER dynamic FilterItem = new JObject(); FilterItem.fld = "startdate"; FilterItem.op = OpEquality; - FilterItem.value = new DateTime(1968, 3, 10, 10, 0, 0).ToUniversalTime(); + FilterItem.value = new DateTime(1968, 3, 12, 10, 0, 0).ToUniversalTime(); dfilter.Add(FilterItem); d.filter = dfilter.ToString();//it expects it to be a json string, not actual json