Changeset 890 for trunk/Packages/Common/AppModule.php

Timestamp:

Dec 29, 2020, 11:11:12 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Modules dependencies evaluation.
• Modified: Better installation/uninstallation of models in more modules.

File:

• trunk/Packages/Common/AppModule.php (modified) (8 diffs)

trunk/Packages/Common/AppModule.php

@@ -90 +90 @@
     $this->Stop();
     $this->Installed = false;
-    $List = array();
+    $List = array();    
     $this->Manager->EnumSuperiorDependenciesCascade($this, $List, array(ModuleCondition::Installed));
     $this->Manager->Perform($List, array(ModuleAction::Uninstall), array(ModuleCondition::Installed));
@@ -187 +187 @@
   function InstallModel(ModelDesc $ModelDesc)
   {
-    $Query = 'CREATE TABLE IF NOT EXISTS `'.$ModelDesc->Name.'` ('."\n";
-    $Query = '  `'.$ModelDesc->PrimaryKey.'` int(11) NOT NULL AUTO_INCREMENT,'."\n";
+    $Query = "CREATE TABLE IF NOT EXISTS `".$ModelDesc->Name."` (\n";
+    $Query .= '  `'.$ModelDesc->PrimaryKey.'` int(11) NOT NULL AUTO_INCREMENT,'."\n";
     foreach ($ModelDesc->Columns as $Column)
     {
@@ -198 +198 @@
       else if ($Column->Type == ModelColumnType::DateTime) $Query .= 'datetime';
       else if ($Column->Type == ModelColumnType::Reference) $Query .= 'int(11)';
+      else if ($Column->Type == ModelColumnType::Boolean) $Query .= 'tinyint(1)';
+      else if ($Column->Type == ModelColumnType::Date) $Query .= 'date';
+      else if ($Column->Type == ModelColumnType::Enum) 
+      {
+        $Query .= 'enum("'.implode('", "', $Column->States).'")';
+      }
 
       if ($Column->Nullable) $Query .= '';
@@ -212 +218 @@
       $Query .= ",\n";
     }
-    $Query .= '  PRIMARY KEY (`'.$ModelDesc->PrimaryKey.'`),';
+    $Query .= '  PRIMARY KEY (`'.$ModelDesc->PrimaryKey.'`)';
     foreach ($ModelDesc->Columns as $Column)
     {
       if ($Column->Type == ModelColumnType::Reference)
-        $Query .= '  KEY `'.$Column->Name.'` (`'.$Column->Name.'`)'."\n";
+        $Query .= ','."\n".'  KEY `'.$Column->Name.'` (`'.$Column->Name.'`)';
       else if ($Column->Unique)
-        $Query .= '  UNIQUE KEY `'.$Column->Name.'` (`'.$Column->Name.'`)'."\n";
-    }
-
-    $Query .= ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
+        $Query .= ','."\n".'  UNIQUE KEY `'.$Column->Name.'` (`'.$Column->Name.'`)';
+    }
+    $Query .= "\n";
+
+    if ($ModelDesc->Memory) $Engine = 'MEMORY';
+      else $Engine = 'InnoDB';
+    $Query .= ') ENGINE='.$Engine.' DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;';
     $I = 1;
     foreach ($ModelDesc->Columns as $Column)
@@ -229 +238 @@
         "ADD CONSTRAINT `".$ModelDesc->Name."_ibfk_".$I."` FOREIGN KEY (`".$Column->Name."`) REFERENCES `".$Column->RefTable."` (`Id`);";
     }
+    echo($Query);
     $this->Database->query($Query);
   }
@@ -234 +244 @@
   function UninstallModel(ModelDesc $ModelDesc)
   {
-    $this->Database->query('DROP TABLE `'.$ModelDesc->Name.'`');
+    $this->Database->query('DROP TABLE IF EXISTS `'.$ModelDesc->Name.'`');
   }
 }
@@ -289 +299 @@
       $DepModule = $this->Modules[$Dependency];
       if (in_array(ModuleCondition::All, $Conditions) or
-        ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
-        (!$Module->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
-        ($Module->Enabled and in_array(ModuleCondition::Enabled, $Conditions)) or
-        (!$Module->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)) or
-        ($Module->Installed and in_array(ModuleCondition::Installed, $Conditions)) or
-        (!$Module->Installed and in_array(ModuleCondition::NotInstalled, $Conditions)))
+        ($DepModule->Running and in_array(ModuleCondition::Running, $Conditions)) or
+        (!$DepModule->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
+        ($DepModule->Enabled and in_array(ModuleCondition::Enabled, $Conditions)) or
+        (!$DepModule->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)) or
+        ($DepModule->Installed and in_array(ModuleCondition::Installed, $Conditions)) or
+        (!$DepModule->Installed and in_array(ModuleCondition::NotInstalled, $Conditions)))
       {
         array_push($List, $DepModule);
@@ -308 +318 @@
       if (in_array($Module->Name, $RefModule->Dependencies) and
           (in_array(ModuleCondition::All, $Conditions) or
-          ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
-          (!$Module->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
-          ($Module->Enabled and in_array(ModuleCondition::Enabled, $Conditions)) or
-          (!$Module->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)) or
-          ($Module->Installed and in_array(ModuleCondition::Installed, $Conditions)) or
-          (!$Module->Installed and in_array(ModuleCondition::NotInstalled, $Conditions))))
+          ($RefModule->Running and in_array(ModuleCondition::Running, $Conditions)) or
+          (!$RefModule->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
+          ($RefModule->Enabled and in_array(ModuleCondition::Enabled, $Conditions)) or
+          (!$RefModule->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)) or
+          ($RefModule->Installed and in_array(ModuleCondition::Installed, $Conditions)) or
+          (!$RefModule->Installed and in_array(ModuleCondition::NotInstalled, $Conditions))))
       {
         array_push($List, $RefModule);