mirror/goaway
1
0
Fork 0
mirror of https://github.com/pommee/goaway.git synced 2026-01-11 08:31:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct behavior of unique constraint on blacklists table

Browse Source
This commit is contained in:
pommee
2025-09-29 16:00:57 +02:00
parent 4025b8bfe9
commit d9b064e59f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/dns/lists/blacklist.go
View File

@@ -620,7 +620,7 @@ func (b *Blacklist) GetListStatistics(listname string) (string, SourceStats, err
var result SourceWithCount
err := b.DBManager.Conn.Table("sources s").
Select("s.name, s.url, s.last_updated, s.active, COALESCE(bc.blocked_count, 0) as blocked_count").
Joins("LEFT JOIN (SELECT source_id, COUNT(*) as blocked_count FROM blacklist GROUP BY source_id) bc ON s.id = bc.source_id").
Joins("LEFT JOIN (SELECT source_id, COUNT(*) as blocked_count FROM blacklists GROUP BY source_id) bc ON s.id = bc.source_id").
Where("s.name = ?", listname).
First(&result).Error
@@ -756,8 +756,8 @@ func (b *Blacklist) AddSource(name, url string) error {
if err := b.DBManager.Conn.Clauses(
clause.OnConflict{
Columns: []clause.Column{{Name: "name"}, {Name: "url"}},
DoNothing: true,
Columns: []clause.Column{{Name: "url"}},
DoUpdates: clause.AssignmentColumns([]string{"name", "last_updated", "active"}),
},
).Create(&database.Source{
Name: name,