From 07642c8ab715b22fdb73196d4c10ac29fffc2f5f Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 23 Jun 2020 16:49:55 +0200 Subject: [PATCH] Tests: Update gravity.db template used for the tests to version 12. Signed-off-by: DL6ER --- test/gravity.db.sql | 158 ++++++++++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 64 deletions(-) diff --git a/test/gravity.db.sql b/test/gravity.db.sql index 9c581b26..d0faa0ff 100644 --- a/test/gravity.db.sql +++ b/test/gravity.db.sql @@ -5,21 +5,12 @@ CREATE TABLE "group" ( id INTEGER PRIMARY KEY AUTOINCREMENT, enabled BOOLEAN NOT NULL DEFAULT 1, - name TEXT NOT NULL, + name TEXT UNIQUE NOT NULL, date_added INTEGER NOT NULL DEFAULT (cast(strftime('%s', 'now') as int)), date_modified INTEGER NOT NULL DEFAULT (cast(strftime('%s', 'now') as int)), description TEXT ); - -INSERT OR REPLACE INTO "group" (id,enabled,name) VALUES (0,1,'Unassociated'); -CREATE TRIGGER tr_group_zero AFTER DELETE ON "group" - BEGIN - INSERT OR REPLACE INTO "group" (id,enabled,name) VALUES (0,1,'Unassociated'); - END; -CREATE TRIGGER tr_group_update AFTER UPDATE ON "group" - BEGIN - UPDATE "group" SET date_modified = (cast(strftime('%s', 'now') as int)) WHERE id = NEW.id; - END; +INSERT INTO "group" (id,enabled,name,description) VALUES (0,1,'Default','The default group'); CREATE TABLE domainlist ( @@ -31,21 +22,6 @@ CREATE TABLE domainlist date_modified INTEGER NOT NULL DEFAULT (cast(strftime('%s', 'now') as int)), comment TEXT ); -CREATE TRIGGER tr_domainlist_update AFTER UPDATE ON domainlist - BEGIN - UPDATE domainlist SET date_modified = (cast(strftime('%s', 'now') as int)) WHERE domain = NEW.domain; - END; -CREATE TRIGGER tr_domainlist_add AFTER INSERT ON domainlist - BEGIN - INSERT INTO domainlist_by_group (domainlist_id, group_id) VALUES (NEW.id, 0); - END; - -CREATE TABLE domainlist_by_group -( - domainlist_id INTEGER NOT NULL REFERENCES domainlist (id), - group_id INTEGER NOT NULL REFERENCES "group" (id), - PRIMARY KEY (domainlist_id, group_id) -); CREATE TABLE adlist ( @@ -56,14 +32,6 @@ CREATE TABLE adlist date_modified INTEGER NOT NULL DEFAULT (cast(strftime('%s', 'now') as int)), comment TEXT ); -CREATE TRIGGER tr_adlist_update AFTER UPDATE ON adlist - BEGIN - UPDATE adlist SET date_modified = (cast(strftime('%s', 'now') as int)) WHERE address = NEW.address; - END; -CREATE TRIGGER tr_adlist_add AFTER INSERT ON adlist - BEGIN - INSERT INTO adlist_by_group (adlist_id, group_id) VALUES (NEW.id, 0); - END; CREATE TABLE adlist_by_group ( @@ -75,14 +43,38 @@ CREATE TABLE adlist_by_group CREATE TABLE gravity ( domain TEXT NOT NULL, - adlist_id INTEGER NOT NULL REFERENCES adlist (id), - PRIMARY KEY(domain, adlist_id) + adlist_id INTEGER NOT NULL REFERENCES adlist (id) +); + +CREATE TABLE info +( + property TEXT PRIMARY KEY, + value TEXT NOT NULL +); + +INSERT INTO "info" VALUES('version','12'); + +CREATE TABLE domain_audit +( + id INTEGER PRIMARY KEY AUTOINCREMENT, + domain TEXT UNIQUE NOT NULL, + date_added INTEGER NOT NULL DEFAULT (cast(strftime('%s', 'now') as int)) +); + +CREATE TABLE domainlist_by_group +( + domainlist_id INTEGER NOT NULL REFERENCES domainlist (id), + group_id INTEGER NOT NULL REFERENCES "group" (id), + PRIMARY KEY (domainlist_id, group_id) ); CREATE TABLE client ( id INTEGER PRIMARY KEY AUTOINCREMENT, - ip TEXT NOL NULL UNIQUE + ip TEXT NOL NULL UNIQUE, + date_added INTEGER NOT NULL DEFAULT (cast(strftime('%s', 'now') as int)), + date_modified INTEGER NOT NULL DEFAULT (cast(strftime('%s', 'now') as int)), + comment TEXT ); CREATE TABLE client_by_group @@ -92,30 +84,20 @@ CREATE TABLE client_by_group PRIMARY KEY (client_id, group_id) ); -CREATE TRIGGER tr_client_add AFTER INSERT ON client +CREATE TRIGGER tr_adlist_update AFTER UPDATE ON adlist BEGIN - INSERT INTO client_by_group (client_id, group_id) VALUES (NEW.id, 0); + UPDATE adlist SET date_modified = (cast(strftime('%s', 'now') as int)) WHERE address = NEW.address; END; -CREATE TABLE domain_audit -( - id INTEGER PRIMARY KEY AUTOINCREMENT, - domain TEXT UNIQUE NOT NULL, - date_added INTEGER NOT NULL DEFAULT (cast(strftime('%s', 'now') as int)) -); +CREATE TRIGGER tr_client_update AFTER UPDATE ON client + BEGIN + UPDATE client SET date_modified = (cast(strftime('%s', 'now') as int)) WHERE ip = NEW.ip; + END; -CREATE TABLE info -( - property TEXT PRIMARY KEY, - value TEXT NOT NULL -); - -CREATE VIEW vw_gravity AS SELECT domain, adlist_by_group.group_id AS group_id - FROM gravity - LEFT JOIN adlist_by_group ON adlist_by_group.adlist_id = gravity.adlist_id - LEFT JOIN adlist ON adlist.id = gravity.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); +CREATE TRIGGER tr_domainlist_update AFTER UPDATE ON domainlist + BEGIN + UPDATE domainlist SET date_modified = (cast(strftime('%s', 'now') as int)) WHERE domain = NEW.domain; + END; CREATE VIEW vw_whitelist AS SELECT domain, domainlist.id AS id, domainlist_by_group.group_id AS group_id FROM domainlist @@ -149,6 +131,13 @@ CREATE VIEW vw_regex_blacklist AS SELECT domain, domainlist.id AS id, domainlist AND domainlist.type = 3 ORDER BY domainlist.id; +CREATE VIEW vw_gravity AS SELECT domain, adlist_by_group.group_id AS group_id + FROM gravity + LEFT JOIN adlist_by_group ON adlist_by_group.adlist_id = gravity.adlist_id + LEFT JOIN adlist ON adlist.id = gravity.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); + 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 @@ -156,6 +145,49 @@ CREATE VIEW vw_adlist AS SELECT DISTINCT address, adlist.id AS id WHERE adlist.enabled = 1 AND (adlist_by_group.group_id IS NULL OR "group".enabled = 1) ORDER BY adlist.id; +CREATE TRIGGER tr_domainlist_add AFTER INSERT ON domainlist + BEGIN + INSERT INTO domainlist_by_group (domainlist_id, group_id) VALUES (NEW.id, 0); + END; + +CREATE TRIGGER tr_client_add AFTER INSERT ON client + BEGIN + INSERT INTO client_by_group (client_id, group_id) VALUES (NEW.id, 0); + END; + +CREATE TRIGGER tr_adlist_add AFTER INSERT ON adlist + BEGIN + INSERT INTO adlist_by_group (adlist_id, group_id) VALUES (NEW.id, 0); + END; + +CREATE TRIGGER tr_group_update AFTER UPDATE ON "group" + BEGIN + UPDATE "group" SET date_modified = (cast(strftime('%s', 'now') as int)) WHERE id = NEW.id; + END; + +CREATE TRIGGER tr_group_zero AFTER DELETE ON "group" + BEGIN + INSERT OR IGNORE INTO "group" (id,enabled,name) VALUES (0,1,'Default'); + END; + +CREATE TRIGGER tr_domainlist_delete AFTER DELETE ON domainlist + BEGIN + DELETE FROM domainlist_by_group WHERE domainlist_id = OLD.id; + END; + +CREATE TRIGGER tr_adlist_delete AFTER DELETE ON adlist + BEGIN + DELETE FROM adlist_by_group WHERE adlist_id = OLD.id; + END; + +CREATE TRIGGER tr_client_delete AFTER DELETE ON client + BEGIN + DELETE FROM client_by_group WHERE client_id = OLD.id; + END; + + +/* ^^^ basic gravity table definition, taken from /advanced/Templates/gravity.db.sql ^^^ */ +/* vvv Test content following vvv */ INSERT INTO domainlist VALUES(1,0,'whitelisted.test.pi-hole.net',1,1559928803,1559928803,'Migrated from /etc/pihole/whitelist.txt'); INSERT INTO domainlist VALUES(2,0,'regex1.test.pi-hole.net',1,1559928803,1559928803,''); INSERT INTO domainlist VALUES(3,2,'regex2',1,1559928803,1559928803,''); @@ -177,30 +209,28 @@ INSERT INTO domainlist_by_group VALUES(7,1); INSERT INTO domain_audit VALUES(1,'google.com',1559928803); -INSERT INTO client VALUES(1,'127.0.0.1'); +INSERT INTO client (id,ip) VALUES(1,'127.0.0.1'); -INSERT INTO client VALUES(2,'127.0.0.2'); +INSERT INTO client (id,ip) VALUES(2,'127.0.0.2'); INSERT INTO "group" VALUES(2,1,'Second test group',1559928803,1559928803,'A group associated with client IP 127.0.0.2'); DELETE FROM client_by_group WHERE client_id = 2 AND group_id = 0; INSERT INTO client_by_group VALUES(2,2); INSERT INTO adlist_by_group VALUES(1,2); INSERT INTO domainlist_by_group VALUES(6,2); -INSERT INTO client VALUES(3,'127.0.0.3'); +INSERT INTO client (id,ip) VALUES(3,'127.0.0.3'); INSERT INTO "group" VALUES(3,1,'Third test group',1559928803,1559928803,'A group associated with client IP 127.0.0.3'); DELETE FROM client_by_group WHERE client_id = 3 AND group_id = 0; INSERT INTO client_by_group VALUES(3,3); -INSERT INTO client VALUES(4,'aa:bb:cc:dd:ee:ff'); /* 127.0.0.4 and 127.0.0.5 */ +INSERT INTO client (id,ip) VALUES(4,'aa:bb:cc:dd:ee:ff'); /* 127.0.0.4 and 127.0.0.5 */ INSERT INTO "group" VALUES(4,1,'MAC client test group',1559928803,1559928803,'A group associated with client MAC aa:bb:cc:dd:ee:ff'); DELETE FROM client_by_group WHERE client_id = 4 AND group_id = 0; INSERT INTO client_by_group VALUES(4,4); -INSERT INTO client VALUES(5,':enp0s123'); /* 127.0.0.6 */ +INSERT INTO client (id,ip) VALUES(5,':enp0s123'); /* 127.0.0.6 */ INSERT INTO "group" VALUES(5,1,'Interface client test group',1559928803,1559928803,'A group associated with client interface enp0s123'); DELETE FROM client_by_group WHERE client_id = 5 AND group_id = 0; INSERT INTO client_by_group VALUES(5,5); -INSERT INTO info VALUES('version', 9); - COMMIT;