Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-26 17:20:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

New command "pihole -g -r" recreates gravity.db based on files backed up in /etc/pihole/migration_update. This is useful to restore a working version of the database when the user destroyed the original database. Also, update gravity.db to version 5 because of a fix we needed to implement.

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-11-26 10:58:39 +01:00
parent d883854aad
commit 037d52104a
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
3 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
advanced/Scripts/database_migration/gravity-db.sh
View file

@ -44,9 +44,17 @@ upgrade_gravityDB(){
version=3
fi
if [[ "$version" == "3" ]]; then
# This migration script upgrades the gravity and adlist views
# This migration script upgrades the gravity and list views
# implementing necessary changes for per-client blocking
echo -e " ${INFO} Upgrading gravity database from version 3 to 4"
sqlite3 "${database}" < "${scriptPath}/3_to_4.sql"
version=3
version=4
fi
if [[ "$version" == "4" ]]; then
# This migration script upgrades the adlist view
# to return an ID used in gravity.sh
echo -e " ${INFO} Upgrading gravity database from version 4 to 5"
sqlite3 "${database}" < "${scriptPath}/4_to_5.sql"
version=5
fi
}

17
advanced/Scripts/database_migration/gravity/4_to_5.sql Normal file
View file

@ -0,0 +1,17 @@
.timeout 30000
PRAGMA FOREIGN_KEYS=OFF;
BEGIN TRANSACTION;
DROP VIEW vw_adlist;
CREATE VIEW vw_adlist AS SELECT DISTINCT address, adlist.id AS id
FROM adlist
LEFT JOIN adlist_by_group ON adlist_by_group.adlist_id = adlist.id
LEFT JOIN "group" ON "group".id = adlist_by_group.group_id
WHERE adlist.enabled = 1 AND (adlist_by_group.group_id IS NULL OR "group".enabled = 1)
ORDER BY adlist.id;
UPDATE info SET value = 5 WHERE property = 'version';
COMMIT;