From 17622da55217bf30d06f35a85c05530e7ccaff9c Mon Sep 17 00:00:00 2001
From: bbaia <brbaia@gmail.com>
Date: Wed, 7 Apr 2010 15:01:46 +0000
Subject: [PATCH] Add MySql 6.2.2 ado.net provider [SPRNET-1321]

---
 doc/reference/src/dbprovider.xml              | 11 ++++-
 .../Spring.Data/Data/Common/dbproviders.xml   | 44 ++++++++++++++++++-
 .../Data/Config/spring-database-1.1.xsd       |  7 ++-
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/doc/reference/src/dbprovider.xml b/doc/reference/src/dbprovider.xml
index d88833c2..c47b7625 100644
--- a/doc/reference/src/dbprovider.xml
+++ b/doc/reference/src/dbprovider.xml
@@ -203,11 +203,18 @@
       </listitem>
 
       <listitem>
-        <para><literal>MySql-6.1.3</literal> (aliased to
-        <literal>MySql.Data.MySqlClient</literal>) - MySQL, MySQL provider
+        <para><literal>MySql-6.1.3</literal> - MySQL, MySQL provider
         6.1.3.0</para>
       </listitem>
 
+      <listitem>
+        <para>
+          <literal>MySql-6.2.2</literal> (aliased to
+          <literal>MySql.Data.MySqlClient</literal>) - MySQL, MySQL provider
+          6.2.2.0
+        </para>
+      </listitem>
+
       <listitem>
         <para><literal>Npgsql-1.0</literal> - Postgresql provider 1.0.0.0 (and
         1.0.0.1 - were build with same version info)</para>
diff --git a/src/Spring/Spring.Data/Data/Common/dbproviders.xml b/src/Spring/Spring.Data/Data/Common/dbproviders.xml
index a7a1df6a..bd5ad5bd 100644
--- a/src/Spring/Spring.Data/Data/Common/dbproviders.xml
+++ b/src/Spring/Spring.Data/Data/Common/dbproviders.xml
@@ -767,8 +767,50 @@
       </object>
     </constructor-arg>
   </object>
+
+  <object id="MySql-6.2.2" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="MySQL, MySQL provider 6.2.2.0"  />
+        <constructor-arg name="assemblyName" value="MySql.Data, Version=6.2.2.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="connectionType" value="MySql.Data.MySqlClient.MySqlConnection, MySql.Data, Version=6.2.2.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandType" value="MySql.Data.MySqlClient.MySqlCommand, MySql.Data, Version=6.2.2.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterType" value="MySql.Data.MySqlClient.MySqlParameter, MySql.Data, Version=6.2.2.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="dataAdapterType" value="MySql.Data.MySqlClient.MySqlDataAdapter, MySql.Data, Version=6.2.2.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderType" value="MySql.Data.MySqlClient.MySqlCommandBuilder, MySql.Data, Version=6.2.2.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="MySql.Data.MySqlClient.MySqlDbType, MySql.Data, Version=6.2.2.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterDbTypeProperty" value="MySqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="MySql.Data.MySqlClient.MySqlException, MySql.Data, Version=6.2.2.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <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="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>1054,1064,1146</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>630,839,840,893,1062,1169,1215,1216,1217,1451,1452,1557</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>1205</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1213</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
   
-  <alias name="MySql-6.1.3" alias="MySql.Data.MySqlClient"/>
+  <alias name="MySql-6.2.2" alias="MySql.Data.MySqlClient"/>
 
 
   <object id="Npgsql-1.0" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
diff --git a/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd b/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd
index bd0f751f..4d6104d2 100644
--- a/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd
+++ b/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd
@@ -161,9 +161,14 @@
               <xs:documentation>MySQL provider 6.1.3.0</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
+          <xs:enumeration value="MySql-6.2.2">
+            <xs:annotation>
+              <xs:documentation>MySQL provider 6.2.2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
           <xs:enumeration value="MySql.Data.MySqlClient">
             <xs:annotation>
-              <xs:documentation>MySQL provider 6.1.3.0</xs:documentation>
+              <xs:documentation>MySQL provider 6.2.2.0</xs:documentation>
             </xs:annotation>
           </xs:enumeration>
           <xs:enumeration value="Npgsql-1.0">