Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix small mistake in 2->3 upgrade script.

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-07-22 20:59:52 +02:00
parent 0d28dce326
commit 0692be9bae
No known key found for this signature in database
GPG key ID: FB60471F0575164A
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
advanced/Scripts/database_migration/gravity/2_to_3.sql
View file

@ -40,14 +40,14 @@ CREATE TABLE regex_whitelist
CREATE TABLE regex_whitelist_by_group CREATE TABLE regex_whitelist_by_group
( (
regex_id INTEGER NOT NULL REFERENCES regex_whitelist (id), regex_whitelist_id INTEGER NOT NULL REFERENCES regex_whitelist (id),
group_id INTEGER NOT NULL REFERENCES "group" (id), group_id INTEGER NOT NULL REFERENCES "group" (id),
PRIMARY KEY (regex_id, group_id) PRIMARY KEY (regex_whitelist_id, group_id)
); );
CREATE VIEW vw_regex_whitelist AS SELECT DISTINCT domain CREATE VIEW vw_regex_whitelist AS SELECT DISTINCT domain
FROM regex_whitelist FROM regex_whitelist
LEFT JOIN regex_whitelist_by_group ON regex_whitelist_by_group.regex_id = regex_whitelist.id LEFT JOIN regex_whitelist_by_group ON regex_whitelist_by_group.regex_whitelist_id = regex_whitelist.id
LEFT JOIN "group" ON "group".id = regex_whitelist_by_group.group_id LEFT JOIN "group" ON "group".id = regex_whitelist_by_group.group_id
WHERE regex_whitelist.enabled = 1 AND (regex_whitelist_by_group.group_id IS NULL OR "group".enabled = 1) WHERE regex_whitelist.enabled = 1 AND (regex_whitelist_by_group.group_id IS NULL OR "group".enabled = 1)
ORDER BY regex_whitelist.id; ORDER BY regex_whitelist.id;