admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2018-12-03 23:51:14 +00:00
parent e36c18a593
commit 43766f572b
1 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
View File

@@ -650,28 +650,11 @@ namespace AyaNova.Biz
//https://docs.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings#Roundtrip //https://docs.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings#Roundtrip
System.DateTime dtData = DateTime.Parse(sValue); System.DateTime dtData = DateTime.Parse(sValue);
//RAVEN NOTE: there is some old code kept commented out for now as I'm not certain I need the high low stuff anymore
// sValue = dtData.ToString(SqlDateFormatHighLow(false));
// string sHighEnd = dtData.ToString(SqlDateFormatHighLow(true));
// string sLowEnd = dtData.ToString(SqlDateFormatHighLow(false));
// string sGreaterThanValue = dtData.AddSeconds(1).ToString(SqlDateFormatHighLow(false));
// string sLessThanValue = dtData.AddSeconds(-1).ToString(SqlDateFormatHighLow(true));
sValue = PostgresDateFormat(ZeroMilliseconds(dtData));
string sHighEnd = PostgresDateFormat(MaxMilliseconds(dtData)); string sHighEnd = PostgresDateFormat(MaxMilliseconds(dtData));
string sLowEnd = PostgresDateFormat(ZeroMilliseconds(dtData)); string sLowEnd = PostgresDateFormat(ZeroMilliseconds(dtData));
string sGreaterThanValue = PostgresDateFormat(ZeroMilliseconds(dtData.AddSeconds(1)));
string sLessThanValue = PostgresDateFormat(MaxMilliseconds(dtData.AddSeconds(-1)));
switch (sOperator) switch (sOperator)
{ {
//case FilterComparisonOperator.Equality:
// sb.Append("='");
// sb.Append(sValue);
// sb.Append("'");
// break;
case FilterComparisonOperator.Equality: case FilterComparisonOperator.Equality:
sb.Append(">='"); sb.Append(">='");
@@ -682,14 +665,14 @@ namespace AyaNova.Biz
sb.Append("<='"); sb.Append("<='");
sb.Append(sHighEnd); sb.Append(sHighEnd);
sb.Append("'"); sb.Append("'");
break; break;
case FilterComparisonOperator.GreaterThan: case FilterComparisonOperator.GreaterThan:
sb.Append(">'"); sb.Append(">'");
sb.Append(sGreaterThanValue); sb.Append(sLowEnd);
sb.Append("'"); sb.Append("'");
break; break;
case FilterComparisonOperator.GreaterThanOrEqualTo: case FilterComparisonOperator.GreaterThanOrEqualTo:
sb.Append(">='"); sb.Append(">='");
sb.Append(sLowEnd); sb.Append(sLowEnd);
@@ -697,7 +680,7 @@ namespace AyaNova.Biz
break; break;
case FilterComparisonOperator.LessThan: case FilterComparisonOperator.LessThan:
sb.Append("<'"); sb.Append("<'");
sb.Append(sLessThanValue); sb.Append(sHighEnd);
sb.Append("'"); sb.Append("'");
break; break;
case FilterComparisonOperator.LessThanOrEqualTo: case FilterComparisonOperator.LessThanOrEqualTo:
@@ -706,11 +689,7 @@ namespace AyaNova.Biz
sb.Append("'"); sb.Append("'");
break; break;
//case FilterComparisonOperator.NotEqual:
// sb.Append("<>'");
// sb.Append(sValue);
// sb.Append("'");
// break;
case FilterComparisonOperator.NotEqual: case FilterComparisonOperator.NotEqual:
sb.Append("<'"); sb.Append("<'");
sb.Append(sLowEnd); sb.Append(sLowEnd);