Changeset 891 for trunk/Packages/Common

Timestamp:

Dec 30, 2020, 11:52:07 PM (4 years ago)

Author:

chronos

Message:

• Added: More modules models installation.

Location:

trunk/Packages/Common

Files:

• AppModule.php (modified) (4 diffs)
• Base.php (modified) (3 diffs)
• Setup.php (modified) (2 diffs)

trunk/Packages/Common/AppModule.php

@@ -73 +73 @@
   }
 
+  static function GetModels(): array
+  {
+    return array();
+  }
+
   function Install(): void
   {
@@ -90 +95 @@
     $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));
@@ -200 +205 @@
       else if ($Column->Type == ModelColumnType::Boolean) $Query .= 'tinyint(1)';
       else if ($Column->Type == ModelColumnType::Date) $Query .= 'date';
-      else if ($Column->Type == ModelColumnType::Enum) 
+      else if ($Column->Type == ModelColumnType::Enum)
       {
         $Query .= 'enum("'.implode('", "', $Column->States).'")';
@@ -238 +243 @@
         "ADD CONSTRAINT `".$ModelDesc->Name."_ibfk_".$I."` FOREIGN KEY (`".$Column->Name."`) REFERENCES `".$Column->RefTable."` (`Id`);";
     }
-    echo($Query);
     $this->Database->query($Query);
   }

trunk/Packages/Common/Base.php

@@ -66 +66 @@
   }
 
+  function AddText(string $Name): ModelColumnText
+  {
+    $Result = new ModelColumnText($Name);
+    $this->Columns[] = $Result;
+    return $Result;
+  }
+
   function AddInteger(string $Name): ModelColumnInteger
   {
@@ -94 +101 @@
   }
 
-  function AddReference(string $Name, string $RefTable): ModelColumnReference
+  function AddReference(string $Name, string $RefTable, bool $Nullable = true): ModelColumnReference
   {
     $Result = new ModelColumnReference($Name, $RefTable);
     $this->Columns[] = $Result;
+    $Result->Nullable = $Nullable;
     return $Result;
   }
@@ -114 +122 @@
     $Column = $this->AddDateTime('ChangeTime');
     $Column->Nullable = true;
-    $this->AddInteger('ChangeReplaceId');    
+    $this->AddInteger('ChangeReplaceId');
   }
 }

trunk/Packages/Common/Setup.php

@@ -412 +412 @@
 
     $this->Database->query('CREATE TABLE IF NOT EXISTS `'.$this->UpdateManager->VersionTable.'` (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `Revision` int(11) NOT NULL,
-  PRIMARY KEY (`Id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+      `Id` int(11) NOT NULL AUTO_INCREMENT,
+      `Revision` int(11) NOT NULL,
+      PRIMARY KEY (`Id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
     $this->Database->query("INSERT INTO `".$this->UpdateManager->VersionTable."` (`Id`, `Revision`) VALUES
       (1, ".$DatabaseRevision.");");
     $this->Database->query("CREATE TABLE IF NOT EXISTS `Module` (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `Name` varchar(255) NOT NULL,
-  `Title` varchar(255) NOT NULL,
-  PRIMARY KEY (`Id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+      `Id` int(11) NOT NULL AUTO_INCREMENT,
+      `Name` varchar(255) NOT NULL,
+      `Title` varchar(255) NOT NULL,
+      PRIMARY KEY (`Id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+    $this->Database->query("CREATE TABLE IF NOT EXISTS `ModuleModel` (
+      `Id` int(11) NOT NULL AUTO_INCREMENT,
+      `Name` varchar(255) NOT NULL,
+      `Module` int(11) NOT NULL,
+      PRIMARY KEY (`Id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+    $this->Database->query('ALTER TABLE `ModuleModel`
+      ADD CONSTRAINT `ModuleModel_ibfk_1` FOREIGN KEY (`Module`) REFERENCES `Module` (`Id`);');
+    $this->Database->query("CREATE TABLE IF NOT EXISTS `ModuleModelProperty` (
+      `Id` int(11) NOT NULL AUTO_INCREMENT,
+      `Name` varchar(255) NOT NULL,
+      `Model` int(11) NOT NULL,
+      `Type` int(11) NOT NULL,
+      `Nullable` tinyint(1) NOT NULL,
+      PRIMARY KEY (`Id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+    $this->Database->query('ALTER TABLE `ModuleModelProperty`
+      ADD CONSTRAINT `ModuleModelProperty_ibfk_1` FOREIGN KEY (`Model`) REFERENCES `ModuleModel` (`Id`);');
   }
 
@@ -429 +447 @@
   {
     $this->System->ModuleManager->UninstallAll();
+    $this->Database->query('DROP TABLE `ModuleModelProperty`');
+    $this->Database->query('DROP TABLE `ModuleModel`');
     $this->Database->query('DROP TABLE `Module`');
     $this->Database->query('DROP TABLE `'.$this->UpdateManager->VersionTable.'`');