|
| 1 | + |
| 2 | +-- |
| 3 | +-- Add Profile column to Notifications table |
| 4 | +-- |
| 5 | + |
| 6 | +SET @s = (SELECT IF( |
| 7 | + (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS |
| 8 | + WHERE TABLE_SCHEMA = DATABASE() |
| 9 | + AND TABLE_NAME = 'Notifications' |
| 10 | + AND COLUMN_NAME = 'Profile' |
| 11 | + ) > 0, |
| 12 | + "SELECT 'Column Profile already exists in Notifications'", |
| 13 | + "ALTER TABLE `Notifications` ADD `Profile` varchar(128) DEFAULT NULL AFTER `AppVersion`" |
| 14 | +)); |
| 15 | +PREPARE stmt FROM @s; |
| 16 | +EXECUTE stmt; |
| 17 | +DEALLOCATE PREPARE stmt; |
| 18 | + |
| 19 | +-- Convert zone threshold fields (MinAlarmPixels, etc.) from pixel counts |
| 20 | +-- to percentages of zone area, matching the coordinate percentage migration |
| 21 | +-- done in zm_update-1.39.2.sql. |
| 22 | +-- |
| 23 | + |
| 24 | +-- First convert existing pixel count values to percentages WHILE columns |
| 25 | +-- are still INT (values 0-100 fit in INT; ALTER to DECIMAL would fail on |
| 26 | +-- large pixel counts that exceed DECIMAL(10,2) max of 99999.99). |
| 27 | +-- |
| 28 | +-- Zone pixel area = (Zones.Area * Monitors.Width * Monitors.Height) / 10000 |
| 29 | +-- where Zones.Area is in percentage-space (0-10000) from zm_update-1.39.2.sql. |
| 30 | +-- new_percent = old_pixel_count * 100 / zone_pixel_area |
| 31 | +-- = old_pixel_count * 1000000 / (Zones.Area * Monitors.Width * Monitors.Height) |
| 32 | +-- |
| 33 | +-- Only convert zones with percentage coordinates (contain '.') that still have |
| 34 | +-- pixel-scale threshold values (> 100 means it can't be a percentage). |
| 35 | + |
| 36 | +UPDATE Zones z |
| 37 | + JOIN Monitors m ON z.MonitorId = m.Id |
| 38 | +SET |
| 39 | + z.MinAlarmPixels = CASE |
| 40 | + WHEN z.MinAlarmPixels IS NULL THEN NULL |
| 41 | + WHEN z.MinAlarmPixels = 0 THEN 0 |
| 42 | + WHEN z.Area > 0 AND m.Width > 0 AND m.Height > 0 |
| 43 | + THEN LEAST(ROUND(z.MinAlarmPixels * 1000000.0 / (z.Area * m.Width * m.Height)), 100) |
| 44 | + ELSE z.MinAlarmPixels END, |
| 45 | + z.MaxAlarmPixels = CASE |
| 46 | + WHEN z.MaxAlarmPixels IS NULL THEN NULL |
| 47 | + WHEN z.MaxAlarmPixels = 0 THEN 0 |
| 48 | + WHEN z.Area > 0 AND m.Width > 0 AND m.Height > 0 |
| 49 | + THEN LEAST(ROUND(z.MaxAlarmPixels * 1000000.0 / (z.Area * m.Width * m.Height)), 100) |
| 50 | + ELSE z.MaxAlarmPixels END, |
| 51 | + z.MinFilterPixels = CASE |
| 52 | + WHEN z.MinFilterPixels IS NULL THEN NULL |
| 53 | + WHEN z.MinFilterPixels = 0 THEN 0 |
| 54 | + WHEN z.Area > 0 AND m.Width > 0 AND m.Height > 0 |
| 55 | + THEN LEAST(ROUND(z.MinFilterPixels * 1000000.0 / (z.Area * m.Width * m.Height)), 100) |
| 56 | + ELSE z.MinFilterPixels END, |
| 57 | + z.MaxFilterPixels = CASE |
| 58 | + WHEN z.MaxFilterPixels IS NULL THEN NULL |
| 59 | + WHEN z.MaxFilterPixels = 0 THEN 0 |
| 60 | + WHEN z.Area > 0 AND m.Width > 0 AND m.Height > 0 |
| 61 | + THEN LEAST(ROUND(z.MaxFilterPixels * 1000000.0 / (z.Area * m.Width * m.Height)), 100) |
| 62 | + ELSE z.MaxFilterPixels END, |
| 63 | + z.MinBlobPixels = CASE |
| 64 | + WHEN z.MinBlobPixels IS NULL THEN NULL |
| 65 | + WHEN z.MinBlobPixels = 0 THEN 0 |
| 66 | + WHEN z.Area > 0 AND m.Width > 0 AND m.Height > 0 |
| 67 | + THEN LEAST(ROUND(z.MinBlobPixels * 1000000.0 / (z.Area * m.Width * m.Height)), 100) |
| 68 | + ELSE z.MinBlobPixels END, |
| 69 | + z.MaxBlobPixels = CASE |
| 70 | + WHEN z.MaxBlobPixels IS NULL THEN NULL |
| 71 | + WHEN z.MaxBlobPixels = 0 THEN 0 |
| 72 | + WHEN z.Area > 0 AND m.Width > 0 AND m.Height > 0 |
| 73 | + THEN LEAST(ROUND(z.MaxBlobPixels * 1000000.0 / (z.Area * m.Width * m.Height)), 100) |
| 74 | + ELSE z.MaxBlobPixels END |
| 75 | +WHERE z.Coords LIKE '%.%' |
| 76 | + AND (z.MinAlarmPixels > 100 OR z.MaxAlarmPixels > 100 |
| 77 | + OR z.MinFilterPixels > 100 OR z.MaxFilterPixels > 100 |
| 78 | + OR z.MinBlobPixels > 100 OR z.MaxBlobPixels > 100); |
| 79 | + |
| 80 | +-- Now change threshold columns from int to DECIMAL(10,2) to store percentages |
| 81 | +-- with 2 decimal places (e.g. 25.50 = 25.50% of zone area). |
| 82 | +-- Values are now 0-100 from the UPDATE above, so they fit in DECIMAL(10,2). |
| 83 | + |
| 84 | +SET @s = (SELECT IF( |
| 85 | + (SELECT DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE() |
| 86 | + AND table_name = 'Zones' AND column_name = 'MinAlarmPixels' |
| 87 | + ) = 'decimal', |
| 88 | +"SELECT 'Zones threshold columns already DECIMAL'", |
| 89 | +"ALTER TABLE `Zones` |
| 90 | + MODIFY `MinAlarmPixels` DECIMAL(10,2) unsigned default NULL, |
| 91 | + MODIFY `MaxAlarmPixels` DECIMAL(10,2) unsigned default NULL, |
| 92 | + MODIFY `MinFilterPixels` DECIMAL(10,2) unsigned default NULL, |
| 93 | + MODIFY `MaxFilterPixels` DECIMAL(10,2) unsigned default NULL, |
| 94 | + MODIFY `MinBlobPixels` DECIMAL(10,2) unsigned default NULL, |
| 95 | + MODIFY `MaxBlobPixels` DECIMAL(10,2) unsigned default NULL" |
| 96 | +)); |
| 97 | + |
| 98 | +PREPARE stmt FROM @s; |
| 99 | +EXECUTE stmt; |
| 100 | +DEALLOCATE PREPARE stmt; |
| 101 | + |
| 102 | +-- Also update ZonePresets table column types for consistency |
| 103 | +SET @s = (SELECT IF( |
| 104 | + (SELECT DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE() |
| 105 | + AND table_name = 'ZonePresets' AND column_name = 'MinAlarmPixels' |
| 106 | + ) = 'decimal', |
| 107 | +"SELECT 'ZonePresets threshold columns already DECIMAL'", |
| 108 | +"ALTER TABLE `ZonePresets` |
| 109 | + MODIFY `MinAlarmPixels` DECIMAL(10,2) unsigned default NULL, |
| 110 | + MODIFY `MaxAlarmPixels` DECIMAL(10,2) unsigned default NULL, |
| 111 | + MODIFY `MinFilterPixels` DECIMAL(10,2) unsigned default NULL, |
| 112 | + MODIFY `MaxFilterPixels` DECIMAL(10,2) unsigned default NULL, |
| 113 | + MODIFY `MinBlobPixels` DECIMAL(10,2) unsigned default NULL, |
| 114 | + MODIFY `MaxBlobPixels` DECIMAL(10,2) unsigned default NULL" |
| 115 | +)); |
| 116 | + |
| 117 | +PREPARE stmt FROM @s; |
| 118 | +EXECUTE stmt; |
| 119 | +DEALLOCATE PREPARE stmt; |
| 120 | + |
1 | 121 | -- |
2 | 122 | -- Add Menu_Items table for customizable navbar/sidebar menu |
3 | 123 | -- |
|
0 commit comments