From 583e566a2a6aa56aaa464a5196f3ae9a227dcc8f Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 15 Dec 2011 16:22:39 +0100
Subject: [PATCH] Enhanced database exceptions

---
 .../system/database/DatabaseException.class.php | 11 +++++++----
 .../statement/PreparedStatement.class.php       | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/database/DatabaseException.class.php b/wcfsetup/install/files/lib/system/database/DatabaseException.class.php
index 9cf8bd604e..0630af8585 100644
--- a/wcfsetup/install/files/lib/system/database/DatabaseException.class.php
+++ b/wcfsetup/install/files/lib/system/database/DatabaseException.class.php
@@ -129,11 +129,14 @@ class DatabaseException extends SystemException {
 		$this->information .= '<b>sql error:</b> ' . StringUtil::encodeHTML($this->getErrorDesc()) . '<br />';
 		$this->information .= '<b>sql error number:</b> ' . StringUtil::encodeHTML($this->getErrorNumber()) . '<br />';
 		$this->information .= '<b>sql version:</b> ' . StringUtil::encodeHTML($this->getSQLVersion()) . '<br />';
-		if ($this->preparedStatement !== null) $this->information .= '<b>sql query:</b> ' . StringUtil::encodeHTML($this->preparedStatement->getSQLQuery()) . '<br />';
-		
-		$this->information .= "\n<!-- db error: #".$this->db->getErrorNumber().': '.$this->db->getErrorDesc()." -->\n";
 		if ($this->preparedStatement !== null) {
-			$this->information .= "\n<!-- statement error: #".$this->preparedStatement->getErrorNumber().': '.$this->preparedStatement->getErrorDesc()." -->\n";
+			$this->information .= '<b>sql query:</b> ' . StringUtil::encodeHTML($this->preparedStatement->getSQLQuery()) . '<br />';
+			$parameters = $this->preparedStatement->getSQLParameters();
+			if (!empty($parameters)) {
+				foreach ($parameters as $index => $parameter) {
+					$this->information .= '<b>sql query parameter ' . $index . ':</b>' . StringUtil::encodeHTML($parameter) . '<br />';
+				}
+			}
 		}
 		
 		parent::show();
diff --git a/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php b/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php
index 5421e29385..1bc7265db7 100644
--- a/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php
+++ b/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php
@@ -24,6 +24,12 @@ class PreparedStatement {
 	 */
 	protected $database = null;
 	
+	/**
+	 * SQL query parameters
+	 * @var	array
+	 */
+	protected $parameters = array();
+	
 	/**
 	 * pdo statement object
 	 *
@@ -76,6 +82,7 @@ class PreparedStatement {
 	 * @param	array		$parameters
 	 */
 	public function execute(array $parameters = array()) {
+		$this->parameters = $parameters;
 		$this->database->incrementQueryCount();
 		$this->database->beginTransaction();
 		
@@ -101,6 +108,7 @@ class PreparedStatement {
 	 * @param	array		$parameters
 	 */
 	public function executeUnbuffered(array $parameters = array()) {
+		$this->parameters = $parameters;
 		$this->database->incrementQueryCount();
 		
 		try {
@@ -204,4 +212,13 @@ class PreparedStatement {
 	public function getSQLQuery() {
 		return $this->query;
 	}
+	
+	/**
+	 * Returns the SQL query parameters of this statement.
+	 * 
+	 * @return	array
+	 */
+	public function getSQLParameters() {
+		return $this->parameters;
+	}
 }
-- 
2.20.1