tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8303 from Icinga/bugfix/revert-fix-duplicate-entry-error

Browse Source 
Revert: Fix duplicate entry error
This commit is contained in:
Alexander Aleksandrovič Klimov 2020-10-13 12:27:53 +02:00 committed by GitHub
commit e62c6c7f05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/db_ido/dbobject.cpp
View File

@ -234,9 +234,8 @@ void DbObject::SendVarsConfigUpdateHeavy()
DbQuery query3; DbQuery query3;
query3.Table = "customvariables"; query3.Table = "customvariables";
query3.Type = DbQueryInsert | DbQueryUpdate; query3.Type = DbQueryInsert;
query3.Category = DbCatConfig; query3.Category = DbCatConfig;
query3.Fields = new Dictionary({ query3.Fields = new Dictionary({
{ "varname", kv.first }, { "varname", kv.first },
{ "varvalue", value }, { "varvalue", value },
@ -245,13 +244,6 @@ void DbObject::SendVarsConfigUpdateHeavy()
{ "object_id", obj }, { "object_id", obj },
{ "instance_id", 0 } /* DbConnection class fills in real ID */ { "instance_id", 0 } /* DbConnection class fills in real ID */
}); });
query3.WhereCriteria = new Dictionary({
{ "object_id", obj },
{ "config_type", 1 },
{ "varname", kv.first }
});
queries.emplace_back(std::move(query3)); queries.emplace_back(std::move(query3));
} }
} }