From ee639deedbc3330ea419ee20a6bcd6a04e576bd2 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 4 Sep 2015 15:50:09 +1200
Subject: [PATCH] API showqueries=1 now shows parameters

---
 model/connect/Database.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/model/connect/Database.php b/model/connect/Database.php
index cd63cb517..9b95163d9 100644
--- a/model/connect/Database.php
+++ b/model/connect/Database.php
@@ -132,7 +132,8 @@ abstract class SS_Database {
 			$sql,
 			function($sql) use($connector, $parameters, $errorLevel) {
 				return $connector->preparedQuery($sql, $parameters, $errorLevel);
-			}
+			},
+			$parameters
 		);
 	}
 
@@ -165,14 +166,20 @@ abstract class SS_Database {
 	 *
 	 * @param string $sql Query to run, and single parameter to callback
 	 * @param callable $callback Callback to execute code
+	 * @param array $parameters Parameters to display
 	 * @return mixed Result of query
 	 */
-	protected function benchmarkQuery($sql, $callback) {
+	protected function benchmarkQuery($sql, $callback, $parameters = null) {
 		if (isset($_REQUEST['showqueries']) && Director::isDev()) {
 			$starttime = microtime(true);
 			$result = $callback($sql);
 			$endtime = round(microtime(true) - $starttime, 4);
-			Debug::message("\n$sql\n{$endtime}s\n", false);
+			$message = $sql;
+			if($parameters) {
+				$message .= "\nparams: \"" . implode('", "', $parameters) . '"';
+			}
+			Debug::message("\n{$message}\n{$endtime}s\n", false);
+			
 			return $result;
 		} else {
 			return $callback($sql);