Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-25 06:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check whitelist_by_group.group_id instead of group.enabled against NULL.

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-06-30 23:07:03 +02:00
parent ad97e95f2f
commit 3a14e8b013
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
advanced/Templates/gravity.db.sql
View file

@ -96,7 +96,7 @@ CREATE VIEW vw_whitelist AS SELECT domain
FROM whitelist FROM whitelist
LEFT JOIN whitelist_by_group ON whitelist_by_group.whitelist_id = whitelist.id LEFT JOIN whitelist_by_group ON whitelist_by_group.whitelist_id = whitelist.id
LEFT JOIN "group" ON "group".id = whitelist_by_group.group_id LEFT JOIN "group" ON "group".id = whitelist_by_group.group_id
WHERE whitelist.enabled = 1 AND ("group".enabled IS NULL OR "group".enabled = 1) WHERE whitelist.enabled = 1 AND (whitelist_by_group.group_id IS NULL OR "group".enabled = 1)
ORDER BY whitelist.id; ORDER BY whitelist.id;
CREATE TRIGGER tr_whitelist_update AFTER UPDATE ON whitelist CREATE TRIGGER tr_whitelist_update AFTER UPDATE ON whitelist
@ -108,7 +108,7 @@ CREATE VIEW vw_blacklist AS SELECT domain
FROM blacklist FROM blacklist
LEFT JOIN blacklist_by_group ON blacklist_by_group.blacklist_id = blacklist.id LEFT JOIN blacklist_by_group ON blacklist_by_group.blacklist_id = blacklist.id
LEFT JOIN "group" ON "group".id = blacklist_by_group.group_id LEFT JOIN "group" ON "group".id = blacklist_by_group.group_id
WHERE blacklist.enabled = 1 AND ("group".enabled IS NULL OR "group".enabled = 1) WHERE blacklist.enabled = 1 AND (blacklist_by_group.group_id IS NULL OR "group".enabled = 1)
ORDER BY blacklist.id; ORDER BY blacklist.id;
CREATE TRIGGER tr_blacklist_update AFTER UPDATE ON blacklist CREATE TRIGGER tr_blacklist_update AFTER UPDATE ON blacklist
@ -120,7 +120,7 @@ CREATE VIEW vw_regex AS SELECT domain
FROM regex FROM regex
LEFT JOIN regex_by_group ON regex_by_group.regex_id = regex.id LEFT JOIN regex_by_group ON regex_by_group.regex_id = regex.id
LEFT JOIN "group" ON "group".id = regex_by_group.group_id LEFT JOIN "group" ON "group".id = regex_by_group.group_id
WHERE regex.enabled = 1 AND ("group".enabled IS NULL OR "group".enabled = 1) WHERE regex.enabled = 1 AND (regex_by_group.group_id IS NULL OR "group".enabled = 1)
ORDER BY regex.id; ORDER BY regex.id;
CREATE TRIGGER tr_regex_update AFTER UPDATE ON regex CREATE TRIGGER tr_regex_update AFTER UPDATE ON regex
@ -132,7 +132,7 @@ CREATE VIEW vw_adlists AS SELECT address
FROM adlists FROM adlists
LEFT JOIN adlists_by_group ON adlists_by_group.adlists_id = adlists.id LEFT JOIN adlists_by_group ON adlists_by_group.adlists_id = adlists.id
LEFT JOIN "group" ON "group".id = adlists_by_group.group_id LEFT JOIN "group" ON "group".id = adlists_by_group.group_id
WHERE adlists.enabled = 1 AND ("group".enabled IS NULL OR "group".enabled = 1) WHERE adlists.enabled = 1 AND (adlists_by_group.group_id IS NULL OR "group".enabled = 1)
ORDER BY adlists.id; ORDER BY adlists.id;
CREATE TRIGGER tr_adlists_update AFTER UPDATE ON adlists CREATE TRIGGER tr_adlists_update AFTER UPDATE ON adlists