Changeset 342 for trunk/database.php

Timestamp:

Jan 17, 2012, 10:37:59 AM (13 years ago)

Author:

chronos

Message:

• Upraveno: Databáze nyní hlásí chyby dotazů přes výjimky.
• Opraveno: Inicializace modulů.

File:

• trunk/database.php (modified) (3 diffs)

trunk/database.php

@@ -44 +44 @@
       else $ConnectionString = '';
     $this->PDO = new PDO($ConnectionString, $User, $Password);
+    $this->PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
   }
   
@@ -53 +54 @@
   function query($Query)
   {
-    $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)
+    try
     {
-      $Result->num_rows = $Result->PDOStatement->rowCount();
-    } else
+      $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();
+    } catch(PDOException $E)
     {
-      $this->Error = $this->PDO->errorInfo();
-      $this->Error = $this->Error[2];
+      $this->Error = $E->getMessage();
       if(($this->Error != '') and ($this->ShowSQLError == true)) 
         echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
@@ -115 +116 @@
     foreach($Data as $Key => $Value)
     {
-            if(!in_array($Value, $this->Functions)) $Value = $this->PDO->quote($Value);
+      if(!in_array($Value, $this->Functions)) $Value = $this->PDO->quote($Value);
       $Name .= ',`'.$Key.'`';
       $Values .= ','.$Value;