Changeset 743

Timestamp:

Sep 3, 2015, 9:25:53 AM (9 years ago)

Author:

chronos

Message:

• Fixed: Upgrade method.
• Modified: AppModule Upgrade method improvement.

Location:

trunk/Common

Files:

• AppModule.php (modified) (4 diffs)
• Setup/Updates.php (modified) (5 diffs)

trunk/Common/AppModule.php

@@ -101 +101 @@
   {
     if(!$this->Installed) return;
+    if($this->InstalledVersion == $this->Version) return;
     $List = array();
     $this->Manager->EnumSuperiorDependenciesCascade($this, $List, array(ModuleCondition::Installed));
@@ -175 +176 @@
   protected function DoUninstall()
   {
+  }
+
+  protected function DoUpgrade()
+  {
+
   }
 }
@@ -213 +219 @@
           if($Action == ModuleAction::Enable) $Module->Enable();
           if($Action == ModuleAction::Disable) $Module->Disable();
+          if($Action == ModuleAction::Upgrade) $Module->Upgrade();
         }
       }
@@ -360 +367 @@
   }
 }
-

trunk/Common/Setup/Updates.php

@@ -1432 +1432 @@
   $Manager->Execute('ALTER TABLE `FinanceInvoiceGroup` ADD `Direction` INT NOT NULL ;');
   $Manager->Execute('UPDATE `FinanceInvoiceGroup` SET `Direction` = 1 WHERE ValueSign=1');
-  $Manager->Execute('ALTER TABLE `FinanceInvoice` ADD `Direction` INT NOT NULL AFTER `TimePayment`;');  
+  $Manager->Execute('ALTER TABLE `FinanceInvoice` ADD `Direction` INT NOT NULL AFTER `TimePayment`;');
   $Manager->Execute('UPDATE `FinanceInvoice` SET `Direction` = 1 WHERE ValueSign=1');
 }
@@ -1448 +1448 @@
   $Manager->Execute('ALTER TABLE `DocumentLineCode`
 ADD CONSTRAINT `DocumentLineCode_ibfk_1` FOREIGN KEY (`DocumentLine`) REFERENCES `DocumentLine` (`Id`);');
-  
+
   // Transform finance operations
   $Manager->Execute('ALTER TABLE `FinanceOperation` CHANGE `BillCode` `BillCodeText` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL');
@@ -1454 +1454 @@
   $Manager->Execute('ALTER TABLE `FinanceOperation` ADD FOREIGN KEY (`BillCode`) REFERENCES `DocumentLineCode`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
   $DbResult = $Manager->Execute('SELECT `FinanceOperation`.`Id`, `FinanceOperation`.`BillCodeText`, `FinanceOperationGroup`.`DocumentLine` '.
-    'FROM `FinanceInvoice` '.
+    'FROM `FinanceOperation` '.
     'LEFT JOIN `FinanceOperationGroup` ON `FinanceOperationGroup`.`Id` = `FinanceOperation`.`Group` '.
     'WHERE `FinanceOperation`.`BillCodeText`!=""');
@@ -1466 +1466 @@
   }
   $Manager->Execute('ALTER TABLE `FinanceOperation` DROP `BillCodeText`;');
-  
+
   // Transform invoices
   $Manager->Execute('ALTER TABLE `FinanceInvoice` CHANGE `BillCode` `BillCodeText` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL');
@@ -1484 +1484 @@
   }
   $Manager->Execute('ALTER TABLE `FinanceInvoice` DROP `BillCodeText`;');
-  
+
         //$Manager->Execute('RENAME TABLE `FinanceOperationGroup` TO `FinanceOperationTemplate`');
         //$Manager->Execute('RENAME TABLE `FinanceInvoiceGroup` TO `FinanceInvoiceTemplate`');