[Springnet-commits] Spring.Net/test/Spring/Spring.Data.Tests/Data/Common AdditionalProviders.xml, 1.1, 1.2 DbProviderFactoryTests.cs, 1.12, 1.13

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Tests/Data/Common
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1454

Modified Files:
	AdditionalProviders.xml DbProviderFactoryTests.cs 
Log Message:
SPRNET-902 - DbProvider ExtractError method should explicitly perform ToString operation on object returned from SpEL expression to obtain error code
SPRNET-910 - Updated DB2 codes for exception translation

Index: AdditionalProviders.xml
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Tests/Data/Common/AdditionalProviders.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AdditionalProviders.xml	29 Jan 2008 18:18:17 -0000	1.1
--- AdditionalProviders.xml	2 Apr 2008 19:37:20 -0000	1.2
***************
*** 42,45 ****
--- 42,86 ----
  
    </object>
+ 
+   <object id="Test-SqlServer-2.0-BadErrorCodeExpression" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+     <constructor-arg name="dbMetaData">
+       <object type="Spring.Data.Common.DbMetadata">
+         <constructor-arg name="productName" value="Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0" />
+         <constructor-arg name="assemblyName" value="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+         <constructor-arg name="connectionType" value="System.Data.SqlClient.SqlConnection, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+         <constructor-arg name="commandType" value="System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+         <constructor-arg name="parameterType" value="System.Data.SqlClient.SqlParameter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+         <constructor-arg name="dataAdapterType" value="System.Data.SqlClient.SqlDataAdapter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+         <constructor-arg name="commandBuilderType" value="System.Data.SqlClient.SqlCommandBuilder, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+         <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+         <constructor-arg name="parameterDbType" value="System.Data.SqlDbType, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+         <constructor-arg name="parameterDbTypeProperty" value="SqlDbType"/>
+         <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+         <constructor-arg name="parameterNamePrefix" value="@"/>
+         <constructor-arg name="exceptionType" value="System.Data.SqlClient.SqlException, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+         <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+         <constructor-arg name="useParameterPrefixInSql" value="true"/>
+         <constructor-arg name="bindByName" value="true"/>
+         <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+              obtaining error codes-->
+         <constructor-arg name="errorCodeExceptionExpression" value="156"/>
+ 
+         <!-- TODO select form system db all errors that have 'incorrect syntax' at the start of the error string-->
+         <property name="ErrorCodes.BadSqlGrammarCodes">
+           <value>156,170,207,208</value>
+         </property>
+         <property name="ErrorCodes.PermissionDeniedCodes">
+           <value>229</value>
+         </property>
+         <property name="ErrorCodes.DataIntegrityViolationCodes">
+           <value>544,2627,8114,8115</value>
+         </property>
+         <property name="ErrorCodes.DeadlockLoserCodes">
+           <value>1205</value>
+         </property>
+       </object>
+     </constructor-arg>
+ 
+   </object>
    
  </objects>
\ No newline at end of file

Index: DbProviderFactoryTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DbProviderFactoryTests.cs	29 Jan 2008 18:50:32 -0000	1.12
--- DbProviderFactoryTests.cs	2 Apr 2008 19:37:20 -0000	1.13
***************
*** 95,98 ****
--- 95,109 ----
  
          [Test]
+         [Ignore("Can't guarantee test order")]
+         public void BadErrorExpression()
+         {
+ 
+             IDbProvider provider = DbProviderFactory.GetDbProvider("Test-SqlServer-2.0-BadErrorCodeExpression");
+             Assert.IsNotNull(provider);
+             string errorCode = provider.ExtractError(new Exception("foo"));
+             Assert.AreEqual("156",errorCode);
+         }
+ 
+         [Test]
          public void DefaultInstanceWithSqlServer2005()
          {