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
2021-02-05 18:08:44 +00:00
parent 30a7164669
commit 8b072ac322
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
View File

@@ -814,7 +814,9 @@ namespace AyaNova.DataList
//and exactly the end of range in question as END timestamp //and exactly the end of range in question as END timestamp
string sDateValueWithMaxMilliseconds = PostgresDateFormat(MaxMilliseconds(dtData)); string sDateValueWithMaxMilliseconds = PostgresDateFormat(MaxMilliseconds(dtData));
string sDateValueWithZeroMilliseconds = PostgresDateFormat(ZeroMilliseconds(dtData)); string sDateValueWithZeroMilliseconds = PostgresDateFormat(ZeroMilliseconds(dtData));
string sDateValueWithZeroSeconds = PostgresDateFormat(ZeroSeconds(dtData)); string sDateValueWithZeroSeconds = PostgresDateFormat(ZeroSeconds(dtData));
string sDateValueWithMaxSeconds = PostgresDateFormat(MaxSeconds(dtData));
switch (sOperator) switch (sOperator)
{ {
@@ -825,7 +827,7 @@ namespace AyaNova.DataList
sb.Append(SqlColumnNameToFilter); sb.Append(SqlColumnNameToFilter);
sb.Append(" "); sb.Append(" ");
sb.Append("<='"); sb.Append("<='");
sb.Append(sDateValueWithMaxMilliseconds); sb.Append(sDateValueWithMaxSeconds);
sb.Append("'"); sb.Append("'");
break; break;
@@ -1003,7 +1005,7 @@ namespace AyaNova.DataList
private static DateTime ZeroSeconds(DateTime d) private static DateTime ZeroSeconds(DateTime d)
{ {
if (d.Millisecond == 0) return d;
return new DateTime(d.Year, d.Month, d.Day, d.Hour, d.Minute, 0, DateTimeKind.Utc); return new DateTime(d.Year, d.Month, d.Day, d.Hour, d.Minute, 0, DateTimeKind.Utc);
} }
@@ -1012,6 +1014,12 @@ namespace AyaNova.DataList
if (d.Millisecond == 0) return d; if (d.Millisecond == 0) return d;
return new DateTime(d.Year, d.Month, d.Day, d.Hour, d.Minute, d.Second, DateTimeKind.Utc); return new DateTime(d.Year, d.Month, d.Day, d.Hour, d.Minute, d.Second, DateTimeKind.Utc);
} }
private static DateTime MaxSeconds(DateTime d)
{
return new DateTime(d.Year, d.Month, d.Day, d.Hour, d.Minute, 59, 999, DateTimeKind.Utc);
}
private static DateTime MaxMilliseconds(DateTime d) private static DateTime MaxMilliseconds(DateTime d)
{ {
if (d.Millisecond == 999) return d; if (d.Millisecond == 999) return d;