r4163 commitUpdateObject(): enforce NULL value for "label"

upgrade.php: convert older records

diff --git a/inc/database.php b/inc/database.php
index 146ea7d204c0c1788d68c2ba0e41dcba9e9751a6..2df700c7166272775ae0e131fd422dcff7673f27 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -632,7 +632,7 @@ function commitUpdateObject ($object_id, $new_name, $new_label, $new_barcode, $n
                array
                (
                        'name' => !mb_strlen ($new_name) ? NULL : $new_name,
-                       'label' => $new_label,
+                       'label' => !mb_strlen ($new_label) ? NULL : $new_label,
                        'barcode' => !mb_strlen ($new_barcode) ? NULL : $new_barcode,
                        'has_problems' => $new_has_problems,
                        'asset_no' => !mb_strlen ($new_asset_no) ? NULL : $new_asset_no,

diff --git a/upgrade.php b/upgrade.php
index 41244762c54e15ad5f914b0c0a2240ad9f6a8098..e14ececdfba83f45e6bca12addc56d101be19471 100644 (file)
--- a/upgrade.php
+++ b/upgrade.php
@@ -819,6 +819,7 @@ CREATE TABLE `ObjectLog` (
                        $query[] = "INSERT INTO `Config` (varname, varvalue, vartype, emptyok, is_hidden, description) VALUES ('SYNCDOMAIN_MAX_PROCESSES','0','uint','yes','no', 'How many worker proceses syncdomain cron script should create')";
                        $query[] = "ALTER TABLE `VLANSwitchTemplate` ADD COLUMN `mutex_rev` int(10) NOT NULL AFTER `max_local_vlans`";
                        $query[] = "ALTER TABLE `VLANSwitchTemplate` ADD COLUMN `saved_by` char(64) NOT NULL AFTER `description`";
+                       $query[] = "UPDATE RackObject SET label = NULL WHERE label = ''";
                        $query[] = "UPDATE Config SET varvalue = '0.19.0' WHERE varname = 'DB_VERSION'";
                        break;
                default: