From fbcd6f365b450750cf1e6413503491c880703f0b Mon Sep 17 00:00:00 2001 From: Robin Daermann Date: Thu, 20 Aug 2015 16:17:08 +0200 Subject: [PATCH] Change database schema (add 'Blacken' zone type) and bump version to 1.28.105 --- CMakeLists.txt | 2 +- configure.ac | 2 +- db/zm_create.sql.in | 4 ++-- db/zm_update-1.28.105.sql | 10 ++++++++++ version | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 db/zm_update-1.28.105.sql diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b3b8f7fd..c7bf19162 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # cmake_minimum_required (VERSION 2.6) project (zoneminder) -set(zoneminder_VERSION "1.28.104") +set(zoneminder_VERSION "1.28.105") # make API version a minor of ZM version set(zoneminder_API_VERSION "${zoneminder_VERSION}.1") diff --git a/configure.ac b/configure.ac index 32548d791..32ba09ae1 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ # For instructions on building with cmake, please see INSTALL # AC_PREREQ(2.59) -AC_INIT(zm,1.28.104,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html) +AC_INIT(zm,1.28.105,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR(src/zm.h) AC_CONFIG_HEADERS(config.h) diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index 6c376be7f..610ac902c 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -482,7 +482,7 @@ DROP TABLE IF EXISTS `ZonePresets`; CREATE TABLE `ZonePresets` ( `Id` int(10) unsigned NOT NULL auto_increment, `Name` varchar(64) NOT NULL default '', - `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive') NOT NULL default 'Active', + `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Blacken') NOT NULL default 'Active', `Units` enum('Pixels','Percent') NOT NULL default 'Pixels', `CheckMethod` enum('AlarmedPixels','FilteredPixels','Blobs') NOT NULL default 'Blobs', `MinPixelThreshold` smallint(5) unsigned default NULL, @@ -511,7 +511,7 @@ CREATE TABLE `Zones` ( `Id` int(10) unsigned NOT NULL auto_increment, `MonitorId` int(10) unsigned NOT NULL default '0', `Name` varchar(64) NOT NULL default '', - `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive') NOT NULL default 'Active', + `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Blacken') NOT NULL default 'Active', `Units` enum('Pixels','Percent') NOT NULL default 'Pixels', `NumCoords` tinyint(3) unsigned NOT NULL default '0', `Coords` tinytext NOT NULL, diff --git a/db/zm_update-1.28.105.sql b/db/zm_update-1.28.105.sql new file mode 100644 index 000000000..507e29872 --- /dev/null +++ b/db/zm_update-1.28.105.sql @@ -0,0 +1,10 @@ +-- +-- This updates a 1.28.104 database to 1.28.105 +-- + +-- +-- Add Blacken type to Zone Types +-- + +alter table Zones modify Type enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Blacken') NOT NULL DEFAULT 'Active'; +alter table ZonePresets modify Type enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Blacken') NOT NULL DEFAULT 'Active'; diff --git a/version b/version index e6a0823f8..8424efb95 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.28.104 +1.28.105