Changeset 507 for trunk/includes/Database.php

Timestamp:

Feb 15, 2013, 10:12:08 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Použita novější databázová třída Database, která běží přes PDO.
• Přidáno: Pokud databáze nesouhlasí k verzi systému, je zobrazeno chybové hlášení.
• Přidáno: Instalační skript admin/install.php, přes který je možno nainstalovat čistou databázi a provádět automatickou aktualizaci databáze.
• Upraveno: Konkrétní rozdílové SQL aktualizace jsou nyní zapsány přímo v kódu v souboru UpdateTrace namísto textových SQL skriptů. To umožňuje provádět také dynamickou aktualizaci dle obsahu dat v tabulkách. Zde pro získání seznamu překladových tabulek.
• Opraveno: Některé části kódu nepodporovaly nulový počet překladových skupin nebo jazyků.

File:

• trunk/includes/Database.php (modified) (6 diffs)

trunk/includes/Database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2010-01-29
+// Date: 2011-11-25
 
-class Database extends mysqli
+
+class DatabaseResult
 {
-  var $HostName = 'localhost';
-  var $UserName;
-  var $Password;
-  var $Schema;
-  var $Charset = 'utf8';
-  var $Prefix = '';
-  var $ShowSQLQuery = false;
-  var $ShowSQLError = false;
-
-  function open()
+  var $PDOStatement;
+  var $num_rows = 0;
+  
+  function fetch_assoc()
   {
-    parent::connect($this->HostName, $this->UserName, $this->Password, $this->Schema);
-    $this->charset($this->Charset);
+    return($this->PDOStatement->fetch(PDO::FETCH_ASSOC));
+  }
+  
+  function fetch_array()
+  {
+    return($this->PDOStatement->fetch(PDO::FETCH_BOTH));
   }
 
+  function fetch_row()
+  {
+    return($this->PDOStatement->fetch(PDO::FETCH_NUM));
+  }
+}
+
+class Database
+{
+  var $Prefix = '';
+  var $Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
+  var $Type = 'mysql';  // mysql, pgsql
+  var $PDO;
+  var $Error = '';
+  var $insert_id;
+  var $LastQuery = '';
+  var $ShowSQLError = false;
+  var $ShowSQLQuery = false;
+  
+  function __construct($Host, $User, $Password, $Database)
+  {    
+    if($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
+      else if($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
+      else $ConnectionString = '';
+    $this->PDO = new PDO($ConnectionString, $User, $Password);
+  }
+  
+  function select_db($Database)
+  {
+    $this->query('USE `'.$Database.'`');
+  }
+  
   function query($Query)
   {
-  
-    if($this->ShowSQLQuery)
+    $this->LastQuery = $Query;
+    if($this->ShowSQLQuery == true) 
+      echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>'."\n");
+    $Result = new DatabaseResult();
+    $Result->PDOStatement = $this->PDO->query($Query);
+    if($Result->PDOStatement)
     {
-      if(isset($_SERVER['REMOTE_ADDR'])) echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>'); 
-      else echo($Query."\n");
+      $Result->num_rows = $Result->PDOStatement->rowCount();
+    } else
+    {
+      $this->Error = $this->PDO->errorInfo();
+      $this->Error = $this->Error[2];
+      if(($this->Error != '') and ($this->ShowSQLError == true)) 
+        echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
     }
-    $Result = parent::query($Query);
-    if(($this->error != '') and ($this->ShowSQLError))
-    {
-      if(isset($_SERVER['REMOTE_ADDR'])) echo('<div><strong>SQL Error: </strong>'.$this->error.'<br />'.$Query.'</div>');
-      echo('SQL Error: '.$this->error.' '.$Query."\n");
-    }
-
+    $this->insert_id = $this->PDO->lastInsertId();
     return($Result);  
   }
 
   function select($Table, $What = '*', $Condition = 1)
-  {
+  {   
     return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));  
   }
@@ -56 +89 @@
     {
       $Name .= ',`'.$Key.'`';
+      if(!in_array($Value, $this->Functions)) 
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
       $Values .= ','.$Value;
     }
@@ -61 +99 @@
     $Values = substr($Values, 1);
     $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')'); 
+    $this->insert_id = $this->PDO->lastInsertId();
   }
   
@@ -68 +107 @@
     foreach($Data as $Key => $Value)
     {
+      if(!in_array($Value, $this->Functions)) 
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
       $Values .= ', `'.$Key.'`='.$Value;
     }
@@ -80 +124 @@
     foreach($Data as $Key => $Value)
     {
+      if(!in_array($Value, $this->Functions)) 
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
       $Name .= ',`'.$Key.'`';
       $Values .= ','.$Value;
@@ -94 +143 @@
     $this->query('SET NAMES "'.$Charset.'"');
   }
+  
+  function real_escape_string($Text)
+  {
+    return(addslashes($Text));
+  }
+  
+}
 
-  function TimeToMysqlDateTime($Time)
-  {
-    return(date('Y-m-d H:i:s', $Time));
-  }
+function TimeToMysqlDateTime($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('Y-m-d H:i:s', $Time));  
+}
 
-  function MysqlDateTimeToTime($Time)
-  {
-    $Parts = explode(' ', $Time);
-    $DateParts = explode('-', $Parts[0]);
-    $TimeParts = explode(':', $Parts[1]);
-    $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]);
-    return($Result);
-  }
+function TimeToMysqlDate($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('Y-m-d', $Time));  
+}
 
-  function MysqlDateToTime($Time)
-  {
-    return($this->MysqlDateTimeToTime($Time.' 0:0:0'));
-  }
+function TimeToMysqlTime($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('H:i:s', $Time));  
+}
+
+function MysqlDateTimeToTime($DateTime)
+{
+  if($DateTime == '') return(0);      
+  $Parts = explode(' ', $DateTime);
+  $DateParts = explode('-', $Parts[0]); 
+  $TimeParts = explode(':', $Parts[1]);
+  $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]); 
+  return($Result);  
+}
+
+function MysqlDateToTime($Date)
+{
+  if($Date == '') return(0);
+  return(MysqlDateTimeToTime($Date.' 0:0:0'));  
+}
+
+function MysqlTimeToTime($Time)
+{
+  if($Time == '') return(0);
+  return(MysqlDateTimeToTime('0000-00-00 '.$Time));  
 }