r4217 upgrade.php: justify update of IPV4OBJ_LISTSRC

install.php: fix column order for VLANSwitchTemplate

diff --git a/wwwroot/install.php b/wwwroot/install.php
index 347712e1bbd2c7480fdeb8cb9dcf8c65742b3e49..df1818101ecff6d0522cf4f156b0232ee17e70d5 100644 (file)
--- a/wwwroot/install.php
+++ b/wwwroot/install.php
@@ -882,8 +882,8 @@ CREATE TABLE `VLANSwitch` (
 
 CREATE TABLE `VLANSwitchTemplate` (
   `id` int(10) unsigned NOT NULL auto_increment,
-  `description` char(255) default NULL,
   `mutex_rev` int(10) NOT NULL,
+  `description` char(255) default NULL,
   `saved_by` char(64) NOT NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `description` (`description`)

diff --git a/wwwroot/upgrade.php b/wwwroot/upgrade.php
index 3a3f25c3d6bf77c063214e8ef21286664234d5a0..a7740be43bdf1c7986b81c6f01452ad0cc81bab1 100644 (file)
--- a/wwwroot/upgrade.php
+++ b/wwwroot/upgrade.php
@@ -929,7 +929,7 @@ CREATE TABLE `EntityLink` (
                        $query[] = "INSERT INTO `ObjectParentCompat` (`parent_objtype_id`, `child_objtype_id`) VALUES (1505,1507)";
                        $query[] = "INSERT INTO `ObjectParentCompat` (`parent_objtype_id`, `child_objtype_id`) VALUES (1506,1504)";
                        $query[] = "INSERT INTO `Config` (varname, varvalue, vartype, emptyok, is_hidden, is_userdefined, description) VALUES ('PORT_EXCLUSION_LISTSRC','{\$typeid_3} or {\$typeid_10} or {\$typeid_11} or {\$typeid_1505} or {\$typeid_1506}','string','yes','no','no','List source: objects without ports')";
-                       $query[] = "UPDATE Config SET varvalue = CONCAT(varvalue, ' or {\$typeid_2} or {\$typeid_6} or {\$typeid_1502} or {\$typeid_1503} or {\$typeid_1504} or {\$typeid_1507}') WHERE varname = 'IPV4OBJ_LISTSRC'";
+                       $query[] = "UPDATE Config SET varvalue = CONCAT(varvalue, ' or {\$typeid_1502} or {\$typeid_1503} or {\$typeid_1504} or {\$typeid_1507}') WHERE varname = 'IPV4OBJ_LISTSRC'";
                        $query[] = "UPDATE Config SET varvalue = '8' WHERE varname = 'MASSCOUNT'";
                        $query[] = "UPDATE RackObject SET label = NULL WHERE label = ''";
                        // Move barcode data so the column can be dropped