Merge remote-tracking branch 'upstream' into ai_server

Author: connortechnology

db/zm_create.sql.in

@@ -892,14 +892,14 @@ CREATE TABLE `ZonePresets` (
   `CheckMethod` enum('AlarmedPixels','FilteredPixels','Blobs') NOT NULL default 'Blobs',
   `MinPixelThreshold` smallint(5) unsigned default NULL,
   `MaxPixelThreshold` smallint(5) unsigned default NULL,
-  `MinAlarmPixels` DECIMAL(7,2) unsigned default NULL,
-  `MaxAlarmPixels` DECIMAL(7,2) unsigned default NULL,
+  `MinAlarmPixels` DECIMAL(10,2) unsigned default NULL,
+  `MaxAlarmPixels` DECIMAL(10,2) unsigned default NULL,
   `FilterX` tinyint(3) unsigned default NULL,
   `FilterY` tinyint(3) unsigned default NULL,
-  `MinFilterPixels` DECIMAL(7,2) unsigned default NULL,
-  `MaxFilterPixels` DECIMAL(7,2) unsigned default NULL,
-  `MinBlobPixels` DECIMAL(7,2) unsigned default NULL,
-  `MaxBlobPixels` DECIMAL(7,2) unsigned default NULL,
+  `MinFilterPixels` DECIMAL(10,2) unsigned default NULL,
+  `MaxFilterPixels` DECIMAL(10,2) unsigned default NULL,
+  `MinBlobPixels` DECIMAL(10,2) unsigned default NULL,
+  `MaxBlobPixels` DECIMAL(10,2) unsigned default NULL,
   `MinBlobs` smallint(5) unsigned default NULL,
   `MaxBlobs` smallint(5) unsigned default NULL,
   `OverloadFrames` smallint(5) unsigned NOT NULL default '0',
@@ -926,14 +926,14 @@ CREATE TABLE `Zones` (
   `CheckMethod` enum('AlarmedPixels','FilteredPixels','Blobs') NOT NULL default 'Blobs',
   `MinPixelThreshold` smallint(5) unsigned default NULL,
   `MaxPixelThreshold` smallint(5) unsigned default NULL,
-  `MinAlarmPixels` DECIMAL(7,2) unsigned default NULL,
-  `MaxAlarmPixels` DECIMAL(7,2) unsigned default NULL,
+  `MinAlarmPixels` DECIMAL(10,2) unsigned default NULL,
+  `MaxAlarmPixels` DECIMAL(10,2) unsigned default NULL,
   `FilterX` tinyint(3) unsigned default NULL,
   `FilterY` tinyint(3) unsigned default NULL,
-  `MinFilterPixels` DECIMAL(7,2) unsigned default NULL,
-  `MaxFilterPixels` DECIMAL(7,2) unsigned default NULL,
-  `MinBlobPixels` DECIMAL(7,2) unsigned default NULL,
-  `MaxBlobPixels` DECIMAL(7,2) unsigned default NULL,
+  `MinFilterPixels` DECIMAL(10,2) unsigned default NULL,
+  `MaxFilterPixels` DECIMAL(10,2) unsigned default NULL,
+  `MinBlobPixels` DECIMAL(10,2) unsigned default NULL,
+  `MaxBlobPixels` DECIMAL(10,2) unsigned default NULL,
   `MinBlobs` smallint(5) unsigned default NULL,
   `MaxBlobs` smallint(5) unsigned default NULL,
   `OverloadFrames` smallint(5) unsigned NOT NULL default '0',

db/zm_update-1.39.3.sql

@@ -5,7 +5,7 @@
 
 -- First convert existing pixel count values to percentages WHILE columns
 -- are still INT (values 0-100 fit in INT; ALTER to DECIMAL would fail on
--- large pixel counts that exceed DECIMAL(7,2) max of 99999.99).
+-- large pixel counts that exceed DECIMAL(10,2) max of 99999.99).
 --
 -- Zone pixel area = (Zones.Area * Monitors.Width * Monitors.Height) / 10000
 -- where Zones.Area is in percentage-space (0-10000) from zm_update-1.39.2.sql.
@@ -59,22 +59,22 @@ WHERE z.Coords LIKE '%.%'
     OR z.MinFilterPixels > 100 OR z.MaxFilterPixels > 100
     OR z.MinBlobPixels > 100 OR z.MaxBlobPixels > 100);
 
--- Now change threshold columns from int to DECIMAL(7,2) to store percentages
+-- Now change threshold columns from int to DECIMAL(10,2) to store percentages
 -- with 2 decimal places (e.g. 25.50 = 25.50% of zone area).
--- Values are now 0-100 from the UPDATE above, so they fit in DECIMAL(7,2).
+-- Values are now 0-100 from the UPDATE above, so they fit in DECIMAL(10,2).
 
 SET @s = (SELECT IF(
     (SELECT DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
      AND table_name = 'Zones' AND column_name = 'MinAlarmPixels'
     ) = 'decimal',
 "SELECT 'Zones threshold columns already DECIMAL'",
 "ALTER TABLE `Zones`
-  MODIFY `MinAlarmPixels` DECIMAL(7,2) unsigned default NULL,
-  MODIFY `MaxAlarmPixels` DECIMAL(7,2) unsigned default NULL,
-  MODIFY `MinFilterPixels` DECIMAL(7,2) unsigned default NULL,
-  MODIFY `MaxFilterPixels` DECIMAL(7,2) unsigned default NULL,
-  MODIFY `MinBlobPixels` DECIMAL(7,2) unsigned default NULL,
-  MODIFY `MaxBlobPixels` DECIMAL(7,2) unsigned default NULL"
+  MODIFY `MinAlarmPixels` DECIMAL(10,2) unsigned default NULL,
+  MODIFY `MaxAlarmPixels` DECIMAL(10,2) unsigned default NULL,
+  MODIFY `MinFilterPixels` DECIMAL(10,2) unsigned default NULL,
+  MODIFY `MaxFilterPixels` DECIMAL(10,2) unsigned default NULL,
+  MODIFY `MinBlobPixels` DECIMAL(10,2) unsigned default NULL,
+  MODIFY `MaxBlobPixels` DECIMAL(10,2) unsigned default NULL"
 ));
 
 PREPARE stmt FROM @s;
@@ -88,12 +88,12 @@ SET @s = (SELECT IF(
     ) = 'decimal',
 "SELECT 'ZonePresets threshold columns already DECIMAL'",
 "ALTER TABLE `ZonePresets`
-  MODIFY `MinAlarmPixels` DECIMAL(7,2) unsigned default NULL,
-  MODIFY `MaxAlarmPixels` DECIMAL(7,2) unsigned default NULL,
-  MODIFY `MinFilterPixels` DECIMAL(7,2) unsigned default NULL,
-  MODIFY `MaxFilterPixels` DECIMAL(7,2) unsigned default NULL,
-  MODIFY `MinBlobPixels` DECIMAL(7,2) unsigned default NULL,
-  MODIFY `MaxBlobPixels` DECIMAL(7,2) unsigned default NULL"
+  MODIFY `MinAlarmPixels` DECIMAL(10,2) unsigned default NULL,
+  MODIFY `MaxAlarmPixels` DECIMAL(10,2) unsigned default NULL,
+  MODIFY `MinFilterPixels` DECIMAL(10,2) unsigned default NULL,
+  MODIFY `MaxFilterPixels` DECIMAL(10,2) unsigned default NULL,
+  MODIFY `MinBlobPixels` DECIMAL(10,2) unsigned default NULL,
+  MODIFY `MaxBlobPixels` DECIMAL(10,2) unsigned default NULL"
 ));
 
 PREPARE stmt FROM @s;