Changeset 319

Timestamp:

Nov 27, 2011, 2:26:59 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Knihovna pro práci s databází přepsána z využití třídy mysql na obecnější PDO.
• Přidáno: Soubory projektu prostředí NetBeans.

Location:

trunk

Files:

• database.php (modified) (8 diffs)
• nbproject (added)
• nbproject/.htaccess (added)
• nbproject/private (added)
• nbproject/project.properties (added)
• nbproject/project.xml (added)

trunk/database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2009-02-16
+// Date: 2011-11-25
 
 
-class Database extends mysqli
+class DatabaseResult
+{
+  var $PDOStatement;
+  var $num_rows = 0;
+  
+  function fetch_assoc()
+  {
+    return($this->PDOStatement->fetch());
+  }
+  
+  function fetch_array()
+  {
+    return($this->PDOStatement->fetch());
+  }
+
+  function fetch_row()
+  {
+    return($this->PDOStatement->fetch());
+  }
+}
+
+class Database
 {
   var $Prefix = '';
   var $Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
+  var $Type = 'mysql';  // mysql, pgsql
+  var $PDO;
+  var $Error = '';
+  
+  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)
   {
-          global $Config;
+    global $Config;
         
-          if($Config['Web']['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 = parent::query($Query);
-    if(($this->error != '') and ($Config['Web']['ShowSQLError'] == true)) 
-          echo('<div><strong>SQL Error: </strong>'.$this->error.'<br />'.$Query.'</div>');
+    if($Config['Web']['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);
+    $Result->num_rows = $Result->PDOStatement->rowCount();
+    if(($this->Error != '') and ($Config['Web']['ShowSQLError'] == true)) 
+      echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
 
     return($Result);  
@@ -24 +63 @@
 
   function select($Table, $What = '*', $Condition = 1)
-  {
+  {   
     return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));  
   }
@@ -30 +69 @@
   function delete($Table, $Condition)
   {
-    $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);  
+    $this->PDO->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);  
   }
   
@@ -40 +79 @@
     {
       $Name .= ',`'.$Key.'`';
-            if(!in_array($Value, $this->Functions)) $Value = '"'.$this->real_escape_string($Value).'"';
+      if(!in_array($Value, $this->Functions)) $Value = $this->PDO->quote($Value);
       $Values .= ','.$Value;
     }
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')'); 
+    $this->PDO->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')'); 
   }
   
@@ -53 +92 @@
     foreach($Data as $Key => $Value)
     {
-            if(!in_array($Value, $this->Functions)) $Value = '"'.$this->real_escape_string($Value).'"';
+            if(!in_array($Value, $this->Functions)) $Value = $this->PDO->quote($Value);
       $Values .= ', `'.$Key.'`='.$Value;
     }
     $Values = substr($Values, 2);  
-    $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
+    $this->PDO->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
   }
   
@@ -66 +105 @@
     foreach($Data as $Key => $Value)
     {
-            if(!in_array($Value, $this->Functions)) $Value = '"'.$this->real_escape_string($Value).'"';
+            if(!in_array($Value, $this->Functions)) $Value = $this->PDO->quote($Value);
       $Name .= ',`'.$Key.'`';
       $Values .= ','.$Value;
@@ -73 +112 @@
     $Values = substr($Values, 1);
     //echo('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES ('.$Values.')<br />');
-    $this->query('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    $this->PDO->query('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
     //echo($this->error().'<br>');
   }
@@ -79 +118 @@
   function charset($Charset)
   {
-    $this->query('SET NAMES "'.$Charset.'"');
+    $this->PDO->query('SET NAMES "'.$Charset.'"');
   }
+  
 }