You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by gb...@apache.org on 2005/04/26 19:45:34 UTC

svn commit: r164841 - /incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient /incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests /incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration /incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParamaterMapping /incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Statements

Author: gbayon
Date: Tue Apr 26 10:45:33 2005
New Revision: 164841

URL: http://svn.apache.org/viewcvs?rev=164841&view=rev
Log:
- Fixed JIRA-45

Modified:
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Complex.xml
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/DynamicAccount.xml
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/EmbedParameter.xml
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Order.xml
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/ResultClass.xml
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/StatementTest.cs
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParamaterMapping/ParameterMap.cs
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Statements/Statement.cs

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Complex.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Complex.xml?rev=164841&r1=164840&r2=164841&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Complex.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Complex.xml Tue Apr 26 10:45:33 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?> 
-<sqlMap namespace="Category" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<sqlMap namespace="Complex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		xsi:noNamespaceSchemaLocation="SqlMap.xsd">
 	
 	<statements>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/DynamicAccount.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/DynamicAccount.xml?rev=164841&r1=164840&r2=164841&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/DynamicAccount.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/DynamicAccount.xml Tue Apr 26 10:45:33 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?> 
-<sqlMap namespace="Category" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<sqlMap namespace="Account" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		xsi:noNamespaceSchemaLocation="SqlMap.xsd">
 		
 	<alias>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/EmbedParameter.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/EmbedParameter.xml?rev=164841&r1=164840&r2=164841&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/EmbedParameter.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/EmbedParameter.xml Tue Apr 26 10:45:33 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<sqlMap namespace="Category" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<sqlMap namespace="EmbededParameter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		xsi:noNamespaceSchemaLocation="SqlMap.xsd">
 	
 	<alias>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Order.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Order.xml?rev=164841&r1=164840&r2=164841&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Order.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Order.xml Tue Apr 26 10:45:33 2005
@@ -330,6 +330,18 @@
 			</isNotEmpty> 
 		</select>	
 				
+		<select id="GetAccountJIRA45"
+				parameterClass="int"
+				resultMap="Account.account-result">
+			select
+			Account_ID,
+			Account_FirstName,
+			Account_LastName,
+			Account_Email
+			from Accounts
+			where Account_ID = #value#
+		</select>
+		
 	</statements>
 
 	<parameterMaps>   

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/ResultClass.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/ResultClass.xml?rev=164841&r1=164840&r2=164841&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/ResultClass.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/ResultClass.xml Tue Apr 26 10:45:33 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<sqlMap namespace="Order" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<sqlMap namespace="ResultClass" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:noNamespaceSchemaLocation="SqlMap.xsd">
 
 	<statements>	

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/StatementTest.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/StatementTest.cs?rev=164841&r1=164840&r2=164841&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/StatementTest.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/StatementTest.cs Tue Apr 26 10:45:33 2005
@@ -1055,6 +1055,9 @@
 		}
 		#endregion 
 
+
+		#region JIRA Tests
+
 		/// <summary>
 		/// Test Bit column 
 		/// </summary>
@@ -1069,6 +1072,20 @@
 
 			sqlMap.Insert("InsertBool", other);
 		}
+
+		/// <summary>
+		/// Test for access a result map in a different namespace 
+		/// </summary>
+		[Test]
+		public void TestJIRA45() 
+		{
+			Account account = sqlMap.QueryForObject("GetAccountJIRA45", 1) as Account;
+			AssertAccount1(account);
+		}
+
+		#endregion 
+
+
 		
 	}
 }

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs?rev=164841&r1=164840&r2=164841&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs Tue Apr 26 10:45:33 2005
@@ -379,18 +379,26 @@
 
 			foreach(DictionaryEntry entry in _configScope.SqlMapper.MappedStatements)
 			{
+				_configScope.ErrorContext.Activity = "Set CacheModel to statement";
+
 				MappedStatement mappedStatement = (MappedStatement)entry.Value;
 				if (mappedStatement.Statement.CacheModelName.Length >0)
 				{
+					_configScope.ErrorContext.MoreInfo = "statement :"+mappedStatement.Statement.Id;
+					_configScope.ErrorContext.Resource = "cacheModel : " +mappedStatement.Statement.CacheModelName;
 					mappedStatement.Statement.CacheModel = _configScope.SqlMapper.GetCache(mappedStatement.Statement.CacheModelName);
 				}
 			}
 			#endregion 
 
