Fix sql data cannot be null in query (#492)

* Fix sql data cannot be null in query

* Update changelog

* Update inc/commoninjectionlib.class.php

Co-authored-by: Stanislas <[email protected]>

* Update inc/commoninjectionlib.class.php

Co-authored-by: Romain B. <[email protected]>

* Add notnull_value array

* Use reformat function

* Update inc/commoninjectionlib.class.php

Co-authored-by: Romain B. <[email protected]>

---------

Co-authored-by: Stanislas <[email protected]>
Co-authored-by: Romain B. <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fix injection of `values in entity tabs` when injecting an `entity`
 - Fix `pdffont` field error for users
 - Move `Notepads` search options to the Black List option
+- Fix the SQL error: `Column ‘...’ cannot be null in the query`
 
 
 ### Added

inc/commoninjectionlib.class.php

@@ -955,7 +955,13 @@ private function setValueForItemtype($itemtype, $field, $value, $fromdb = false)
             }
         } else { // First value
             if (empty($value)) {
-                $this->values[$itemtype][$field] = "NULL";
+                if (isForeignKeyField($field) || (strpos($field, 'is_') !== false)) {
+                    // If the field is an id, we set it to 0
+                    $this->values[$itemtype][$field] = self::DROPDOWN_EMPTY_VALUE;
+                } else {
+                    // Else we set it to NULL
+                    $this->values[$itemtype][$field] = self::EMPTY_VALUE;
+                }
             } else {
                 $this->values[$itemtype][$field] = $value;
             }

inc/networkequipmentinjection.class.php

@@ -57,17 +57,17 @@ public function connectedTo()
 
 
     /**
-    * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()
-   **/
+     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()
+     **/
     public function getOptions($primary_type = '')
     {
 
         $tab                       = Search::getOptions(get_parent_class($this));
 
-       //Specific to location
+        //Specific to location
         $tab[3]['linkfield']       = 'locations_id';
 
-       //Virtual type : need to be processed at the end !
+        //Virtual type : need to be processed at the end !
         $tab[200]['table']         = 'glpi_networkequipments';
         $tab[200]['field']         = 'nb_ports';
         $tab[200]['name']          = __('Number of ports', 'datainjection');
@@ -76,17 +76,38 @@ public function getOptions($primary_type = '')
         $tab[200]['linkfield']     = 'nb_ports';
         $tab[200]['injectable']    = PluginDatainjectionCommonInjectionLib::FIELD_VIRTUAL;
 
-       //Remove some options because some fields cannot be imported
+        //Remove some options because some fields cannot be imported
         $blacklist     = PluginDatainjectionCommonInjectionLib::getBlacklistedOptions(get_parent_class($this));
         $notimportable = [
-            41, 43, 44, 45, 46, 48, 61, 63, 64, 91, 92, 93
+            41,
+            43,
+            44,
+            45,
+            46,
+            48,
+            61,
+            63,
+            64,
+            91,
+            92,
+            93
         ];
 
         $options['ignore_fields'] = array_merge($blacklist, $notimportable);
 
-        $options['displaytype']   = ["dropdown"       => [3, 4, 11, 23, 31, 32, 33,
-            40, 49, 71
-        ],
+        $options['displaytype']   = [
+            "dropdown"       => [
+                3,
+                4,
+                11,
+                23,
+                31,
+                32,
+                33,
+                40,
+                49,
+                71
+            ],
             "bool"           => [86],
             "user"           => [24, 70],
             "multiline_text" => [16, 90]
@@ -97,8 +118,8 @@ public function getOptions($primary_type = '')
 
 
     /**
-    * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::addOrUpdateObject()
-   **/
+     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::addOrUpdateObject()
+     **/
     public function addOrUpdateObject($values = [], $options = [])
     {
 
@@ -109,10 +130,10 @@ public function addOrUpdateObject($values = [], $options = [])
 
 
     /**
-    * @param array $values
-    * @param boolean $add                (true by default)
-    * @param array|null $rights    array
-    */
+     * @param array $values
+     * @param boolean $add                (true by default)
+     * @param array|null $rights    array
+     */
     public function processAfterInsertOrUpdate($values, $add = true, $rights = [])
     {
 
@@ -135,4 +156,25 @@ public function processAfterInsertOrUpdate($values, $add = true, $rights = [])
             }
         }
     }
+
+    /**
+     * @param array $values    array
+     **/
+    public function reformat(&$values = [])
+    {
+
+        foreach (
+            ['cpu'] as $int
+        ) {
+            if (
+                isset($values['NetworkEquipment'][$int])
+                && (
+                    $values['NetworkEquipment'][$int] == PluginDatainjectionCommonInjectionLib::EMPTY_VALUE
+                    || $values['NetworkEquipment'][$int] === 'NULL'
+                )
+            ) {
+                $values['NetworkEquipment'][$int] = 0;
+            }
+        }
+    }
 }