Changeset 56 for trunk/Packages/Common/Database.php

Timestamp:

Apr 7, 2020, 9:13:33 PM (5 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.

File:

• trunk/Packages/Common/Database.php (modified) (8 diffs)

trunk/Packages/Common/Database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2016-01-11
+// Date: 2020-04-07
+
+function microtime_float()
+{
+  list($usec, $sec) = explode(" ", microtime());
+  return (float)$usec + (float)$sec;
+}
 
 class DatabaseResult
@@ -51 +57 @@
     $this->LogFile = dirname(__FILE__).'/../../Query.log';
   }
+ 
 
   function Connect($Host, $User, $Password, $Database)
@@ -85 +92 @@
   {
     if (!$this->Connected()) throw new Exception(T('Not connected to database'));
-    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime();
-    $this->LastQuery = $Query;
+    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
+    $this->LastQuery = $Query;    
     if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
-      $Duration = ' ; '.round(microtime() - $QueryStartTime, 4). ' s';
+      $Duration = ' ; '.round(microtime_float() - $QueryStartTime, 4). ' s';
     if ($this->LogSQLQuery == true)
       file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
@@ -101 +108 @@
       $this->insert_id = $this->PDO->lastInsertId();
     } else
-    {
+    {     
       $this->Error = $this->PDO->errorInfo();
       $this->Error = $this->Error[2];
@@ -123 +130 @@
   function insert($Table, $Data)
   {
+    $this->query($this->GetInsert($Table, $Data));
+    $this->insert_id = $this->PDO->lastInsertId();
+  }
+  
+  function GetInsert($Table, $Data)
+  {
     $Name = '';
     $Values = '';
@@ -137 +150 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
-    $this->insert_id = $this->PDO->lastInsertId();
+    return 'INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')';
   }
 
   function update($Table, $Condition, $Data)
+  {
+    $this->query($this->GetUpdate($Table, $Condition, $Data));
+  }
+  
+  function GetUpdate($Table, $Condition, $Data)
   {
     $Values = '';
@@ -154 +171 @@
     }
     $Values = substr($Values, 2);
-    $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
+    return 'UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')';
   }
 
@@ -200 +217 @@
   public function __wakeup()
   {
+  }
+  
+  public function Transaction($Queries)
+  {
+      $this->PDO->beginTransaction();
+      foreach ($Queries as $Query)
+      {
+        $Statement = $this->PDO->prepare($Query);
+        $Statement->execute();
+      }          
+      $this->PDO->commit();
   }
 }