Changeset 890 for trunk/Packages/Common

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk/Packages/Common

Files:

• AppModule.php (modified) (8 diffs)
• Base.php (modified) (9 diffs)
• Database.php (modified) (1 diff)
• Update.php (modified) (1 diff)

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);

trunk/Packages/Common/Base.php

@@ -38 +38 @@
 {
   public string $Name;
-  public bool $Nullable;
   public array $Columns;
   public array $Indices;
   public string $PrimaryKey;
-  public bool $Unique;
-  public bool $HasDefault;
-
-  function __construct(string $Name, bool $Nullable = false, bool $Unique = false)
+  public bool $Memory;
+
+  function __construct(string $Name)
   {
     $this->Name = $Name;
     $this->Columns = array();
-    $this->Nullable = $Nullable;
+    $this->Indices = array();
     $this->PrimaryKey = 'Id';
-    $this->Unique = $Unique;
+    $this->Memory = false;
   }
 
@@ -61 +59 @@
   }
 
+  function AddFloat(string $Name): ModelColumnFloat
+  {
+    $Result = new ModelColumnFloat($Name);
+    $this->Columns[] = $Result;
+    return $Result;
+  }
+
   function AddInteger(string $Name): ModelColumnInteger
   {
@@ -75 +80 @@
   }
 
+  function AddDate(string $Name): ModelColumnDate
+  {
+    $Result = new ModelColumnDate($Name);
+    $this->Columns[] = $Result;
+    return $Result;
+  }
+
+  function AddBoolean(string $Name): ModelColumnBoolean
+  {
+    $Result = new ModelColumnBoolean($Name);
+    $this->Columns[] = $Result;
+    return $Result;
+  }
+
   function AddReference(string $Name, string $RefTable): ModelColumnReference
   {
@@ -80 +99 @@
     $this->Columns[] = $Result;
     return $Result;
+  }
+
+  function AddEnum(string $Name, array $States): ModelColumnEnum
+  {
+    $Result = new ModelColumnEnum($Name, $States);
+    $this->Columns[] = $Result;
+    return $Result;
+  }
+
+  function AddChangeAction(): void
+  {
+    $Column = $this->AddEnum('ChangeAction', array('add', 'modify', 'remove'));
+    $Column->Nullable = true;
+    $Column = $this->AddDateTime('ChangeTime');
+    $Column->Nullable = true;
+    $this->AddInteger('ChangeReplaceId');    
   }
 }
@@ -91 +126 @@
   const DateTime = 4;
   const Reference = 5;
+  const Boolean = 6;
+  const Date = 7;
+  const Enum = 8;
 }
 
@@ -96 +134 @@
 {
   public string $Name;
-  public ModelColumnType $Type;
-  public
-
-  function __construct(string $Name, int $Type)
+  public int $Type; // ModelColumnType
+  public bool $Nullable;
+  public bool $Unique;
+  public bool $HasDefault;
+
+  function __construct(string $Name, int $Type, bool $Nullable = false, bool $Unique = false)
   {
     $this->Name = $Name;
     $this->Type = $Type;
+    $this->Nullable = $Nullable;
+    $this->Unique = $Unique;
+    $this->HasDefault = false;
   }
 
@@ -128 +171 @@
 }
 
+class ModelColumnFloat extends ModelColumn
+{
+  public ?float $Default;
+
+  function __construct(string $Name)
+  {
+    parent::__construct($Name, ModelColumnType::Float);
+    $this->HasDefault = false;
+    $this->Default = null;
+  }
+
+  function GetDefault(): ?string
+  {
+    return '"'.$this->Default.'"';
+  }
+}
+
 class ModelColumnText extends ModelColumn
 {
@@ -169 +229 @@
   {
     parent::__construct($Name, ModelColumnType::DateTime);
+    $this->HasDefault = false;
+    $this->Default = null;
+  }
+
+  function GetDefault(): ?string
+  {
+    return '"'.$this->Default.'"';
+  }
+}
+
+class ModelColumnDate extends ModelColumn
+{
+  public ?DateTime $Default;
+
+  function __construct(string $Name)
+  {
+    parent::__construct($Name, ModelColumnType::Date);
     $this->HasDefault = false;
     $this->Default = null;
@@ -189 +266 @@
   }
 }
+
+class ModelColumnBoolean extends ModelColumn
+{
+  public ?bool $Default;
+
+  function __construct(string $Name)
+  {
+    parent::__construct($Name, ModelColumnType::Boolean);
+    $this->HasDefault = false;
+    $this->Default = null;
+  }
+
+  function GetDefault(): ?string
+  {
+    return $this->Default;
+  }
+}
+
+class ModelColumnEnum extends ModelColumn
+{
+  public ?bool $Default;
+  public array $States;
+
+  function __construct(string $Name, array $States)
+  {
+    parent::__construct($Name, ModelColumnType::Enum);
+    $this->HasDefault = false;
+    $this->Default = null;
+    $this->States = $States;
+  }
+
+  function GetDefault(): ?string
+  {
+    return $this->Default;
+  }
+}

trunk/Packages/Common/Database.php

@@ -105 +105 @@
       'padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.$Duration.'</div>'."\n");
     $Result = new DatabaseResult();
-    $Result->PDOStatement = $this->PDO->query($Query);
-    if ($Result->PDOStatement)
-    {
-      $Result->num_rows = $Result->PDOStatement->rowCount();
+    $Statement = $this->PDO->query($Query);
+    if ($Statement)
+    {
+      $Result->PDOStatement = $Statement;
+      $Result->num_rows = $Statement->rowCount();
       $this->insert_id = $this->PDO->lastInsertId();
     } else

trunk/Packages/Common/Update.php

@@ -18 +18 @@
   }
 
-  function GetDbVersion(): string
+  function GetDbVersion(): ?int
   {
     $DbResult = $this->Database->select($this->VersionTable, '*', 'Id=1');