From 333a6e42b26230ea5f2c5dbc0750706bee3e6355 Mon Sep 17 00:00:00 2001
From: markpollack <mark.pollack@springsource.com>
Date: Fri, 6 Nov 2009 15:30:19 +0000
Subject: [PATCH] SPRNET-1041 - Add new DbProvider for Oracle 11g

---
 doc/reference/src/dbprovider.xml              |  7 ++-
 .../Spring.Data/Data/Common/dbproviders.xml   | 54 +++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/doc/reference/src/dbprovider.xml b/doc/reference/src/dbprovider.xml
index 24cc0a31..c7bb31c1 100644
--- a/doc/reference/src/dbprovider.xml
+++ b/doc/reference/src/dbprovider.xml
@@ -160,7 +160,12 @@
       <listitem>
         <para><code>OracleODP-2.0</code> (aliased to
         <code>System.DataAccess.Client</code>) - Oracle, Oracle provider
-        V2.102.2.20</para>
+        V2.102.2.20 (Oracle 10g)</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>OracleODP-11-2.0 </literal>- Oracle, Oracle provider
+        V2.111.7.20 (Oracle 11g)</para>
       </listitem>
 
       <listitem>
diff --git a/src/Spring/Spring.Data/Data/Common/dbproviders.xml b/src/Spring/Spring.Data/Data/Common/dbproviders.xml
index 24edff64..e729aa02 100644
--- a/src/Spring/Spring.Data/Data/Common/dbproviders.xml
+++ b/src/Spring/Spring.Data/Data/Common/dbproviders.xml
@@ -369,6 +369,60 @@
 
   <alias name="OracleODP-2.0" alias="Oracle.DataAccess.Client"/>
 
+  <!-- 11g changed the property to get the exception error code from ErrorCode to Number -->
+
+  <object id="OracleODP-11-2.0" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="Oracle, Oracle provider V2.111.7.20"  />
+        <constructor-arg name="assemblyName" value="Oracle.DataAccess, Version=2.111.7.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="connectionType" value="Oracle.DataAccess.Client.OracleConnection, Oracle.DataAccess, Version=2.111.7.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="commandType" value="Oracle.DataAccess.Client.OracleCommand, Oracle.DataAccess, Version=2.111.7.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="parameterType" value="Oracle.DataAccess.Client.OracleParameter, Oracle.DataAccess, Version=2.111.7.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="dataAdapterType" value="Oracle.DataAccess.Client.OracleDataAdapter, Oracle.DataAccess, Version=2.111.7.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="commandBuilderType" value="Oracle.DataAccess.Client.OracleCommandBuilder, Oracle.DataAccess, Version=2.111.7.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="Oracle.DataAccess.Client.OracleDbType, Oracle.DataAccess, Version=2.111.7.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="parameterDbTypeProperty" value="OracleDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value=":"/>
+        <constructor-arg name="exceptionType" value="Oracle.DataAccess.Client.OracleException, Oracle.DataAccess, Version=2.111.7.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="false"/>
+        <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="Number.ToString()"/>
+
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value>900,903,904,917,936,942,17006</value>
+        </property>
+        <property name="ErrorCodes.InvalidResultSetAccessCodes">
+          <value>17003</value>
+        </property>
+        <property name="ErrorCodes.DuplicateKeyCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>17002,17447</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>1,1400,1722,2291,2292</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>54</value>
+        </property>
+        <property name="ErrorCodes.CannotSerializeTransactionCodes">
+          <value>8177</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>60</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+
   
   <!-- My Sql -->