From 9795efe71abcd69e0969021ccc7f31c56d6fbc07 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 3 Nov 2020 11:27:26 +0100 Subject: [PATCH] Model: Define missing customvar foreign key in junction models --- library/Icingadb/Model/CheckcommandCustomvar.php | 3 ++- library/Icingadb/Model/EventcommandCustomvar.php | 3 ++- library/Icingadb/Model/HostgroupCustomvar.php | 3 ++- library/Icingadb/Model/NotificationCustomvar.php | 3 ++- library/Icingadb/Model/NotificationcommandCustomvar.php | 3 ++- library/Icingadb/Model/ServicegroupCustomvar.php | 3 ++- library/Icingadb/Model/TimeperiodCustomvar.php | 3 ++- library/Icingadb/Model/UserCustomvar.php | 3 ++- library/Icingadb/Model/UsergroupCustomvar.php | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/library/Icingadb/Model/CheckcommandCustomvar.php b/library/Icingadb/Model/CheckcommandCustomvar.php index 7d883bae..879a9550 100644 --- a/library/Icingadb/Model/CheckcommandCustomvar.php +++ b/library/Icingadb/Model/CheckcommandCustomvar.php @@ -35,6 +35,7 @@ class CheckcommandCustomvar extends Model ->setCandidateKey('command_id'); $relations->belongsTo('customvar', Customvar::class); $relations->belongsTo('customvar_flat', CustomvarFlat::class) - ->setCandidateKey('customvar_id'); + ->setCandidateKey('customvar_id') + ->setForeignKey('customvar_id'); } } diff --git a/library/Icingadb/Model/EventcommandCustomvar.php b/library/Icingadb/Model/EventcommandCustomvar.php index dadaa8ef..4350c4f4 100644 --- a/library/Icingadb/Model/EventcommandCustomvar.php +++ b/library/Icingadb/Model/EventcommandCustomvar.php @@ -35,6 +35,7 @@ class EventcommandCustomvar extends Model ->setCandidateKey('command_id'); $relations->belongsTo('customvar', Customvar::class); $relations->belongsTo('customvar_flat', CustomvarFlat::class) - ->setCandidateKey('customvar_id'); + ->setCandidateKey('customvar_id') + ->setForeignKey('customvar_id'); } } diff --git a/library/Icingadb/Model/HostgroupCustomvar.php b/library/Icingadb/Model/HostgroupCustomvar.php index 0d87547e..834ee613 100644 --- a/library/Icingadb/Model/HostgroupCustomvar.php +++ b/library/Icingadb/Model/HostgroupCustomvar.php @@ -34,6 +34,7 @@ class HostgroupCustomvar extends Model $relations->belongsTo('hostgroup', Hostgroup::class); $relations->belongsTo('customvar', Customvar::class); $relations->belongsTo('customvar_flat', CustomvarFlat::class) - ->setCandidateKey('customvar_id'); + ->setCandidateKey('customvar_id') + ->setForeignKey('customvar_id'); } } diff --git a/library/Icingadb/Model/NotificationCustomvar.php b/library/Icingadb/Model/NotificationCustomvar.php index f2b6c92b..fd474f4f 100644 --- a/library/Icingadb/Model/NotificationCustomvar.php +++ b/library/Icingadb/Model/NotificationCustomvar.php @@ -34,6 +34,7 @@ class NotificationCustomvar extends Model $relations->belongsTo('notification', Notification::class); $relations->belongsTo('customvar', Customvar::class); $relations->belongsTo('customvar_flat', CustomvarFlat::class) - ->setCandidateKey('customvar_id'); + ->setCandidateKey('customvar_id') + ->setForeignKey('customvar_id'); } } diff --git a/library/Icingadb/Model/NotificationcommandCustomvar.php b/library/Icingadb/Model/NotificationcommandCustomvar.php index 14d0d7ba..a43bb5c6 100644 --- a/library/Icingadb/Model/NotificationcommandCustomvar.php +++ b/library/Icingadb/Model/NotificationcommandCustomvar.php @@ -35,6 +35,7 @@ class NotificationcommandCustomvar extends Model ->setCandidateKey('command_id'); $relations->belongsTo('customvar', Customvar::class); $relations->belongsTo('customvar_flat', CustomvarFlat::class) - ->setCandidateKey('customvar_id'); + ->setCandidateKey('customvar_id') + ->setForeignKey('customvar_id'); } } diff --git a/library/Icingadb/Model/ServicegroupCustomvar.php b/library/Icingadb/Model/ServicegroupCustomvar.php index b2140e49..2f98aef0 100644 --- a/library/Icingadb/Model/ServicegroupCustomvar.php +++ b/library/Icingadb/Model/ServicegroupCustomvar.php @@ -34,6 +34,7 @@ class ServicegroupCustomvar extends Model $relations->belongsTo('servicegroup', Servicegroup::class); $relations->belongsTo('customvar', Customvar::class); $relations->belongsTo('customvar_flat', CustomvarFlat::class) - ->setCandidateKey('customvar_id'); + ->setCandidateKey('customvar_id') + ->setForeignKey('customvar_id'); } } diff --git a/library/Icingadb/Model/TimeperiodCustomvar.php b/library/Icingadb/Model/TimeperiodCustomvar.php index 76031454..549cad92 100644 --- a/library/Icingadb/Model/TimeperiodCustomvar.php +++ b/library/Icingadb/Model/TimeperiodCustomvar.php @@ -34,6 +34,7 @@ class TimeperiodCustomvar extends Model $relations->belongsTo('timeperiod', Timeperiod::class); $relations->belongsTo('customvar', Customvar::class); $relations->belongsTo('customvar_flat', CustomvarFlat::class) - ->setCandidateKey('customvar_id'); + ->setCandidateKey('customvar_id') + ->setForeignKey('customvar_id'); } } diff --git a/library/Icingadb/Model/UserCustomvar.php b/library/Icingadb/Model/UserCustomvar.php index 5f9742d8..fa2a1f7f 100644 --- a/library/Icingadb/Model/UserCustomvar.php +++ b/library/Icingadb/Model/UserCustomvar.php @@ -34,6 +34,7 @@ class UserCustomvar extends Model $relations->belongsTo('user', User::class); $relations->belongsTo('customvar', Customvar::class); $relations->belongsTo('customvar_flat', CustomvarFlat::class) - ->setCandidateKey('customvar_id'); + ->setCandidateKey('customvar_id') + ->setForeignKey('customvar_id'); } } diff --git a/library/Icingadb/Model/UsergroupCustomvar.php b/library/Icingadb/Model/UsergroupCustomvar.php index cdbba71a..0375e3cb 100644 --- a/library/Icingadb/Model/UsergroupCustomvar.php +++ b/library/Icingadb/Model/UsergroupCustomvar.php @@ -34,6 +34,7 @@ class UsergroupCustomvar extends Model $relations->belongsTo('usergroup', Usergroup::class); $relations->belongsTo('customvar', Customvar::class); $relations->belongsTo('customvar_flat', CustomvarFlat::class) - ->setCandidateKey('customvar_id'); + ->setCandidateKey('customvar_id') + ->setForeignKey('customvar_id'); } }