Changeset 59 for branches/mvc/Base/Database.php

Timestamp:

Mar 1, 2015, 12:43:56 PM (9 years ago)

Author:

chronos

Message:

• Moved trunk as mvc branch.

Location:

branches/mvc

Files:

• . (moved) (moved from trunk )
• Base/Database.php (modified) (7 diffs)

branches/mvc/Base/Database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2009-02-16
-
-class Database extends mysqli
+// Date: 2011-11-25
+
+class DatabaseResult
+{
+  var $PDOStatement;
+  var $num_rows = 0;
+
+  function fetch_assoc()
+  {
+    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 $ShowSQLQuery = false;
-  var $ShowSQLError = false;
+  var $Functions;
+  var $Type;
+  var $PDO;
+  var $Error = '';
+  var $insert_id;
+  var $LastQuery = '';
+  var $ShowSQLError;
+  var $ShowSQLQuery;
+
+  function __construct()
+  {
+    $this->Type = 'mysql';  // mysql, pgsql
+    $this->ShowSQLError = false;
+    $this->ShowSQLQuery = false;
+    $this->Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
+  }
+
+  function Connect($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 = '';
+    try {
+      $this->PDO = new PDO($ConnectionString, $User, $Password);
+
+    } catch (Exception $E)
+    {
+      unset($this->PDO);
+      throw new Exception($E->getMessage());
+    }
+  }
+
+  function Disconnect()
+  {
+    unset($this->PDO);
+  }
+
+  function Connected()
+  {
+    return(isset($this->PDO));
+  }
+
+  function select_db($Database)
+  {
+    $this->query('USE `'.$Database.'`');
+  }
 
   function query($Query)
   {
-    if($this->ShowSQLQuery)
-    {
-      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 = 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");
-    }
-
+    if(!$this->Connected()) throw new Exception('Not connected to database');
+    $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)
+    {
+      $Result->num_rows = $Result->PDOStatement->rowCount();
+      $this->insert_id = $this->PDO->lastInsertId();
+    } 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>');
+        throw new Exception('SQL Error: '.$this->Error.', Query: '.$Query);
+    }
     return($Result);
   }
@@ -45 +115 @@
     {
       $Name .= ',`'.$Key.'`';
-      if(!in_array($Value, $this->Functions)) $Value = '"'.$this->real_escape_string($Value).'"';
+      if(!in_array($Value, $this->Functions))
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
       $Values .= ','.$Value;
     }
@@ -51 +125 @@
     $Values = substr($Values, 1);
     $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    $this->insert_id = $this->PDO->lastInsertId();
   }
 
@@ -58 +133 @@
     foreach($Data as $Key => $Value)
     {
-      if(!in_array($Value, $this->Functions)) $Value = '"'.$this->real_escape_string($Value).'"';
+      if(!in_array($Value, $this->Functions))
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
       $Values .= ', `'.$Key.'`='.$Value;
     }
@@ -71 +150 @@
     foreach($Data as $Key => $Value)
     {
-      if(!in_array($Value, $this->Functions)) $Value = '"'.$this->real_escape_string($Value).'"';
+      if(!in_array($Value, $this->Functions))
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
       $Name .= ',`'.$Key.'`';
       $Values .= ','.$Value;
@@ -79 +162 @@
     //echo('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES ('.$Values.')<br />');
     $this->query('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
-    //echo($this->error().'<br/>');
+    //echo($this->error().'<br>');
   }
 
@@ -87 +170 @@
   }
 
-  function TimeToMysqlDateTime($Time)
-  {
-    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 MysqlDateToTime($Time)
-  {
-    return(MysqlDateTimeToTime($Time.' 0:0:0'));
-  }
-}
+  function real_escape_string($Text)
+  {
+    return(addslashes($Text));
+  }
+
+  public function __sleep()
+  {
+    return array('LastQuery');
+  }
+
+  public function __wakeup()
+  {
+  }
+
+  function MysqlDateTimeToTime($DateTime)
+  {
+        return(MysqlDateTimeToTime($DateTime));
+  }
+
+  function TimeToMysqlDateTime($DateTime)
+  {
+    return(TimeToMysqlDateTime($DateTime));
+  }
+}
+
+function TimeToMysqlDateTime($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('Y-m-d H:i:s', $Time));
+}
+
+function TimeToMysqlDate($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('Y-m-d', $Time));
+}
+
+function TimeToMysqlTime($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('H:i:s', $Time));
+}
+
+function MysqlDateTimeToTime($DateTime)
+{
+  if($DateTime == '') return(NULL);
+  $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(NULL);
+  return(MysqlDateTimeToTime($Date.' 0:0:0'));
+}
+
+function MysqlTimeToTime($Time)
+{
+  if($Time == '') return(NULL);
+  return(MysqlDateTimeToTime('0000-00-00 '.$Time));
+}