+			_configScope.ErrorContext.Reset();
+
 			#region Resolve "resultMap" attribut on Result Property + initialize Discriminator property 
 
 			foreach(DictionaryEntry entry in _configScope.SqlMapper.ResultMaps)
 			{
+				_configScope.ErrorContext.Activity = "Resolve 'resultMap' attribut on Result Property";
+
 				ResultMap resultMap = (ResultMap)entry.Value;
 				foreach(DictionaryEntry item in resultMap.ColumnsToPropertiesMap)
 				{
@@ -408,6 +416,8 @@
 
 			#endregion
 
+			_configScope.ErrorContext.Reset();
+
 		}
 
 		/// <summary>
@@ -584,9 +594,13 @@
 				MappedStatement mappedStatement = null;
 
 				statement = (Statement) serializer.Deserialize(new XmlNodeReader(xmlNode));
+				statement.CacheModelName = ApplyNamespace( statement.CacheModelName );
+				statement.ParameterMapName = ApplyNamespace( statement.ParameterMapName );
+				statement.ResultMapName = ApplyNamespace( statement.ResultMapName );
+
 				if (_configScope.UseStatementNamespaces == true)
 				{
-					statement.Id = ApplyNamespace(statement.Id, _configScope.SqlMapNamespace);
+					statement.Id = ApplyNamespace(statement.Id);
 				}
 				_configScope.ErrorContext.ObjectId = statement.Id;
 				statement.Initialize( _configScope );
@@ -613,11 +627,16 @@
 				MappedStatement mappedStatement = null;
 
 				select = (Select) serializer.Deserialize(new XmlNodeReader(xmlNode));
+				select.CacheModelName = ApplyNamespace( select.CacheModelName );
+				select.ParameterMapName = ApplyNamespace( select.ParameterMapName );
+				select.ResultMapName = ApplyNamespace( select.ResultMapName );
+
 				if (_configScope.UseStatementNamespaces == true)
 				{
-					select.Id = ApplyNamespace(select.Id, _configScope.SqlMapNamespace);
+					select.Id = ApplyNamespace(select.Id);
 				}
 				_configScope.ErrorContext.ObjectId = select.Id;
+				
 				select.Initialize( _configScope );
 
 				if (select.Generate != null)
@@ -649,9 +668,13 @@
 				MappedStatement mappedStatement = null;
 
 				insert = (Insert) serializer.Deserialize(new XmlNodeReader(xmlNode));
+				insert.CacheModelName = ApplyNamespace( insert.CacheModelName );
+				insert.ParameterMapName = ApplyNamespace( insert.ParameterMapName );
+				insert.ResultMapName = ApplyNamespace( insert.ResultMapName );
+
 				if (_configScope.UseStatementNamespaces == true)
 				{
-					insert.Id = ApplyNamespace(insert.Id, _configScope.SqlMapNamespace);
+					insert.Id = ApplyNamespace(insert.Id);
 				}
 				_configScope.ErrorContext.ObjectId = insert.Id;
 				insert.Initialize( _configScope );
@@ -705,9 +728,13 @@
 				MappedStatement mappedStatement = null;
 
 				update = (Update) serializer.Deserialize(new XmlNodeReader(xmlNode));
+				update.CacheModelName = ApplyNamespace( update.CacheModelName );
+				update.ParameterMapName = ApplyNamespace( update.ParameterMapName );
+				update.ResultMapName = ApplyNamespace( update.ResultMapName );
+
 				if (_configScope.UseStatementNamespaces == true)
 				{
-					update.Id = ApplyNamespace(update.Id, _configScope.SqlMapNamespace);
+					update.Id = ApplyNamespace(update.Id);
 				}
 				_configScope.ErrorContext.ObjectId = update.Id;
 				update.Initialize( _configScope );
@@ -741,9 +768,13 @@
 				MappedStatement mappedStatement = null;
 
 				delete = (Delete) serializer.Deserialize(new XmlNodeReader(xmlNode));
+				delete.CacheModelName = ApplyNamespace( delete.CacheModelName );
+				delete.ParameterMapName = ApplyNamespace( delete.ParameterMapName );
+				delete.ResultMapName = ApplyNamespace( delete.ResultMapName );
+
 				if (_configScope.UseStatementNamespaces == true)
 				{
-					delete.Id = ApplyNamespace(delete.Id, _configScope.SqlMapNamespace);
+					delete.Id = ApplyNamespace(delete.Id);
 				}
 				_configScope.ErrorContext.ObjectId = delete.Id;
 				delete.Initialize( _configScope );
@@ -778,9 +809,13 @@
 				MappedStatement mappedStatement = null;
 
 				procedure = (Procedure)serializer.Deserialize(new XmlNodeReader(xmlNode));
+				procedure.CacheModelName = ApplyNamespace( procedure.CacheModelName );
+				procedure.ParameterMapName = ApplyNamespace( procedure.ParameterMapName );
+				procedure.ResultMapName = ApplyNamespace( procedure.ResultMapName );
+
 				if (_configScope.UseStatementNamespaces == true)
 				{
-					procedure.Id = ApplyNamespace(procedure.Id, _configScope.SqlMapNamespace);
+					procedure.Id = ApplyNamespace(procedure.Id);
 				}
 				_configScope.ErrorContext.ObjectId = procedure.Id;
 				procedure.Initialize( _configScope );
@@ -807,6 +842,7 @@
 				foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes("/sqlMap/cacheModels/cacheModel"))
 				{
 					cacheModel = (CacheModel) serializer.Deserialize(new XmlNodeReader(xmlNode));
+					cacheModel.Id = ApplyNamespace( cacheModel.Id );
 
 					// Attach ExecuteEventHandler
 					foreach(XmlNode flushOn in xmlNode.SelectNodes("flushOnExecute"))
@@ -839,6 +875,8 @@
 
 			#endregion
 
+			_configScope.ErrorContext.Reset();
+
 		}
 
 
