From 8c5bff3f759c0ba2952e6d46e6f3598c6863eaf9 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 29 Oct 2013 16:08:52 +0100
Subject: [PATCH] Implement data processing options (DbConnection::categories).

Refs #4782
---
 components/db_ido_mysql/idomysqlconnection.cpp |  3 +++
 lib/db_ido/dbconnection.cpp                    |  2 +-
 lib/db_ido/dbconnection.ti                     | 11 ++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/components/db_ido_mysql/idomysqlconnection.cpp
index 7797106b2..1a74beb75 100644
--- a/components/db_ido_mysql/idomysqlconnection.cpp
+++ b/components/db_ido_mysql/idomysqlconnection.cpp
@@ -407,6 +407,9 @@ void IdoMysqlConnection::ExecuteQuery(const DbQuery& query)
 
 	ASSERT(query.Category != DbCatInvalid);
 
+	if ((query.Category & GetCategories()) == 0)
+		return;
+
 	if (!m_Connected)
 		return;
 
diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp
index 75b9b93db..1d1b35e09 100644
--- a/lib/db_ido/dbconnection.cpp
+++ b/lib/db_ido/dbconnection.cpp
@@ -73,7 +73,7 @@ void DbConnection::ProgramStatusHandler(void)
 	DbQuery query1;
 	query1.Table = "programstatus";
 	query1.Type = DbQueryDelete;
-	query1.Type = DbCatProgramStatus;
+	query1.Category = DbCatProgramStatus;
 	query1.WhereCriteria = boost::make_shared<Dictionary>();
 	query1.WhereCriteria->Set("instance_id", 0);  /* DbConnection class fills in real ID */
 	DbObject::OnQuery(query1);
diff --git a/lib/db_ido/dbconnection.ti b/lib/db_ido/dbconnection.ti
index d7132cdc7..dd595a890 100644
--- a/lib/db_ido/dbconnection.ti
+++ b/lib/db_ido/dbconnection.ti
@@ -1,3 +1,4 @@
+#include "db_ido/dbquery.h"
 #include "base/dynamicobject.h"
 #include <boost/smart_ptr/make_shared.hpp>
 
@@ -13,6 +14,14 @@ class DbConnection : DynamicObject
 	[config] Dictionary::Ptr cleanup {
 		default {{{ return boost::make_shared<Dictionary>(); }}}
 	};
+
+	[config] int categories {
+		default {{{
+			return DbCatConfig | DbCatState | DbCatAcknowledgement |
+			    DbCatComment | DbCatDowntime | DbCatEventHandler | DbCatExternalCommand | DbCatFlapping |
+			    DbCatLog | DbCatNotification | DbCatProgramStatus | DbCatRetention | DbCatStateHistory;
+		}}}
+	};
 };
 
-}
\ No newline at end of file
+}
-- 
2.40.0