From aa817adbeda64c497ab59b595860bb459d3ad82b Mon Sep 17 00:00:00 2001
From: bluikko <14869000+bluikko@users.noreply.github.com>
Date: Sun, 7 Jul 2019 19:26:06 +0700
Subject: [PATCH] Add primary keys to Logs and Stats tables (#2653)

* Add primary keys to Logs and Stats tables

Adds an auto_increment int(10) Id as PRIMARY KEY to Logs and Stats tables.

Closes ZoneMinder#2550 and makes ZoneMinder compatible with Galera writeset replication for InnoDB (Galera Cluster, Percona XtraDB Cluster).

*  Do ALTER TABLE only if columns do not exist

*  Add forgotten prepare/execute
---
 db/zm_create.sql.in      |  4 ++++
 db/zm_update-1.33.12.sql | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 db/zm_update-1.33.12.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index f8fb8673b..261a4368c 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -351,6 +351,7 @@ CREATE INDEX `Groups_Monitors_MonitorId_idx` ON `Groups_Monitors` (`MonitorId`);
 
 DROP TABLE IF EXISTS `Logs`;
 CREATE TABLE `Logs` (
+  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `TimeKey` decimal(16,6) NOT NULL,
   `Component` varchar(32) NOT NULL,
   `ServerId` int(10) unsigned,
@@ -360,6 +361,7 @@ CREATE TABLE `Logs` (
   `Message` text NOT NULL,
   `File` varchar(255) DEFAULT NULL,
   `Line` smallint(5) unsigned DEFAULT NULL,
+  PRIMARY KEY (`Id`),
   KEY `TimeKey` (`TimeKey`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
@@ -589,6 +591,7 @@ CREATE INDEX `Servers_Name_idx` ON `Servers` (`Name`);
 
 DROP TABLE IF EXISTS `Stats`;
 CREATE TABLE `Stats` (
+  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `MonitorId` int(10) unsigned NOT NULL default '0',
   `ZoneId` int(10) unsigned NOT NULL default '0',
   `EventId` BIGINT UNSIGNED NOT NULL,
@@ -605,6 +608,7 @@ CREATE TABLE `Stats` (
   `MinY` smallint(5) unsigned NOT NULL default '0',
   `MaxY` smallint(5) unsigned NOT NULL default '0',
   `Score` smallint(5) unsigned NOT NULL default '0',
+  PRIMARY KEY (`Id`),
   KEY `EventId` (`EventId`),
   KEY `MonitorId` (`MonitorId`),
   KEY `ZoneId` (`ZoneId`)
diff --git a/db/zm_update-1.33.12.sql b/db/zm_update-1.33.12.sql
new file mode 100644
index 000000000..8188ad841
--- /dev/null
+++ b/db/zm_update-1.33.12.sql
@@ -0,0 +1,27 @@
+--
+-- Add primary keys for Logs and Stats tables
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Logs'
+     AND column_name = 'Id'
+    ) > 0,
+"SELECT 'Column Id already exists in Logs'",
+"ALTER TABLE `Logs` ADD COLUMN `Id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`Id`)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Stats'
+     AND column_name = 'Id'
+    ) > 0,
+"SELECT 'Column Id already exists in Stats'",
+"ALTER TABLE `Stats` ADD COLUMN `Id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`Id`)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;