From 5459daa03daaaf89e18ac3da64082193c9c2b0c4 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 15 Jun 2023 09:28:03 +0200
Subject: [PATCH] Add abp_entries column (default 0) to the adlist table for
 newly created gravity databases. This updates the gravity database version to
 16

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 advanced/Scripts/database_migration/gravity-db.sh     |  6 ++++++
 .../Scripts/database_migration/gravity/15_to_16.sql   | 11 +++++++++++
 advanced/Templates/gravity.db.sql                     |  3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 advanced/Scripts/database_migration/gravity/15_to_16.sql

diff --git a/advanced/Scripts/database_migration/gravity-db.sh b/advanced/Scripts/database_migration/gravity-db.sh
index a7ba60a9..851ddb0a 100755
--- a/advanced/Scripts/database_migration/gravity-db.sh
+++ b/advanced/Scripts/database_migration/gravity-db.sh
@@ -128,4 +128,10 @@ upgrade_gravityDB(){
 		pihole-FTL sqlite3 "${database}" < "${scriptPath}/14_to_15.sql"
 		version=15
 	fi
+	if [[ "$version" == "15" ]]; then
+		# Add column abp_entries to adlist table
+		echo -e "  ${INFO} Upgrading gravity database from version 15 to 16"
+		pihole-FTL sqlite3 "${database}" < "${scriptPath}/15_to_16.sql"
+		version=16
+	fi
 }
diff --git a/advanced/Scripts/database_migration/gravity/15_to_16.sql b/advanced/Scripts/database_migration/gravity/15_to_16.sql
new file mode 100644
index 00000000..c6159f40
--- /dev/null
+++ b/advanced/Scripts/database_migration/gravity/15_to_16.sql
@@ -0,0 +1,11 @@
+.timeout 30000
+
+PRAGMA FOREIGN_KEYS=OFF;
+
+BEGIN TRANSACTION;
+
+ALTER TABLE adlist ADD COLUMN abp_entries INTEGER NOT NULL DEFAULT 0;
+
+UPDATE info SET value = 16 WHERE property = 'version';
+
+COMMIT;
diff --git a/advanced/Templates/gravity.db.sql b/advanced/Templates/gravity.db.sql
index 3f696d6d..e0f1de10 100644
--- a/advanced/Templates/gravity.db.sql
+++ b/advanced/Templates/gravity.db.sql
@@ -35,7 +35,8 @@ CREATE TABLE adlist
 	date_updated INTEGER,
 	number INTEGER NOT NULL DEFAULT 0,
 	invalid_domains INTEGER NOT NULL DEFAULT 0,
-	status INTEGER NOT NULL DEFAULT 0
+	status INTEGER NOT NULL DEFAULT 0,
+	abp_entries INTEGER NOT NULL DEFAULT 0
 );
 
 CREATE TABLE adlist_by_group