Author: gbayon
Date: Sat Nov 3 03:30:41 2007
New Revision: 591574
URL: http://svn.apache.org/viewvc?rev=591574&view=rev
Log:
Fix IBATISNET-249 Incorrect process of "extends" in parameterMap nodes
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Category.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Category.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Category.xml?rev=591574&r1=591573&r2=591574&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Category.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/Category.xml
Sat Nov 3 03:30:41 2007
@@ -185,20 +185,23 @@
<parameter property="Id" column="Category_Id"
dbType="Int" /><!-- Int for SqlClient, Obdc; Integer for Oledb -->
<parameter property="Guid" column="Category_Guid"
dbType="UniqueIdentifier"/><!--Guid for Oledb, UniqueIdentifier for
SqlClient,Odbc -->
</parameterMap>
-
+
+ <parameterMap id="UpdateParam" extends="InsertParam"
class="Category">
+ <parameter property="Id" column="Category_Id" />
+ </parameterMap>
+
<parameterMap id="InsertParam" class="Category">
<parameter property="Name" column="Category_Name"/>
<parameter property="Guid" column="Category_Guid"
dbType="UniqueIdentifier"/><!--Guid for Oledb, UniqueIdentifier for
SqlClient,Odbc -->
</parameterMap>
-
+
+
<parameterMap id="insert-null-params" class="Category">
<parameter property="Name" column="Category_Name"/>
<parameter property="Guid" column="Category_Guid"
nullValue="00000000-0000-0000-0000-000000000000"
dbType="UniqueIdentifier"/><!--Guid for Oledb, UniqueIdentifier for
SqlClient,Odbc -->
</parameterMap>
- <parameterMap id="UpdateParam" extends="InsertParam"
class="Category">
- <parameter property="Id" column="Category_Id" />
- </parameterMap>
+
<!-- Used by generated statement -->
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs?rev=591574&r1=591573&r2=591574&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs
Sat Nov 3 03:30:41 2007
@@ -1791,7 +1791,7 @@
// Did we already build Extend
ParameterMap ?
if
(_configScope.SqlMapper.ParameterMaps.Contains( parameterMap.ExtendMap ) ==
false)
{
- XmlNode superNode =
_configScope.SqlMapConfigDocument.SelectSingleNode(ApplyMappingNamespacePrefix(XML_SEARCH_PARAMETER)+
attributeExtendMap +"']", _configScope.XmlNamespaceManager );
+ XmlNode superNode =
_configScope.SqlMapDocument.SelectSingleNode(ApplyMappingNamespacePrefix(XML_SEARCH_PARAMETER)
+ attributeExtendMap + "']", _configScope.XmlNamespaceManager);
if (superNode != null)
{
