Author: gbayon
Date: Thu Jun 15 13:44:10 2006
New Revision: 414679
URL: http://svn.apache.org/viewvc?rev=414679&view=rev
Log:
- Fixed a bug when parsing provider in dao config
- Cosmetic changes
Modified:
ibatis/trunk/cs/mapper/IBatisNet.2005.sln
ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/MappedStatements/CachingStatement.cs
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/MappedStatements/PropertStrategy/ResultMapStrategy.cs
Modified: ibatis/trunk/cs/mapper/IBatisNet.2005.sln
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.2005.sln?rev=414679&r1=414678&r2=414679&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.2005.sln (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.2005.sln Thu Jun 15 13:44:10 2006
@@ -39,8 +39,8 @@
{BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}.Debug Test|Any
CPU.Build.0 = Debug|Any CPU
{BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
{BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}.Debug|Any CPU.Build.0 =
Debug|Any CPU
- {BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}.Release|Any
CPU.ActiveCfg = Debug|Any CPU
- {BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}.Release|Any CPU.Build.0
= Debug|Any CPU
+ {BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}.Release|Any
CPU.ActiveCfg = Release|Any CPU
+ {BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}.Release|Any CPU.Build.0
= Release|Any CPU
{BEFC4A45-7DF9-40E4-942C-82DC1BA5E708}.Debug Test|Any
CPU.ActiveCfg = Debug|Any CPU
{BEFC4A45-7DF9-40E4-942C-82DC1BA5E708}.Debug Test|Any
CPU.Build.0 = Debug|Any CPU
{BEFC4A45-7DF9-40E4-942C-82DC1BA5E708}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs?rev=414679&r1=414678&r2=414679&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs
Thu Jun 15 13:44:10 2006
@@ -682,20 +682,19 @@
if (node != null)
{
configurationScope.ErrorContext.Resource =
node.OuterXml.ToString();
- // name
- attribute = node.Attributes["name"];
+ string providerName =
NodeUtils.ParsePropertyTokens(node.Attributes["name"].Value,
configurationScope.Properties);
- configurationScope.ErrorContext.ObjectId =
attribute.Value;
+ configurationScope.ErrorContext.ObjectId = providerName;
- if
(configurationScope.Providers.Contains(attribute.Value) == true)
+ if (configurationScope.Providers.Contains(providerName) ==
true)
{
- return
(IDbProvider)configurationScope.Providers[attribute.Value];
+ return
(IDbProvider)configurationScope.Providers[providerName];
}
else
{
throw new ConfigurationException(
string.Format("Error while
configuring the Provider named \"{0}\" in the Context named \"{1}\".",
- attribute.Value,
configurationScope.NodeContext.Attributes["name"].Value));
+ providerName,
configurationScope.NodeContext.Attributes["name"].Value));
}
}
else
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/MappedStatements/CachingStatement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/MappedStatements/CachingStatement.cs?rev=414679&r1=414678&r2=414679&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/MappedStatements/CachingStatement.cs
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/MappedStatements/CachingStatement.cs
Thu Jun 15 13:44:10 2006
@@ -440,6 +440,11 @@
}
}
+ /// <summary>
+ /// Gets the cache key.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ /// <returns>the cache key</returns>
private CacheKey GetCacheKey(RequestScope request)
{
CacheKey cacheKey = new CacheKey();
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/MappedStatements/PropertStrategy/ResultMapStrategy.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/MappedStatements/PropertStrategy/ResultMapStrategy.cs?rev=414679&r1=414678&r2=414679&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/MappedStatements/PropertStrategy/ResultMapStrategy.cs
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/MappedStatements/PropertStrategy/ResultMapStrategy.cs
Thu Jun 15 13:44:10 2006
@@ -40,7 +40,7 @@
/// <summary>
/// Sets value of the specified <see cref="ResultProperty"/> on
the target object
/// when a 'resultMapping' attribute exists
- /// on the <see cref="ResultProperty"/> is not empty.
+ /// on the <see cref="ResultProperty"/>.
/// </summary>
/// <param name="request">The request.</param>
/// <param name="resultMap">The result map.</param>
@@ -74,7 +74,8 @@
}
// Sets created object on the property
- resultMap.SetValueOfProperty( ref target, mapping, obj
); }
+ resultMap.SetValueOfProperty( ref target, mapping, obj
);
+ }
#endregion
}
