Add Binary behavior for binary columns

Icinga · Apr 13, 2022 · ce10eb6 · ce10eb6
1 parent 88b4448
commit ce10eb6
Show file tree

Hide file tree

Showing 58 changed files with 647 additions and 6 deletions.
diff --git a/library/Icingadb/Model/AcknowledgementHistory.php b/library/Icingadb/Model/AcknowledgementHistory.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
 use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
 use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
 use ipl\Orm\Behaviors;
@@ -78,6 +79,14 @@ public function createBehaviors(Behaviors $behaviors)
             'clear_time',
             'expire_time'
         ]));
+
+        $behaviors->add(new Binary([
+            'id',
+            'environment_id',
+            'endpoint_id',
+            'host_id',
+            'service_id',
+        ]));
     }
 
     public function createRelations(Relations $relations)

diff --git a/library/Icingadb/Model/ActionUrl.php b/library/Icingadb/Model/ActionUrl.php
@@ -5,6 +5,7 @@
 namespace Icinga\Module\Icingadb\Model;
 
 use Icinga\Module\Icingadb\Model\Behavior\ActionAndNoteUrl;
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
@@ -40,6 +41,11 @@ public function getMetaData()
     public function createBehaviors(Behaviors $behaviors)
     {
         $behaviors->add(new ActionAndNoteUrl(['action_url']));
+
+        $behaviors->add(new Binary([
+            'id',
+            'environment_id'
+        ]));
     }
 
     public function createRelations(Relations $relations)

diff --git a/library/Icingadb/Model/Behavior/Binary.php b/library/Icingadb/Model/Behavior/Binary.php
@@ -34,6 +34,14 @@ public function toDb($value, $key, $_)
             throw new \UnexpectedValueException(sprintf('Unexpected resource for %s', $key));
         }
 
+        if ($value === '*') {
+            /**
+             * Support IS (NOT) NULL filter transformation.
+             * {@see \ipl\Sql\Compat\FilterProcessor::assemblePredicate()}
+             */
+            return $value;
+        }
+
         return sprintf('\\x%s', bin2hex($value));
     }
 

diff --git a/library/Icingadb/Model/Checkcommand.php b/library/Icingadb/Model/Checkcommand.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
 use Icinga\Module\Icingadb\Model\Behavior\ReRoute;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
@@ -55,6 +56,14 @@ public function createBehaviors(Behaviors $behaviors)
             'hostgroup'     => 'host.hostgroup',
             'servicegroup'  => 'service.servicegroup'
         ]));
+
+        $behaviors->add(new Binary([
+            'id',
+            'zone_id',
+            'environment_id',
+            'name_checksum',
+            'properties_checksum'
+        ]));
     }
 
     public function createRelations(Relations $relations)

diff --git a/library/Icingadb/Model/CheckcommandArgument.php b/library/Icingadb/Model/CheckcommandArgument.php
@@ -4,6 +4,8 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
+use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
 
@@ -55,6 +57,16 @@ public function getMetaData()
         ];
     }
 
+    public function createBehaviors(Behaviors $behaviors)
+    {
+        $behaviors->add(new Binary([
+            'id',
+            'checkcommand_id',
+            'environment_id',
+            'properties_checksum'
+        ]));
+    }
+
     public function createRelations(Relations $relations)
     {
         $relations->belongsTo('environment', Environment::class);

diff --git a/library/Icingadb/Model/CheckcommandCustomvar.php b/library/Icingadb/Model/CheckcommandCustomvar.php
@@ -4,6 +4,8 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
+use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
 
@@ -28,6 +30,16 @@ public function getColumns()
         ];
     }
 
+    public function createBehaviors(Behaviors $behaviors)
+    {
+        $behaviors->add(new Binary([
+            'id',
+            'checkcommand_id',
+            'customvar_id',
+            'environment_id'
+        ]));
+    }
+
     public function createRelations(Relations $relations)
     {
         $relations->belongsTo('environment', Environment::class);

diff --git a/library/Icingadb/Model/CheckcommandEnvvar.php b/library/Icingadb/Model/CheckcommandEnvvar.php
@@ -4,6 +4,8 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
+use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
 
@@ -41,6 +43,16 @@ public function getMetaData()
         ];
     }
 
+    public function createBehaviors(Behaviors $behaviors)
+    {
+        $behaviors->add(new Binary([
+            'id',
+            'checkcommand_id',
+            'environment_id',
+            'properties_checksum'
+        ]));
+    }
+
     public function createRelations(Relations $relations)
     {
         $relations->belongsTo('environment', Environment::class);

diff --git a/library/Icingadb/Model/Comment.php b/library/Icingadb/Model/Comment.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
 use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
 use Icinga\Module\Icingadb\Model\Behavior\ReRoute;
 use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
@@ -91,6 +92,16 @@ public function createBehaviors(Behaviors $behaviors)
             'hostgroup'     => 'host.hostgroup',
             'servicegroup'  => 'service.servicegroup'
         ]));
+
+        $behaviors->add(new Binary([
+            'id',
+            'environment_id',
+            'host_id',
+            'service_id',
+            'name_checksum',
+            'properties_checksum',
+            'zone_id'
+        ]));
     }
 
     public function createRelations(Relations $relations)

