tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5636 from Icinga/fix/db-ido-comments-downtimes-constraint-on-legacy-id-change 

Fix unique constraint matching for UPDATE downtime/comment runtime tables in DB IDO
This commit is contained in:
Michael Friedrich 2017-10-10 17:47:47 +02:00 committed by GitHub
parent 06403c1147 6061d56a7c
commit ff570ad060
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/db_ido/dbevents.cpp
View File

@ -377,7 +377,8 @@ void DbEvents::AddCommentInternal(std::vector<DbQuery>& queries, const Comment::
query1.WhereCriteria->Set("object_id", checkable);
query1.WhereCriteria->Set("comment_time", DbValue::FromTimestamp(entry_time));
query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
query1.WhereCriteria->Set("name", comment->GetName());
/* Match the unique constraint. */
query1.WhereCriteria->Set("internal_comment_id", comment->GetLegacyId());
} else {
query1.Table = "commenthistory";
query1.Type = DbQueryInsert;
@ -522,9 +523,8 @@ void DbEvents::AddDowntimeInternal(std::vector<DbQuery>& queries, const Downtime
query1.WhereCriteria->Set("object_id", checkable);
query1.WhereCriteria->Set("entry_time", DbValue::FromTimestamp(downtime->GetEntryTime()));
query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
query1.WhereCriteria->Set("scheduled_start_time", DbValue::FromTimestamp(downtime->GetStartTime()));
query1.WhereCriteria->Set("scheduled_end_time", DbValue::FromTimestamp(downtime->GetEndTime()));
query1.WhereCriteria->Set("name", downtime->GetName());
/* Match the unique constraint. */
query1.WhereCriteria->Set("internal_downtime_id", downtime->GetLegacyId());
} else {
query1.Table = "downtimehistory";
query1.Type = DbQueryInsert;