From caa348ceabba58447bf8deddb8c6316ff3dc88ce Mon Sep 17 00:00:00 2001
From: wei <>
Date: Fri, 28 Jul 2006 00:02:13 +0000
Subject: Fixed nested GroupBy resultMap

---
 framework/DataAccess/SQLMap/Configuration/TDomSqlMapBuilder.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'framework/DataAccess/SQLMap/Configuration')

diff --git a/framework/DataAccess/SQLMap/Configuration/TDomSqlMapBuilder.php b/framework/DataAccess/SQLMap/Configuration/TDomSqlMapBuilder.php
index 0d1172b0..e43e362d 100644
--- a/framework/DataAccess/SQLMap/Configuration/TDomSqlMapBuilder.php
+++ b/framework/DataAccess/SQLMap/Configuration/TDomSqlMapBuilder.php
@@ -48,11 +48,11 @@ class TDomSqlMapBuilder
 	public function build(SimpleXMLElement $document)
 	{
 		$this->_document = $document;
-		$this->initialize($document);
+		$this->initializeSQLMap($document);
 		return $this->_sqlMapper;
 	}
 
-	protected function initialize($document)
+	protected function initializeSQLMap($document)
 	{
 		$this->_sqlMapper = new TSqlMapper(new TTypeHandlerFactory);
 
@@ -81,6 +81,7 @@ class TDomSqlMapBuilder
 
 		foreach($document->xpath('//sqlMap') as $sqlmap)
 			$this->loadSqlMappingFiles($sqlmap);
+		$this->resolveResultMapping();
 
 		if($this->_sqlMapper->getIsCacheModelsEnabled())
 			$this->attachCacheModel();
@@ -216,7 +217,6 @@ class TDomSqlMapBuilder
 		$resource = $this->getResourceFromPath((string)$node['resource']);
 		$sqlmap = $this->getConfigAsXmlDocument($resource);
 		$this->configureSqlMap($sqlmap,$resource);
-		$this->resolveResultMapping();
 	}
 
 	protected function getResourceFromPath($resource)
-- 
cgit v1.2.3