Changeset 771 for trunk/Common

Timestamp:

Dec 24, 2015, 4:20:00 PM (8 years ago)

Author:

chronos

Message:

• Fixed: SQL upgrade function.

File:

• trunk/Common/Setup/Updates.php (modified) (3 diffs)

trunk/Common/Setup/Updates.php

@@ -1637 +1637 @@
 function UpdateTo768($Manager)
 {
-  $Manager->Execute('ALTER TABLE `NetworkDomainAlias` ADD `Domain` INT NOT NULL AFTER `Comment`;');
+/*  $Manager->Execute('ALTER TABLE `NetworkDomainAlias` ADD `Domain` INT NOT NULL AFTER `Comment`;');
   $Manager->Execute('ALTER TABLE `NetworkDomainAlias` ADD KEY `Domain` (`Domain`);');
   $Manager->Execute('UPDATE `NetworkDomainAlias` SET `Domain`=1');
@@ -1653 +1653 @@
   `Suffix` varchar(255) NOT NULL,
   `View` int(11) NOT NULL,
-  `AddressRange` varchar(255) NOT NULL
+  `AddressRange` varchar(255) NOT NULL,
   PRIMARY KEY (`Id`),
   KEY `Domain` (`Domain`),
@@ -1663 +1663 @@
   `AddressRange` varchar(255) NOT NULL,
   `Name` varchar(255) NOT NULL,
-  `SysName` varchar(255) NOT NULL
+  `SysName` varchar(255) NOT NULL,
   PRIMARY KEY (`Id`),
   KEY `Domain` (`Domain`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;');
+*/
+        $Manager->Execute('ALTER TABLE `NetworkDomainItemFilter`
+  ADD FOREIGN KEY (`Domain`) REFERENCES `NetworkDomain` (`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
   $Manager->Execute('ALTER TABLE `NetworkDomainItemFilter`
-  ADD CONSTRAINT `NetworkDomainItemFilter_ibfk_1` FOREIGN KEY (`Domain`) REFERENCES `NetworkDomain` (`Id`);');
-  $Manager->Execute('ALTER TABLE `NetworkDomainItemFilter`
-  ADD FOREIGN KEY (`Domain`) REFERENCES `NetworkDomainView`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+  ADD FOREIGN KEY (`View`) REFERENCES `NetworkDomainView`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
   $Manager->Execute('ALTER TABLE `NetworkDomainView`
   ADD FOREIGN KEY (`Domain`) REFERENCES `NetworkDomainView`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');