Index: trunk/core/kernel/db/db_connection.php =================================================================== diff -u -N -r932 -r944 --- trunk/core/kernel/db/db_connection.php (.../db_connection.php) (revision 932) +++ trunk/core/kernel/db/db_connection.php (.../db_connection.php) (revision 944) @@ -83,6 +83,10 @@ { $this->errorHandler = Array(&$this,'handleError'); } + else + { + $this->errorHandler=$errorHandler; + } } /** @@ -357,8 +361,29 @@ function debugQuery($sql, $key_field = null) { + global $debugger; $query_func = $this->getMetaFunction('query'); + + // set 1st checkpoint: begin + $isSkipTable=true; + $profileSQLs=defined('DBG_SQL_PROFILE')&&DBG_SQL_PROFILE; + if($profileSQLs) + { + $isSkipTable=isSkipTable($sql); + if(!$isSkipTable) + { + $queryID=$debugger->generateID(); + $debugger->profileStart('sql_'.$queryID, $debugger->formatSQL($sql) ); + } + } + // set 1st checkpoint: end + $this->queryID = $query_func($sql,$this->connectionID); + + // set 2nd checkpoint: begin + if(!$isSkipTable) $debugger->profileFinish('sql_'.$queryID); + // set 2nd checkpoint: end + if( is_resource($this->queryID) ) { $ret = Array();