tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary keys from where clauses

Browse Source
This commit is contained in:
Jean Flach 2017-11-06 10:59:44 +01:00 committed by Michael Friedrich
parent 6f6703042e
commit e83ddbd8b2
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/db_ido/dbevents.cpp
View File

@ -375,10 +375,8 @@ void DbEvents::AddCommentInternal(std::vector<DbQuery>& queries, const Comment::
query1.WhereCriteria = new Dictionary(); query1.WhereCriteria = new Dictionary();
query1.WhereCriteria->Set("object_id", checkable); query1.WhereCriteria->Set("object_id", checkable);
query1.WhereCriteria->Set("name", comment->GetName());
query1.WhereCriteria->Set("comment_time", DbValue::FromTimestamp(entry_time)); query1.WhereCriteria->Set("comment_time", DbValue::FromTimestamp(entry_time));
query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
/* Match the unique constraint. */
query1.WhereCriteria->Set("internal_comment_id", comment->GetLegacyId());
} else { } else {
query1.Table = "commenthistory"; query1.Table = "commenthistory";
query1.Type = DbQueryInsert; query1.Type = DbQueryInsert;
@ -410,7 +408,6 @@ void DbEvents::RemoveCommentInternal(std::vector<DbQuery>& queries, const Commen
query1.WhereCriteria = new Dictionary(); query1.WhereCriteria = new Dictionary();
query1.WhereCriteria->Set("object_id", checkable); query1.WhereCriteria->Set("object_id", checkable);
query1.WhereCriteria->Set("entry_time", DbValue::FromTimestamp(entry_time)); query1.WhereCriteria->Set("entry_time", DbValue::FromTimestamp(entry_time));
query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
query1.WhereCriteria->Set("name", comment->GetName()); query1.WhereCriteria->Set("name", comment->GetName());
queries.push_back(query1); queries.push_back(query1);
@ -431,7 +428,6 @@ void DbEvents::RemoveCommentInternal(std::vector<DbQuery>& queries, const Commen
query2.WhereCriteria = new Dictionary(); query2.WhereCriteria = new Dictionary();
query2.WhereCriteria->Set("object_id", checkable); query2.WhereCriteria->Set("object_id", checkable);
query2.WhereCriteria->Set("entry_time", DbValue::FromTimestamp(entry_time)); query2.WhereCriteria->Set("entry_time", DbValue::FromTimestamp(entry_time));
query2.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
query2.WhereCriteria->Set("name", comment->GetName()); query2.WhereCriteria->Set("name", comment->GetName());
queries.push_back(query2); queries.push_back(query2);
} }
@ -521,10 +517,8 @@ void DbEvents::AddDowntimeInternal(std::vector<DbQuery>& queries, const Downtime
query1.WhereCriteria = new Dictionary(); query1.WhereCriteria = new Dictionary();
query1.WhereCriteria->Set("object_id", checkable); query1.WhereCriteria->Set("object_id", checkable);
query1.WhereCriteria->Set("name", downtime->GetName());
query1.WhereCriteria->Set("entry_time", DbValue::FromTimestamp(downtime->GetEntryTime())); query1.WhereCriteria->Set("entry_time", DbValue::FromTimestamp(downtime->GetEntryTime()));
query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
/* Match the unique constraint. */
query1.WhereCriteria->Set("internal_downtime_id", downtime->GetLegacyId());
} else { } else {
query1.Table = "downtimehistory"; query1.Table = "downtimehistory";
query1.Type = DbQueryInsert; query1.Type = DbQueryInsert;