Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-05 16:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve database filtering for Created and Updated fields https://github.com/siyuan-note/siyuan/issues/10522

Browse source
This commit is contained in:
Daniel 2024-03-06 09:11:50 +08:00
parent 7b4db8722b
commit 23c4f81289
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 54 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

72
kernel/av/table.go
View file

@ -456,21 +456,39 @@ func (value *Value) compareOperator(filter *ViewFilter) bool {
if nil != value.Created && nil != filter.Value.Created {
switch operator {
case FilterOperatorIsEqual:
return value.Created.Content == filter.Value.Created.Content
start := time.UnixMilli(filter.Value.Created.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
end := start.AddDate(0, 0, 1)
return value.Created.Content >= start.UnixMilli() && value.Created.Content < end.UnixMilli()
case FilterOperatorIsNotEqual:
return value.Created.Content != filter.Value.Created.Content
start := time.UnixMilli(filter.Value.Created.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
end := start.AddDate(0, 0, 1)
return value.Created.Content < start.UnixMilli() || value.Created.Content >= end.UnixMilli()
case FilterOperatorIsGreater:
return value.Created.Content > filter.Value.Created.Content
start := time.UnixMilli(filter.Value.Created.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
end := start.AddDate(0, 0, 1)
return value.Created.Content >= end.UnixMilli()
case FilterOperatorIsGreaterOrEqual:
return value.Created.Content >= filter.Value.Created.Content
start := time.UnixMilli(filter.Value.Created.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
return value.Created.Content >= start.UnixMilli()
case FilterOperatorIsLess:
return value.Created.Content < filter.Value.Created.Content
start := time.UnixMilli(filter.Value.Created.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
return value.Created.Content < start.UnixMilli()
case FilterOperatorIsLessOrEqual:
return value.Created.Content <= filter.Value.Created.Content
start := time.UnixMilli(filter.Value.Created.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
end := start.AddDate(0, 0, 1)
return value.Created.Content < end.UnixMilli()
case FilterOperatorIsBetween:
start := value.Created.Content >= filter.Value.Created.Content
end := value.Created.Content <= filter.Value.Created.Content2
return start && end
start := time.UnixMilli(filter.Value.Created.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
end := time.UnixMilli(filter.Value.Created.Content2)
end = time.Date(end.Year(), end.Month(), end.Day(), 0, 0, 0, 0, time.Local)
return value.Created.Content >= start.UnixMilli() && value.Created.Content < end.UnixMilli()
case FilterOperatorIsEmpty:
return !value.Created.IsNotEmpty
case FilterOperatorIsNotEmpty:
@ -481,21 +499,39 @@ func (value *Value) compareOperator(filter *ViewFilter) bool {
if nil != value.Updated && nil != filter.Value.Updated {
switch operator {
case FilterOperatorIsEqual:
return value.Updated.Content == filter.Value.Updated.Content
start := time.UnixMilli(filter.Value.Updated.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
end := start.AddDate(0, 0, 1)
return value.Updated.Content >= start.UnixMilli() && value.Updated.Content < end.UnixMilli()
case FilterOperatorIsNotEqual:
return value.Updated.Content != filter.Value.Updated.Content
start := time.UnixMilli(filter.Value.Updated.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
end := start.AddDate(0, 0, 1)
return value.Updated.Content < start.UnixMilli() || value.Updated.Content >= end.UnixMilli()
case FilterOperatorIsGreater:
return value.Updated.Content > filter.Value.Updated.Content
start := time.UnixMilli(filter.Value.Updated.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
end := start.AddDate(0, 0, 1)
return value.Updated.Content >= end.UnixMilli()
case FilterOperatorIsGreaterOrEqual:
return value.Updated.Content >= filter.Value.Updated.Content
start := time.UnixMilli(filter.Value.Updated.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
return value.Updated.Content >= start.UnixMilli()
case FilterOperatorIsLess:
return value.Updated.Content < filter.Value.Updated.Content
start := time.UnixMilli(filter.Value.Updated.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
return value.Updated.Content < start.UnixMilli()
case FilterOperatorIsLessOrEqual:
return value.Updated.Content <= filter.Value.Updated.Content
start := time.UnixMilli(filter.Value.Updated.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
end := start.AddDate(0, 0, 1)
return value.Updated.Content < end.UnixMilli()
case FilterOperatorIsBetween:
start := value.Updated.Content >= filter.Value.Updated.Content
end := value.Updated.Content <= filter.Value.Updated.Content2
return start && end
start := time.UnixMilli(filter.Value.Updated.Content)
start = time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, time.Local)
end := time.UnixMilli(filter.Value.Updated.Content2)
end = time.Date(end.Year(), end.Month(), end.Day(), 0, 0, 0, 0, time.Local)
return value.Updated.Content >= start.UnixMilli() && value.Updated.Content < end.UnixMilli()
case FilterOperatorIsEmpty:
return !value.Updated.IsNotEmpty
case FilterOperatorIsNotEmpty: