Changeset 401

Timestamp:

Mar 30, 2012, 2:02:51 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Instalace a odinstalace je nyní spravována samostatným skriptem install.php.
• Upraveno: Částečné řešení odstranění cizích klíčů v průběhu odinstalace před odstraněním samotných tabulek.

Location:

branches/Modular

Files:

• Common/Database.php (modified) (2 diffs)
• Common/Global.php (modified) (1 diff)
• Common/Model.php (modified) (2 diffs)
• Common/Module.php (modified) (5 diffs)
• Install.php (modified) (1 diff)
• index.php (modified) (1 diff)

branches/Modular/Common/Database.php

@@ -37 +37 @@
   var $ShowSQLError = false;
   var $ShowSQLQuery = false;
+  var $Database = '';
   
   function __construct($Host, $User, $Password, $Database)
   {    
+    $this->Database = $Database;
     if($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
       else if($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
@@ -49 +51 @@
   function select_db($Database)
   {
+    $this->Database = $Database;
     $this->query('USE '.$Database);
   }

branches/Modular/Common/Global.php

@@ -73 +73 @@
   $System->RootFolder = $Config['Web']['RootFolder'];
   $System->Config = &$Config;
-  $System->Install();
-  $System->Init();  
 }
 

branches/Modular/Common/Model.php

@@ -236 +236 @@
             $this->Module->Models[$Property['TargetModel']]->Install();
         }
-        $this->Database->query('ALTER TABLE `'.$this->Name.'` ADD FOREIGN KEY (`'.$Property['Name'].'`) REFERENCES `'.$Property['TargetModel'].'` (`Id`);');
+        $this->Database->query('ALTER TABLE `'.$this->Name.'` ADD CONSTRAINT `'.
+          $this->Name.'_ibfk_'.$Property['Name'].'` FOREIGN KEY (`'.$Property['Name'].'`) REFERENCES `'.$Property['TargetModel'].'` (`Id`);');
       }
-    }
-  }
+    }  }
     
   function UnInstall()
@@ -247 +247 @@
       if($Property['Type'] == PropertyManyToMany)
         ; // Delete many-to-many table
+      else 
+      {if($Property['Type'] == PropertyOneToMany) 
+        $this->Database->query('ALTER TABLE `'.$this->Name.'` DROP FOREIGN KEY `'.
+          $this->Name.'_ibfk_'.$Property['Name'].'`');
+      echo('ss');
+      }
     }
-    $this->Database->query('DROP TABLE IF EXISTS `'.$this->Name.'`');
+    //$this->Database->query('DROP TABLE IF EXISTS `'.$this->Name.'`');
     $this->Installed = false;
   }

branches/Modular/Common/Module.php

@@ -120 +120 @@
   {
     //DebugLog('Installing modular system core...');
+    $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemVersion` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Version` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  `Description` datetime NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
     $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemModule` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
@@ -140 +146 @@
   UNIQUE (`Module` , `DependencyModule`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
-    $this->Database->query('ALTER TABLE `SystemModuleDependency` ADD FOREIGN KEY ( `Module` ) REFERENCES `SystemModule` (`Id`)');
-    $this->Database->query('ALTER TABLE `SystemModuleDependency` ADD FOREIGN KEY ( `DependencyModule` ) REFERENCES `SystemModule` (`Id`)');
+    $this->Database->query('ALTER TABLE `SystemModuleDependency` ADD CONSTRAINT `SystemModuleDependency_ibfk_1` FOREIGN KEY ( `Module` ) REFERENCES `SystemModule` (`Id`)');
+    $this->Database->query('ALTER TABLE `SystemModuleDependency` ADD CONSTRAINT `SystemModuleDependency_ibfk_2` FOREIGN KEY ( `DependencyModule` ) REFERENCES `SystemModule` (`Id`)');
     
     $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemModel` (
@@ -150 +156 @@
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
-    $this->Database->query('ALTER TABLE `SystemModel` ADD FOREIGN KEY ( `Module` ) REFERENCES `SystemModule` (`Id`)');
+    $this->Database->query('ALTER TABLE `SystemModel` ADD CONSTRAINT `SystemModel_ibfk_1` FOREIGN KEY ( `Module` ) REFERENCES `SystemModule` (`Id`)');
     
     $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemModelProperty` (
@@ -160 +166 @@
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
-    $this->Database->query('ALTER TABLE `SystemModelProperty` ADD FOREIGN KEY ( `Model` ) REFERENCES `SystemModel` (`Id`)');
+    $this->Database->query('ALTER TABLE `SystemModelProperty` ADD CONSTRAINT `SystemModelProperty_ibfk_1` FOREIGN KEY ( `Model` ) REFERENCES `SystemModel` (`Id`)');
     
     $this->ReloadList();
@@ -178 +184 @@
     
     // Delete tables with reverse order
+    $this->Database->query('ALTER TABLE `SystemModelProperty` DROP FOREIGN KEY `SystemModelProperty_ibfk_1`');
     $this->Database->query('DROP TABLE IF EXISTS `SystemModelProperty`');
+    $this->Database->query('ALTER TABLE `SystemModel` DROP FOREIGN KEY `SystemModel_ibfk_1`');
     $this->Database->query('DROP TABLE IF EXISTS `SystemModel`');
+    $this->Database->query('ALTER TABLE `SystemModuleDependency` DROP FOREIGN KEY `SystemModuleDependency_ibfk_1`');
+    $this->Database->query('ALTER TABLE `SystemModuleDependency` DROP FOREIGN KEY `SystemModuleDependency_ibfk_2`');
     $this->Database->query('DROP TABLE IF EXISTS `SystemModuleDependency`');
     $this->Database->query('DROP TABLE IF EXISTS `SystemModule`');
+    $this->Database->query('DROP TABLE IF EXISTS `SystemVersion`');
+  }
+  
+  function IsInstalled()
+  {
+    $DbResult = $this->Database->query('SELECT table_name FROM information_schema.tables
+WHERE table_schema = "'.$this->Database->Database.'" AND table_name = "SystemVersion";');    
+    if($DbResult->num_rows > 0) return(true); 
+      else return(false);
   }
   

branches/Modular/Install.php

@@ -2 +2 @@
 
 include_once('Common/Global.php');
+GlobalInit();
 
+function ShowDefault()
+{
+  global $System;
+  
+  if($System->IsInstalled())
+  {
+    echo('System je již nainstalován.<br/>');
+    echo('<a href="?a=uninstall">Odinstalovat systém</a>');
+  } else 
+  {
+    echo('System ještě není instalován.<br/>');
+    echo('<a href="?a=install">Instalovat systém</a>');
+  }
+}
+
+if(array_key_exists('a', $_GET))
+{
+  if($_GET['a'] == 'install') 
+  {      
+    $System->Install();
+    $System->Init();  
+    ShowDefault();
+  }
+  else if($_GET['a'] == 'uninstall') 
+  {
+    $System->Init();  
+    $System->Uninstall();
+    ShowDefault();
+  }
+  else ShowDefault();
+} else ShowDefault();
 
 ?>

branches/Modular/index.php

@@ -3 +3 @@
 include_once('Common/Global.php');
 GlobalInit();
+if(!$System->IsInstalled()) die('System not installed.');
+$System->Init();  
 $System->PathItems = ProcessURL();
 //print_r($_GET);