From 32d6b3fa2a1d0105d72ca9dff8d086d56fbf37dd Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Thu, 22 Apr 2021 09:35:21 +0200
Subject: [PATCH] database: Allow some fields to be NULL

Also added database update to v13
---
 src/include/db_template.txt      | 4 ++--
 src/include/db_update_v13.txt    | 7 +++++++
 src/include/functions_common.php | 2 +-
 src/include/functions_db.php     | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 src/include/db_update_v13.txt

diff --git a/src/include/db_template.txt b/src/include/db_template.txt
index b8b2f4d..8e06316 100644
--- a/src/include/db_template.txt
+++ b/src/include/db_template.txt
@@ -81,7 +81,7 @@ CREATE TABLE `logcon_sources` (
   `DBTableName` varchar(64) default NULL,
   `DBEnableRowCounting` tinyint(1) default NULL,
   `DBRecordsPerQuery` int(11) NOT NULL default '100',
-  `defaultfilter` VARCHAR(1024) NOT NULL, 
+  `defaultfilter` VARCHAR(1024) NULL, 
   `userid` int(11) default NULL,
   `groupid` int(11) default NULL,
   PRIMARY KEY  (`ID`)
@@ -128,7 +128,7 @@ CREATE TABLE IF NOT EXISTS `logcon_charts` (
   `chart_type` int(11) NOT NULL,
   `chart_width` int(11) NOT NULL,
   `chart_field` varchar(255) NOT NULL,
-  `chart_defaultfilter` VARCHAR(1024) NOT NULL, 
+  `chart_defaultfilter` VARCHAR(1024) NULL, 
   `maxrecords` int(11) NOT NULL,
   `showpercent` tinyint(1) NOT NULL,
   `userid` int(11) default NULL,
diff --git a/src/include/db_update_v13.txt b/src/include/db_update_v13.txt
new file mode 100644
index 0000000..f12c00b
--- /dev/null
+++ b/src/include/db_update_v13.txt
@@ -0,0 +1,7 @@
+-- New Database Structure Updates
+ALTER TABLE `logcon_sources` CHANGE `defaultfilter` `defaultfilter` VARCHAR(1024) NULL;
+ALTER TABLE `logcon_charts` CHANGE `chart_defaultfilter` `chart_defaultfilter` VARCHAR(1024) NULL;
+
+-- Insert data
+
+-- Updated Data
diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index 075ed52..1599c39 100644
--- a/src/include/functions_common.php
+++ b/src/include/functions_common.php
@@ -65,7 +65,7 @@ $LANG_EN = "en";	// Used for fallback
 $LANG = "en";		// Default language
 
 // Default Template vars
-$content['BUILDNUMBER'] = "4.1.11";
+$content['BUILDNUMBER'] = "4.1.12";
 $content['UPDATEURL'] = "http://loganalyzer.adiscon.com/files/version.txt";
 $content['TITLE'] = "Adiscon LogAnalyzer :: Release " . $content['BUILDNUMBER'];	// Default page title 
 $content['BASEPATH'] = $gl_root_path;
diff --git a/src/include/functions_db.php b/src/include/functions_db.php
index 9875954..9c813fe 100644
--- a/src/include/functions_db.php
+++ b/src/include/functions_db.php
@@ -49,7 +49,7 @@ $errdesc = "";
 $errno = 0;
 
 // --- Current Database Version, this is important for automated database Updates!
-$content['database_internalversion'] = "12";	// Whenever incremented, a database upgrade is needed
+$content['database_internalversion'] = "13";	// Whenever incremented, a database upgrade is needed
 $content['database_installedversion'] = "0";	// 0 is default which means Prior Versioning Database
 // ---