From 24ebc9fc3d7b29031a9523344bbe026e6ab8e274 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 5 Dec 2013 15:39:34 +0100
Subject: [PATCH] better error reporting for db exceptions

---
 extensions/elasticsearch/Exception.php         | 18 ------------------
 framework/yii/views/errorHandler/exception.php |  3 +++
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/extensions/elasticsearch/Exception.php b/extensions/elasticsearch/Exception.php
index aa58338..ade7cd1 100644
--- a/extensions/elasticsearch/Exception.php
+++ b/extensions/elasticsearch/Exception.php
@@ -16,24 +16,6 @@ namespace yii\elasticsearch;
 class Exception extends \yii\db\Exception
 {
 	/**
-	 * @var array additional information about the http request that caused the error.
-	 */
-	public $errorInfo = [];
-
-	/**
-	 * Constructor.
-	 * @param string $message error message
-	 * @param array $errorInfo error info
-	 * @param integer $code error code
-	 * @param \Exception $previous The previous exception used for the exception chaining.
-	 */
-	public function __construct($message, $errorInfo = [], $code = 0, \Exception $previous = null)
-	{
-		$this->errorInfo = $errorInfo;
-		parent::__construct($message, $code, $previous);
-	}
-
-	/**
 	 * @return string the user-friendly name of this exception
 	 */
 	public function getName()
diff --git a/framework/yii/views/errorHandler/exception.php b/framework/yii/views/errorHandler/exception.php
index 426447a..b0d86f0 100644
--- a/framework/yii/views/errorHandler/exception.php
+++ b/framework/yii/views/errorHandler/exception.php
@@ -360,6 +360,9 @@ pre .diff .change{
 			?></h1>
 		<?php endif; ?>
 		<h2><?= nl2br($handler->htmlEncode($exception->getMessage())) ?></h2>
+		<?php if ($exception instanceof \yii\db\Exception): ?>
+			<pre><?= var_export($exception->errorInfo, true) ?></pre>
+		<?php endif; ?>
 		<?= $handler->renderPreviousExceptions($exception) ?>
 	</div>