Index: branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php
===================================================================
diff -u -r6013 -r6019
--- branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 6013)
+++ branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 6019)
@@ -244,7 +244,14 @@
 							$div_width['left'] = round((($total - $total_before - $runtime) / $total) * $total_width);
 
 							$ret = '<b>Name</b>: '.$Data['description'].'<br />';
+							
+							if (isset($Data['file'])) {
+								$ret .= '[<b>Runtime</b>: '.$runtime.'s] [<b>File</b>: '.$Data['file'].']<br />';
+							}
+							else {
 							$ret .= '<b>Runtime</b>: '.$runtime.'s<br />';
+							}
+							
 							$ret .= '<div class="dbg_profiler" style="width: '.$div_width['before'].'px; border-right: 0px; background-color: #298DDF;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';
 							$ret .= '<div class="dbg_profiler" style="width: '.$div_width['current'].'px; border-left: 0px; border-right: 0px; background-color: #EF4A4A;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';
 							$ret .= '<div class="dbg_profiler" style="width: '.$div_width['left'].'px; border-left: 0px; background-color: #DFDFDF;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';
@@ -639,7 +646,23 @@
 					$this->ProfilerData[$key]['description'] = $description;
 				}
 
-				$this->Data[] = array('profile_key' => $key, 'debug_type' => 'profiler');
+				if (substr($key, 0, 4) == 'sql_') {
+					// append place from what was called
+					$trace_results = debug_backtrace();
+					$trace_count = count($trace_results);
+					$i = 0;
+					while ($i < $trace_count) {
+						$trace_file = basename($trace_results[$i]['file']);
+						if ($trace_file != 'db_connection.php' && $trace_file != 'adodb.inc.php') {
+							break;
+						}
+						$i++;
+					}
+					$this->ProfilerData[$key]['file'] = $trace_file.':'.$trace_results[$i]['line'];
+					unset($trace_results);
+				}
+				
+				$this->Data[] = Array('profile_key' => $key, 'debug_type' => 'profiler');
 			}
 
 			function profileFinish($key, $description = null, $timeStamp = null)