From 655839e56a735617560ae0d9c7668cd06b776fde Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 23 May 2017 14:20:19 -0400
Subject: [PATCH] Allow NULLS in various fields

---
 db/zm_create.sql.in | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 2fe82eb09..8f702e748 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -332,13 +332,13 @@ CREATE TABLE `Monitors` (
   `V4LCapturesPerFrame`	tinyint(3) unsigned,
   `Protocol` varchar(16) NOT NULL default '',
   `Method` varchar(16) NOT NULL default '',
-  `Host` varchar(64) NOT NULL default '',
+  `Host` varchar(64),
   `Port` varchar(8) NOT NULL default '',
   `SubPath` varchar(64) NOT NULL default '',
-  `Path` varchar(255) NOT NULL default '',
+  `Path` varchar(255),
   `Options` varchar(255) not null default '',
-  `User` varchar(64) NOT NULL default '',
-  `Pass` varchar(64) NOT NULL default '',
+  `User` varchar(64),
+  `Pass` varchar(64),
   `Width` smallint(5) unsigned NOT NULL default '0',
   `Height` smallint(5) unsigned NOT NULL default '0',
   `Colours` tinyint(3) unsigned NOT NULL default '1',
@@ -347,15 +347,15 @@ CREATE TABLE `Monitors` (
   `Deinterlacing` int(10) unsigned NOT NULL default '0',
   `SaveJPEGs` TINYINT NOT NULL DEFAULT '3' ,
   `VideoWriter` TINYINT NOT NULL DEFAULT '0',
-  `EncoderParameters` TEXT NOT NULL,
+  `EncoderParameters` TEXT,
   `RecordAudio` TINYINT NOT NULL DEFAULT '0',
-  `RTSPDescribe` tinyint(1) unsigned NOT NULL default '0',
+  `RTSPDescribe` tinyint(1) unsigned,
   `Brightness` mediumint(7) NOT NULL default '-1',
   `Contrast` mediumint(7) NOT NULL default '-1',
   `Hue` mediumint(7) NOT NULL default '-1',
   `Colour` mediumint(7) NOT NULL default '-1',
   `EventPrefix` varchar(32) NOT NULL default 'Event-',
-  `LabelFormat` varchar(64) NOT NULL default '%N - %y/%m/%d %H:%M:%S',
+  `LabelFormat` varchar(64),
   `LabelX` smallint(5) unsigned NOT NULL default '0',
   `LabelY` smallint(5) unsigned NOT NULL default '0',
   `LabelSize` smallint(5) unsigned NOT NULL DEFAULT '1',
@@ -376,14 +376,14 @@ CREATE TABLE `Monitors` (
   `RefBlendPerc` tinyint(3) unsigned NOT NULL default '6',
   `AlarmRefBlendPerc` tinyint(3) unsigned NOT NULL default '6',
   `Controllable` tinyint(3) unsigned NOT NULL default '0',
-  `ControlId` int(10) unsigned NOT NULL default '0',
+  `ControlId` int(10) unsigned,
   `ControlDevice` varchar(255) default NULL,
   `ControlAddress` varchar(255) default NULL,
   `AutoStopTimeout` decimal(5,2) default NULL,
   `TrackMotion` tinyint(3) unsigned NOT NULL default '0',
-  `TrackDelay` smallint(5) unsigned NOT NULL default '0',
+  `TrackDelay` smallint(5) unsigned,
   `ReturnLocation` tinyint(3) NOT NULL default '-1',
-  `ReturnDelay` smallint(5) unsigned NOT NULL default '0',
+  `ReturnDelay` smallint(5) unsigned,
   `DefaultView` enum('Events','Control') NOT NULL default 'Events',
   `DefaultRate` smallint(5) unsigned NOT NULL default '100',
   `DefaultScale` smallint(5) unsigned NOT NULL default '100',
@@ -472,7 +472,7 @@ CREATE TABLE `Users` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Username` varchar(32) character set latin1 collate latin1_bin NOT NULL default '',
   `Password` varchar(64) NOT NULL default '',
-  `Language` varchar(8) NOT NULL default '',
+  `Language` varchar(8),
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
   `Stream` enum('None','View') NOT NULL default 'None',
   `Events` enum('None','View','Edit') NOT NULL default 'None',
@@ -481,8 +481,8 @@ CREATE TABLE `Users` (
   `Groups` enum('None','View','Edit') NOT NULL default 'None',
   `Devices` enum('None','View','Edit') NOT NULL default 'None',
   `System` enum('None','View','Edit') NOT NULL default 'None',
-  `MaxBandwidth` varchar(16) NOT NULL default '',
-  `MonitorIds` text NOT NULL,
+  `MaxBandwidth` varchar(16),
+  `MonitorIds` tinytext,
   PRIMARY KEY (`Id`),
   UNIQUE KEY `UC_Username` (`Username`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;