diff --git a/library/Icingadb/Model/CommentHistory.php b/library/Icingadb/Model/CommentHistory.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
 use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
 use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
 use ipl\Orm\Behaviors;
@@ -83,6 +84,14 @@ public function createBehaviors(Behaviors $behaviors)
             'expire_time',
             'remove_time'
         ]));
+
+        $behaviors->add(new Binary([
+            'comment_id',
+            'environment_id',
+            'endpoint_id',
+            'host_id',
+            'service_id'
+        ]));
     }
 
     public function createRelations(Relations $relations)

diff --git a/library/Icingadb/Model/Customvar.php b/library/Icingadb/Model/Customvar.php
@@ -4,6 +4,8 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
+use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
 
@@ -31,6 +33,15 @@ public function getColumns()
         ];
     }
 
+    public function createBehaviors(Behaviors $behaviors)
+    {
+        $behaviors->add(new Binary([
+            'id',
+            'environment_id',
+            'name_checksum'
+        ]));
+    }
+
     public function createRelations(Relations $relations)
     {
         $relations->belongsTo('environment', Environment::class);

diff --git a/library/Icingadb/Model/CustomvarFlat.php b/library/Icingadb/Model/CustomvarFlat.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
 use Icinga\Module\Icingadb\Model\Behavior\FlattenedObjectVars;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
@@ -33,6 +34,18 @@ public function getColumns()
         ];
     }
 
+    public function createBehaviors(Behaviors $behaviors)
+    {
+        $behaviors->add(new FlattenedObjectVars());
+
+        $behaviors->add(new Binary([
+            'id',
+            'environment_id',
+            'customvar_id',
+            'flatname_checksum'
+        ]));
+    }
+
     public function createRelations(Relations $relations)
     {
         $relations->belongsTo('environment', Environment::class);
@@ -73,11 +86,6 @@ public function createRelations(Relations $relations)
             ->setCandidateKey('customvar_id');
     }
 
-    public function createBehaviors(Behaviors $behaviors)
-    {
-        $behaviors->add(new FlattenedObjectVars());
-    }
-
     /**
      * Restore flattened custom variables to their previous structure
      *

diff --git a/library/Icingadb/Model/Downtime.php b/library/Icingadb/Model/Downtime.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
 use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
 use Icinga\Module\Icingadb\Model\Behavior\IdKey;
 use Icinga\Module\Icingadb\Model\Behavior\ReRoute;
@@ -95,10 +96,12 @@ public function getDefaultSort()
     public function createBehaviors(Behaviors $behaviors)
     {
         $behaviors->add(new IdKey());
+
         $behaviors->add(new BoolCast([
             'is_flexible',
             'is_in_effect'
         ]));
+
         $behaviors->add(new Timestamp([
             'entry_time',
             'scheduled_start_time',
@@ -109,10 +112,23 @@ public function createBehaviors(Behaviors $behaviors)
             'end_time',
             'duration'
         ]));
+
         $behaviors->add(new ReRoute([
             'hostgroup'    => 'host.hostgroup',
             'servicegroup' => 'service.servicegroup'
         ]));
+
+        $behaviors->add(new Binary([
+            'id',
+            'environment_id',
+            'triggered_by_id',
+            'parent_id',
+            'host_id',
+            'service_id',
+            'name_checksum',
+            'properties_checksum',
+            'zone_id'
+        ]));
     }
 
     public function createRelations(Relations $relations)

diff --git a/library/Icingadb/Model/DowntimeHistory.php b/library/Icingadb/Model/DowntimeHistory.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
 use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
 use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
 use ipl\Orm\Behaviors;
@@ -97,6 +98,16 @@ public function createBehaviors(Behaviors $behaviors)
             'trigger_time',
             'cancel_time'
         ]));
+
+        $behaviors->add(new Binary([
+            'downtime_id',
+            'environment_id',
+            'endpoint_id',
+            'triggered_by_id',
+            'parent_id',
+            'host_id',
+            'service_id'
+        ]));
     }
 
     public function createRelations(Relations $relations)

diff --git a/library/Icingadb/Model/Endpoint.php b/library/Icingadb/Model/Endpoint.php
@@ -4,6 +4,8 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
+use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
 
@@ -43,6 +45,17 @@ public function getMetaData()
         ];
     }
 
+    public function createBehaviors(Behaviors $behaviors)
+    {
+        $behaviors->add(new Binary([
+            'id',
+            'environment_id',
+            'name_checksum',
+            'properties_checksum',
+            'zone_id'
+        ]));
+    }
+
     public function createRelations(Relations $relations)
     {
         $relations->belongsTo('environment', Environment::class);

diff --git a/library/Icingadb/Model/Environment.php b/library/Icingadb/Model/Environment.php
@@ -4,6 +4,8 @@
 
 namespace Icinga\Module\Icingadb\Model;
 
+use Icinga\Module\Icingadb\Model\Behavior\Binary;
+use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
 
@@ -33,6 +35,13 @@ public function getMetaData()
         ];
     }
 
+    public function createBehaviors(Behaviors $behaviors)
+    {
+        $behaviors->add(new Binary([
+            'id'
+        ]));
+    }
+
     public function createRelations(Relations $relations)
     {
         $relations->hasMany('acknowledgement_history', AcknowledgementHistory::class);