@@ -959,7 +997,7 @@
 		{
 			string newSql = sqlStatement;
 
-			_configScope.ErrorContext.MoreInfo = "apply inline paremeterMap";
+			_configScope.ErrorContext.MoreInfo = "apply inline parameterMap";
 
 			// Check the inline parameter
 			if (statement.ParameterMap == null)
@@ -1072,33 +1110,36 @@
 
 			_configScope.ErrorContext.MoreInfo = "build ParameterMap";
 
-			string id = ((XmlAttribute)parameterMapNode.Attributes.GetNamedItem("id")).Value;
+			// Get the parameterMap id
+			string id = ApplyNamespace( ((XmlAttribute)parameterMapNode.Attributes.GetNamedItem("id")).Value );
 			_configScope.ErrorContext.ObjectId = id;
 
 			// Did we already process it ?
-			if (_configScope.SqlMapper.ParameterMaps.Contains( _configScope.SqlMapNamespace + DOT + id ) == false)
+			if (_configScope.SqlMapper.ParameterMaps.Contains( id ) == false)
 			{
 				parameterMap = (ParameterMap) serializer.Deserialize(new XmlNodeReader(parameterMapNode));
 				
 				_configScope.ErrorContext.MoreInfo = "initialize ParameterMap";
 				parameterMap.Initialize(parameterMapNode);
 
-				parameterMap.Id = _configScope.SqlMapNamespace + DOT + parameterMap.Id;
+				parameterMap.Id = ApplyNamespace( parameterMap.Id );
+				string attributeExtendMap = parameterMap.ExtendMap;
+				parameterMap.ExtendMap = ApplyNamespace( parameterMap.ExtendMap );
 
 				if (parameterMap.ExtendMap.Length >0)
 				{
 					ParameterMap superMap = null;
 					// Did we already build Extend ParameterMap ?
-					if (_configScope.SqlMapper.ParameterMaps.Contains(_configScope.SqlMapNamespace + DOT + parameterMap.ExtendMap) == false)
+					if (_configScope.SqlMapper.ParameterMaps.Contains( parameterMap.ExtendMap ) == false)
 					{
-						XmlNode superNode = _configScope.SqlMapConfigDocument.SelectSingleNode("/sqlMap/parameterMaps/parameterMap[@id='"+ parameterMap.ExtendMap +"']");
+						XmlNode superNode = _configScope.SqlMapConfigDocument.SelectSingleNode("/sqlMap/parameterMaps/parameterMap[@id='"+ attributeExtendMap +"']");
 
 						if (superNode != null)
 						{
 							_configScope.ErrorContext.MoreInfo = "Build parent ParameterMap";
 							_configScope.NodeContext = superNode;
 							BuildParameterMap();
-							superMap = _configScope.SqlMapper.GetParameterMap(_configScope.SqlMapNamespace + DOT + parameterMap.ExtendMap);
+							superMap = _configScope.SqlMapper.GetParameterMap( parameterMap.ExtendMap );
 						}
 						else
 						{
@@ -1107,7 +1148,7 @@
 					}
 					else
 					{
-						superMap = _configScope.SqlMapper.GetParameterMap(_configScope.SqlMapNamespace + DOT + parameterMap.ExtendMap);
+						superMap = _configScope.SqlMapper.GetParameterMap( parameterMap.ExtendMap );
 					}
 					// Add extends property
 					int index = 0;
@@ -1135,11 +1176,11 @@
 
 			_configScope.ErrorContext.MoreInfo = "build ResultMap";
 
-			string id = ((XmlAttribute)resultMapNode.Attributes.GetNamedItem("id")).Value;
+			string id = ApplyNamespace(  ((XmlAttribute)resultMapNode.Attributes.GetNamedItem("id")).Value );
 			_configScope.ErrorContext.ObjectId = id;
 
 			// Did we alredy process it
-			if (_configScope.SqlMapper.ResultMaps.Contains( _configScope.SqlMapNamespace + DOT + id ) == false)
+			if (_configScope.SqlMapper.ResultMaps.Contains( id ) == false)
 			{
 				resultMap = (ResultMap) serializer.Deserialize(new XmlNodeReader(resultMapNode));
 				
@@ -1148,22 +1189,24 @@
 				_configScope.ErrorContext.MoreInfo = "initialize ResultMap";
 				resultMap.Initialize( _configScope.SqlMapper, resultMapNode);
 
-				resultMap.Id = _configScope.SqlMapNamespace + DOT + resultMap.Id;
+				resultMap.Id = ApplyNamespace( resultMap.Id );
+				string attributeExtendMap = resultMap.ExtendMap;
+				resultMap.ExtendMap = ApplyNamespace( resultMap.ExtendMap );
 
 				if (resultMap.ExtendMap.Length >0)
 				{
 					ResultMap superMap = null;
 					// Did we already build Extend ResultMap?
-					if (_configScope.SqlMapper.ResultMaps.Contains(_configScope.SqlMapNamespace + DOT + resultMap.ExtendMap) == false)
+					if (_configScope.SqlMapper.ResultMaps.Contains( resultMap.ExtendMap ) == false)
 					{
-						XmlNode superNode = _configScope.SqlMapDocument.SelectSingleNode("/sqlMap/resultMaps/resultMap[@id='"+ resultMap.ExtendMap +"']");
+						XmlNode superNode = _configScope.SqlMapDocument.SelectSingleNode("/sqlMap/resultMaps/resultMap[@id='"+ attributeExtendMap +"']");
 
 						if (superNode != null)
 						{
 							_configScope.ErrorContext.MoreInfo = "Build parent ResultMap";
 							_configScope.NodeContext = superNode;
 							BuildResultMap();
-							superMap = _configScope.SqlMapper.GetResultMap(_configScope.SqlMapNamespace + DOT + resultMap.ExtendMap);
+							superMap = _configScope.SqlMapper.GetResultMap( resultMap.ExtendMap );
 						}
 						else
 						{
@@ -1172,7 +1215,7 @@
 					}
 					else
 					{
-						superMap = _configScope.SqlMapper.GetResultMap(_configScope.SqlMapNamespace + DOT + resultMap.ExtendMap);
+						superMap = _configScope.SqlMapper.GetResultMap( resultMap.ExtendMap );
 					}
 
 					// Add parent property
@@ -1191,15 +1234,16 @@
 		/// Register under Statement Name or Fully Qualified Statement Name
 		/// </summary>
 		/// <param name="id">An Identity</param>
-		/// <param name="currentNamespace">The current Namespace of the sql mapping file</param>
 		/// <returns>The new Identity</returns>
-		private string ApplyNamespace(string id, string currentNamespace) 
+		private string ApplyNamespace(string id) 
 		{
 			string newId = id;
+			string currentNamespace = _configScope.SqlMapNamespace;
 
-			if (currentNamespace != null && currentNamespace.Length > 0 && id != null && id.IndexOf(".") < 0) 
+			if (currentNamespace != null && currentNamespace.Length > 0 
+				&& id != null && id.Length>0 && id.IndexOf(".") < 0) 
 			{
-				newId = currentNamespace + "." + id;
+				newId = currentNamespace + DOT + id;
 			}
 			return newId;
 		}

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParamaterMapping/ParameterMap.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParamaterMapping/ParameterMap.cs?rev=164841&r1=164840&r2=164841&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParamaterMapping/ParameterMap.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParamaterMapping/ParameterMap.cs Tue Apr 26 10:45:33 2005
@@ -100,8 +100,9 @@
 		}
 
 		/// <summary>
-		/// Extend ResultMap attribute
+		/// Extend Parametermap attribute
 		/// </summary>
+		/// <remarks>The id of a ParameterMap</remarks>
 		[XmlAttribute("extends")]
 		public string ExtendMap
 		{

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Statements/Statement.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Statements/Statement.cs?rev=164841&r1=164840&r2=164841&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Statements/Statement.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Statements/Statement.cs Tue Apr 26 10:45:33 2005
@@ -299,11 +299,11 @@
 		{
 			if (_resultMapName != string.Empty )
 			{
-				_resultMap = configurationScope.SqlMapper.GetResultMap( configurationScope.SqlMapNamespace + DOT + _resultMapName);
+				_resultMap = configurationScope.SqlMapper.GetResultMap( _resultMapName);
 			}
 			if (_parameterMapName != string.Empty )
 			{
-				_parameterMap = configurationScope.SqlMapper.GetParameterMap( configurationScope.SqlMapNamespace + DOT + _parameterMapName);
+				_parameterMap = configurationScope.SqlMapper.GetParameterMap( _parameterMapName);
 			}
 			if (_resultClassName != string.Empty )
 			{