Changeset 70 for trunk

Timestamp:

Jun 30, 2016, 9:24:21 PM (8 years ago)

Author:

chronos

Message:

• Added: Missing Measure Page file.
• Added: Measure module table SQL create and remove.

Location:

trunk

Files:

• Modules/Measure/Measure.php (modified) (1 diff)
• Modules/Measure/Page.php (added)
• Packages/Common/Setup.php (modified) (2 diffs)

trunk/Modules/Measure/Measure.php

@@ -19 +19 @@
   {
     $this->System->RegisterPage('', 'PageMain');
+  }
+  
+  function DoInstall()
+  {
+   $this->Database->query('CREATE TABLE IF NOT EXISTS `Measure` (
+  `Id` int(11) NOT NULL auto_increment,
+  `Name` varchar(255) collate utf8_general_ci NOT NULL,
+  `Description` varchar(255) collate utf8_general_ci NOT NULL,
+  `Divider` int(11) NOT NULL default 1,
+  `Unit` varchar(16) collate utf8_general_ci NOT NULL,
+  `Continuity` tinyint(1) NOT NULL default 0,
+  `Period` int(11) NOT NULL default 60,
+  `OldName` varchar(32) collate utf8_general_ci NOT NULL,
+  `PermissionView` varchar(255) collate utf8_general_ci NOT NULL default "all",
+  `PermissionAdd` varchar(255) collate utf8_general_ci NOT NULL default "localhost.localdomain",
+  `Info` varchar(255) collate utf8_general_ci NOT NULL,
+  `Enabled` int(11) NOT NULL default 1,
+  `Cumulative` int(11) NOT NULL default 0,
+  `DataTable` varchar(32) collate utf8_general_ci NOT NULL default "data",
+  `DataType` varchar(32) collate utf8_general_ci NOT NULL,
+  PRIMARY KEY  (`Id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;');
+   }
+  
+  function DoUninstall()
+  {
+    $this->Database->query('DROP TABLE IF EXISTS `Measure`');
+  }
+  
+  function DoUpgrade()
+  {
+   
   }
 }

trunk/Packages/Common/Setup.php

@@ -415 +415 @@
   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('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,
@@ -428 +428 @@
   {
     $this->System->ModuleManager->UninstallAll();
-    $this->Database->query('DROP TABLE `Module`');
-    $this->Database->query('DROP TABLE `'.$this->UpdateManager->VersionTable.'`');
+    $this->Database->query('DROP TABLE IF EXISTS `Module`');
+    $this->Database->query('DROP TABLE IF EXISTS `'.$this->UpdateManager->VersionTable.'`');
   }