Changeset 889 for trunk

Timestamp:

Dec 22, 2020, 11:34:19 PM (4 years ago)

Author:

chronos

Message:

• Added: Install and uninstall modules models persistence using abstract classes.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/API/API.php (modified) (1 diff)
• Packages/Common/AppModule.php (modified) (1 diff)
• Packages/Common/Base.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 886; // Subversion revision
+$Revision = 887; // Subversion revision
 $DatabaseRevision = 885; // SQL structure revision
-$ReleaseTime = strtotime('2020-11-05');
+$ReleaseTime = strtotime('2020-12-22');

trunk/Modules/API/API.php

@@ -31 +31 @@
   {
     $this->System->RegisterPage(['api'], 'PageAPI');
+  }
+
+  function DoInstall(): void
+  {
+    $this->InstallModel(APIToken::GetDesc());
+  }
+
+  function DoUninstall(): void
+  {
+    $this->UninstallModel(APIToken::GetDesc());
+  }
+}
+
+class ApiToken extends Model
+{
+  static function GetDesc(): ModelDesc
+  {
+    $Desc = new ModelDesc('APIToken');
+    $Desc->AddReference('User', 'User');
+    $Desc->AddString('Token');
+    return $Desc;
   }
 }

trunk/Packages/Common/AppModule.php

@@ -184 +184 @@
     $this->Models[get_class($Model)] = $Model;
   }
+
+  function InstallModel(ModelDesc $ModelDesc)
+  {
+    $Query = 'CREATE TABLE IF NOT EXISTS `'.$ModelDesc->Name.'` ('."\n";
+    $Query = '  `'.$ModelDesc->PrimaryKey.'` int(11) NOT NULL AUTO_INCREMENT,'."\n";
+    foreach ($ModelDesc->Columns as $Column)
+    {
+      $Query .= "  `".$Column->Name."` ";
+      if ($Column->Type == ModelColumnType::Integer) $Query .= 'int(11)';
+      else if ($Column->Type == ModelColumnType::String) $Query .= 'varchar(255)';
+      else if ($Column->Type == ModelColumnType::Float) $Query .= 'varchar(255)';
+      else if ($Column->Type == ModelColumnType::Text) $Query .= 'text';
+      else if ($Column->Type == ModelColumnType::DateTime) $Query .= 'datetime';
+      else if ($Column->Type == ModelColumnType::Reference) $Query .= 'int(11)';
+
+      if ($Column->Nullable) $Query .= '';
+        else $Query .= ' NOT NULL';
+
+      $Query .= ' COLLATE utf8_general_ci';
+
+      if ($Column->HasDefault)
+      {
+        if ($Column->Default == null)
+          $Query .= ' DEFAULT NULL';
+        $Query .= ' DEFAULT '.$Column->GetDefault();
+      }
+      $Query .= ",\n";
+    }
+    $Query .= '  PRIMARY KEY (`'.$ModelDesc->PrimaryKey.'`),';
+    foreach ($ModelDesc->Columns as $Column)
+    {
+      if ($Column->Type == ModelColumnType::Reference)
+        $Query .= '  KEY `'.$Column->Name.'` (`'.$Column->Name.'`)'."\n";
+      else if ($Column->Unique)
+        $Query .= '  UNIQUE KEY `'.$Column->Name.'` (`'.$Column->Name.'`)'."\n";
+    }
+
+    $Query .= ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
+    $I = 1;
+    foreach ($ModelDesc->Columns as $Column)
+    {
+      if ($Column->Type == ModelColumnType::Reference)
+        $Query .= "ALTER TABLE `".$ModelDesc->Name."` ".
+        "ADD CONSTRAINT `".$ModelDesc->Name."_ibfk_".$I."` FOREIGN KEY (`".$Column->Name."`) REFERENCES `".$Column->RefTable."` (`Id`);";
+    }
+    $this->Database->query($Query);
+  }
+
+  function UninstallModel(ModelDesc $ModelDesc)
+  {
+    $this->Database->query('DROP TABLE `'.$ModelDesc->Name.'`');
+  }
 }
 

trunk/Packages/Common/Base.php

@@ -25 +25 @@
 class Model extends Base
 {
-
 }
 
 class View extends Base
 {
-
 }
 
 class Controller extends Base
 {
+}
 
+class ModelDesc
+{
+  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)
+  {
+    $this->Name = $Name;
+    $this->Columns = array();
+    $this->Nullable = $Nullable;
+    $this->PrimaryKey = 'Id';
+    $this->Unique = $Unique;
+  }
+
+  function AddString(string $Name): ModelColumnString
+  {
+    $Result = new ModelColumnString($Name);
+    $this->Columns[] = $Result;
+    return $Result;
+  }
+
+  function AddInteger(string $Name): ModelColumnInteger
+  {
+    $Result = new ModelColumnInteger($Name);
+    $this->Columns[] = $Result;
+    return $Result;
+  }
+
+  function AddDateTime(string $Name): ModelColumnDateTime
+  {
+    $Result = new ModelColumnDateTime($Name);
+    $this->Columns[] = $Result;
+    return $Result;
+  }
+
+  function AddReference(string $Name, string $RefTable): ModelColumnReference
+  {
+    $Result = new ModelColumnReference($Name, $RefTable);
+    $this->Columns[] = $Result;
+    return $Result;
+  }
 }
+
+class ModelColumnType
+{
+  const Integer = 0;
+  const String = 1;
+  const Float = 2;
+  const Text = 3;
+  const DateTime = 4;
+  const Reference = 5;
+}
+
+class ModelColumn
+{
+  public string $Name;
+  public ModelColumnType $Type;
+  public
+
+  function __construct(string $Name, int $Type)
+  {
+    $this->Name = $Name;
+    $this->Type = $Type;
+  }
+
+  function GetDefault(): ?string
+  {
+    return null;
+  }
+}
+
+class ModelColumnString extends ModelColumn
+{
+  public ?string $Default;
+
+  function __construct(string $Name)
+  {
+    parent::__construct($Name, ModelColumnType::String);
+    $this->HasDefault = false;
+    $this->Default = null;
+  }
+
+  function GetDefault(): ?string
+  {
+    return '"'.$this->Default.'"';
+  }
+}
+
+class ModelColumnText extends ModelColumn
+{
+  public ?string $Default;
+
+  function __construct(string $Name)
+  {
+    parent::__construct($Name, ModelColumnType::Text);
+    $this->HasDefault = false;
+    $this->Default = null;
+  }
+
+  function GetDefault(): ?string
+  {
+    return '"'.$this->Default.'"';
+  }
+}
+
+class ModelColumnInteger extends ModelColumn
+{
+  public ?int $Default;
+
+  function __construct(string $Name)
+  {
+    parent::__construct($Name, ModelColumnType::Integer);
+    $this->HasDefault = false;
+    $this->Default = null;
+  }
+
+  function GetDefault(): ?string
+  {
+    return $this->Default;
+  }
+}
+
+class ModelColumnDateTime extends ModelColumn
+{
+  public ?DateTime $Default;
+
+  function __construct(string $Name)
+  {
+    parent::__construct($Name, ModelColumnType::DateTime);
+    $this->HasDefault = false;
+    $this->Default = null;
+  }
+
+  function GetDefault(): ?string
+  {
+    return '"'.$this->Default.'"';
+  }
+}
+
+class ModelColumnReference extends ModelColumn
+{
+  public string $RefTable;
+
+  function __construct(string $Name, string $RefTable)
+  {
+    parent::__construct($Name, ModelColumnType::Reference);
+    $this->RefTable = $RefTable;
+  }
+}