From 151c7677d8e2a01308bb32da0a35881734ae7b36 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Thu, 3 Jan 2019 16:06:44 -0600 Subject: [PATCH] add WebSite type to enum (#2382) * add WebSite type to enum * add website enum to update script * update enum * bump the version --- db/zm_create.sql.in | 6 +++--- db/zm_update-1.33.1.sql | 16 ++++++++++++++++ version | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 db/zm_update-1.33.1.sql diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index e719daedc..4e6a6646c 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -63,7 +63,7 @@ DROP TABLE IF EXISTS `Controls`; CREATE TABLE `Controls` ( `Id` int(10) unsigned NOT NULL auto_increment, `Name` varchar(64) NOT NULL default '', - `Type` enum('Local','Remote','Ffmpeg','Libvlc','cURL','WebSite') NOT NULL default 'Local', + `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local', `Protocol` varchar(64) default NULL, `CanWake` tinyint(3) unsigned NOT NULL default '0', `CanSleep` tinyint(3) unsigned NOT NULL default '0', @@ -397,7 +397,7 @@ DROP TABLE IF EXISTS `MonitorPresets`; CREATE TABLE `MonitorPresets` ( `Id` int(10) unsigned NOT NULL auto_increment, `Name` varchar(64) NOT NULL default '', - `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','NVSocket') NOT NULL default 'Local', + `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local', `Device` tinytext, `Channel` tinyint(3) unsigned default NULL, `Format` int(10) unsigned default NULL, @@ -430,7 +430,7 @@ CREATE TABLE `Monitors` ( `Name` varchar(64) NOT NULL default '', `ServerId` int(10) unsigned, `StorageId` smallint(5) unsigned default 0, - `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL') NOT NULL default 'Local', + `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local', `Function` enum('None','Monitor','Modect','Record','Mocord','Nodect') NOT NULL default 'Monitor', `Enabled` tinyint(3) unsigned NOT NULL default '1', `LinkedMonitors` varchar(255), diff --git a/db/zm_update-1.33.1.sql b/db/zm_update-1.33.1.sql new file mode 100644 index 000000000..ddac8adae --- /dev/null +++ b/db/zm_update-1.33.1.sql @@ -0,0 +1,16 @@ +-- +-- This updates a 1.33.0 database to 1.33.1 +-- +-- Add WebSite enum to Monitor.Type +-- Add Refresh column to Monitors table +-- + +ALTER TABLE `Monitors` +CHANGE COLUMN `Type` `Type` ENUM('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL DEFAULT 'Local' ; + +ALTER TABLE `MonitorPresets` +CHANGE COLUMN `Type` `Type` ENUM('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL DEFAULT 'Local' ; + +ALTER TABLE `Controls` +CHANGE COLUMN `Type` `Type` ENUM('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL DEFAULT 'Local' ; + diff --git a/version b/version index 7aa332e41..02261bead 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.33.0 +1.33.1