Changeset 898 for trunk

Timestamp:

Feb 4, 2021, 11:55:44 PM (4 years ago)

Author:

chronos

Message:

• Modified: Initialization of modular system base tables.

Location:

trunk/Packages/Common

Files:

• AppModule.php (modified) (9 diffs)
• Base.php (modified) (1 diff)
• Database.php (modified) (1 diff)
• Modules/ModuleManager.php (modified) (6 diffs)

trunk/Packages/Common/AppModule.php

@@ -71 +71 @@
     $this->Version = '';
     $this->Creator = '';
+    $this->Title = '';
     $this->Description = '';
     $this->Dependencies = array();
@@ -85 +86 @@
   {
     if ($this->Installed) return;
+    echo('Install mod '.$this->Name.'<br/>');
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotInstalled));
     $this->Manager->PerformList($List, array(ModuleAction::Install), array(ModuleCondition::NotInstalled));
-    $this->DoBeforeInstall();
-    $this->InstallModels();
-    $this->DoInstall();
     $this->Installed = true;
     $this->Enabled = true; // Automatically enable installed module
     $this->InstalledVersion = $this->Version;
     $this->Manager->Modules[$this->Name] = $this;
+    $this->DoBeforeInstall();
+    if ($this->Manager->OnInstallModule != null)
+    {
+      call_user_func($this->Manager->OnInstallModule, $this);
+    }
+    $this->InstallModels();
+    $this->DoInstall();
   }
 
@@ -107 +113 @@
     $this->DoUninstall();
     $this->UninstallModels();
+    if ($this->Manager->OnUninstallModule != null)
+    {
+      call_user_func($this->Manager->OnUninstallModule, $this);
+    }
     $this->DoAfterUninstall();
   }
@@ -214 +224 @@
       foreach ($this->GetModels() as $Model)
       {
-        call_user_func($this->Manager->OnInstallModel, $Model::GetDesc());
+        call_user_func($this->Manager->OnInstallModel, $Model::GetDesc(), $this);
       }
     }
@@ -225 +235 @@
       foreach (array_reverse($this->GetModels()) as $Model)
       {
-        call_user_func($this->Manager->OnUninstallModel, $Model::GetDesc());
+        call_user_func($this->Manager->OnUninstallModel, $Model::GetDesc(), $this);
       }
     }
@@ -241 +251 @@
   public $OnInstallModel;
   public $OnUninstsallModel;
+  public $OnInstallModule;
+  public $OnUninstsallModule;
 
   function __construct(System $System)
@@ -250 +262 @@
     $this->OnInstallModel = null;
     $this->OnUninstallModel = null;
+    $this->OnInstallModule = null;
+    $this->OnUninstallModule = null;
   }
 
@@ -456 +470 @@
   }
 
+  function GetUniqueModuleId()
+  {
+    $Id = 1;
+    foreach ($this->Modules as $Module)
+    {
+      if ($Module->Id >= $Id) $Id = $Module->Id + 1;
+    }
+    return $Id;
+  }
+
   function LoadModule(string $FileName): AppModule
   {
@@ -461 +485 @@
     $ModuleName = 'Module'.pathinfo($FileName, PATHINFO_FILENAME);
     $Module = new $ModuleName($this->System);
+    $Module->Id = $this->GetUniqueModuleId();
     $this->RegisterModule($Module);
     return $Module;

trunk/Packages/Common/Base.php

@@ -150 +150 @@
   const Enum = 8;
   const BigInt = 9;
+
+  static function GetName(int $Index)
+  {
+    $Text = array('Integer', 'String', 'Float', 'Text', 'DateTime', 'Reference', 'Boolean', 'Date', 'Enum', 'BigInt');
+    return $Text[$Index];
+  }
 }
 

trunk/Packages/Common/Database.php

@@ -129 +129 @@
   }
 
-  function delete(string $Table, string $Condition)
+  function delete(string $Table, string $Condition): void
   {
     $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
   }
 
-  function insert(string $Table, array $Data)
+  function insert(string $Table, array $Data): void
   {
     $this->query($this->GetInsert($Table, $Data));

trunk/Packages/Common/Modules/ModuleManager.php

@@ -22 +22 @@
     $this->Manager->OnInstallModel = array($this, 'InstallModel');
     $this->Manager->OnUninstallModel = array($this, 'UninstallModel');
+    $this->Manager->OnInstallModule = array($this, 'InstallModule');
+    $this->Manager->OnUninstallModule = array($this, 'UninstallModule');
 
     Core::Cast($this->System)->RegisterPage(['modules'], 'PageModules');
@@ -140 +142 @@
   function DoBeforeInstall(): void
   {
+    $this->AddModelDatabase(Module::GetDesc());
+    $this->Manager->OnInstallModule = array($this, 'InstallModule');
+    $this->Manager->OnUninstallModule = array($this, 'UninstallModule');
+    $this->AddModelDatabase(ModuleModel::GetDesc());
     $this->Manager->OnInstallModel = array($this, 'InstallModel');
     $this->Manager->OnUninstallModel = array($this, 'UninstallModel');
@@ -148 +154 @@
     $this->Manager->OnInstallModel = null;
     $this->Manager->OnUninstallModel = null;
+    $this->RemoveModelDatabase(ModuleModel::GetDesc());
+    $this->Manager->OnInstallModule = null;
+    $this->Manager->OnUninstallModule = null;
+    $this->RemoveModelDatabase(Module::GetDesc());
   }
 
   function GetModels(): array
   {
-    return array(Module::GetClassName(), ModuleModel::GetClassName(), ModuleModelField::GetClassName(),
-      ModuleDependency::GetClassName());
-  }
-
-  function InstallModel(ModelDesc $ModelDesc)
+    return array(ModuleModelField::GetClassName(), ModuleDependency::GetClassName());
+  }
+
+  function AddModelDatabase(ModelDesc $ModelDesc)
   {
     $Query = "CREATE TABLE IF NOT EXISTS `".$ModelDesc->Name."` (\n";
@@ -212 +221 @@
   }
 
-  function UninstallModel(ModelDesc $ModelDesc)
+  function RemoveModelDatabase(ModelDesc $ModelDesc)
   {
     /*$Query = '';
@@ -227 +236 @@
 */
     $this->Database->query('SET foreign_key_checks = 0; DROP TABLE IF EXISTS `'.$ModelDesc->Name.'`');
+  }
+
+  function InstallModel(ModelDesc $ModelDesc, AppModule $Module)
+  {
+    $this->AddModelDatabase($ModelDesc);
+    $this->Database->insert('ModuleModel', array('Name' => $ModelDesc->Name, 'Module' => $Module->Id));
+    $ModelId = $this->Database->insert_id;
+    foreach ($ModelDesc->Columns as $Field)
+    {
+      $this->Database->insert('ModuleModelField', array('Name' => $Field->Name, 'Model' => $ModelId,
+        'Type' => ModelColumnType::GetName($Field->Type), 'Nullable' => (int)$Field->Nullable));
+    }
+  }
+
+  function UninstallModel(ModelDesc $ModelDesc, AppModule $Module)
+  {
+    $this->Database->delete('ModuleModel', '(Name='.$ModelDesc->Name.') AND (Module='.$Module->Id.')');
+    $this->RemoveModelDatabase($ModelDesc);
+  }
+
+  function InstallModule(AppModule $Module)
+  {
+    echo('Install module '.$Module->Name);
+    $this->Database->insert('Module', array(
+      'Name' => $Module->Name,
+      'Title' => $Module->Title,
+      'Creator' => $Module->Creator,
+      'Version' => $Module->Version,
+      'License' => $Module->License,
+      'Installed' => (int)$Module->Installed,
+      'Description' => $Module->Description,
+      'InstalledVersion' => $Module->InstalledVersion
+    ));
+    $Module->Id = $this->Database->insert_id;
+  }
+
+  function UninstallModule(AppModule $Module)
+  {
+    echo('Uninstall module '.$Module->Name);
+    $this->Database->delete('Module', 'Name='.$Module->Name);
   }
 
@@ -519 +568 @@
     $Desc = new ModelDesc(self::GetClassName());
     $Desc->AddString('Name');
-    $Desc->AddReference('Module', ModuleModel::GetClassName());
+    $Desc->AddReference('Model', ModuleModel::GetClassName());
     $Desc->AddString('Type');
     $Desc->AddBoolean('Nullable');