From: Reggie Burnett
Date: December 9 2010 3:26am
Subject: bzr commit into connector-net-6.0 branch (reggie.burnett:851) Bug#55349
List-Archive: http://lists.mysql.com/commits/126376
X-Bug: 55349
Message-Id: <201012090327.oB903wnc015556@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0939903989=="

--===============0939903989==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///C:/work/connector-net/6.0/ based on revid:reggie.burnett@stripped

  851 Reggie Burnett	2010-12-08
      - fixed bug where older versions of MySQL would present cast(0 as decimal(0,0)) as string 
        that caused our EF code to throw an exception as it tried to convert that to bool
        (bug #55349)

    modified:
      CHANGES
      MySql.Data.Entity/Provider/EFMySqlDataReader.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-11-30 18:28:31 +0000
+++ b/CHANGES	2010-12-09 03:26:38 +0000
@@ -10,6 +10,9 @@
 - fixed our DDEX code so that dragging tables from server explorer onto a typed data set
   preserves the table name (bug #57894)
 - fixed ReadFieldLength to return a long so bigint autoincrement columns can work (bug #58373)
+- fixed bug where older versions of MySQL would present cast(0 as decimal(0,0)) as string 
+  that caused our EF code to throw an exception as it tried to convert that to bool
+  (bug #55349)
 
 Version 6.0.7
 - Fix authorization popup after modifying stored procedure in VS (Bug #44715)

=== modified file 'MySql.Data.Entity/Provider/EFMySqlDataReader.cs'
--- a/MySql.Data.Entity/Provider/EFMySqlDataReader.cs	2009-09-01 00:49:03 +0000
+++ b/MySql.Data.Entity/Provider/EFMySqlDataReader.cs	2010-12-09 03:26:38 +0000
@@ -25,6 +25,7 @@
 using System.Data;
 using System.Data.Metadata.Edm;
 using System.Globalization;
+using System.Text;
 
 namespace MySql.Data.Entity
 {
@@ -205,9 +206,15 @@
 
         private object ChangeType(object sourceValue, Type targetType)
         {
-            if (sourceValue is byte[] && targetType == typeof(Guid))
+            if (sourceValue is byte[])
             {
-                return new Guid((byte[])sourceValue);
+				if (targetType == typeof(Guid))
+					return new Guid((byte[])sourceValue);
+				else if (targetType == typeof(bool))
+				{
+					byte[] bytes = (byte[])sourceValue;
+					return bytes[0] == '1';
+				}
             }
 
             if (sourceValue is DateTime && targetType == typeof(DateTimeOffset))


--===============0939903989==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/reggie.burnett@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: reggie.burnett@stripped\
#   gyrli5yr5lik7jjr
# target_branch: file:///C:/work/connector-net/6.0/
# testament_sha1: 1f7c32b63bf627bcf55e20c5797fdee74d115808
# timestamp: 2010-12-08 21:26:39 -0600
# base_revision_id: reggie.burnett@stripped\
#   mxj7s0aele2n3x9x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZH4QwsAApffgGByW+f//3/H
fQq////6UAXY80ABtlEgAAEkpPJAm1Mm1NqaZqPUD1GagMQNABoaABxkyaMQ00MBNDE0aZMQMjCa
NNMIMmGJNJqNRo9RiBk9CAAaaAANBoGgBxkyaMQ00MBNDE0aZMQMjCaNNMIMmEkRGQJiaT0AlPaC
TyGjJRmaQTJk9EyejapAmZEERJm0URaz7V1wEPPSweolbl5ZTPVMSjWVafQaDgm5Gm5B5o1HFDak
6/Ux/mooHgEMkhhj2nCn8TpnCK4SRSPtiAtqeNRCxXZIMhZ3IQlNGLvnY8OI0j7zRzOVGJuOR8iy
yjIPgPSUDlx7D/u36Rsg8hyMoESgxpHGMWKBg4FxaQHKSY5wKjI/A17/py29vPi9clUgM88DRJEF
+7SSLhAF22L5cbEjjcLw8xsiSY2+TkqrzjTSQO763NpghdGYVBcFIbz0wSNi/nPfKjT/N1iS7GBV
hmm+IR30EKqUFrBtLfeOaTYFGEtKyVDAoCUAggqa0ogoA7MA6mqfh/EzWpnWd5Yew5w+eCD414YI
Wok4WEhwONw2Xo1PfaWag4FrL/SuuLC8zjEL+Flb1qwuHPGQS8MSREhgMkrSIDO2Gn8Maay8Y0my
UrAK7Ri0HHm1aYZH3JDEDQfiGg3HuNShKrOpQBkxUQAypyGPSUGG0BtxidR2ax1fhewbB08HmXFB
AczCJMLDHCtQNxqx1aXu23l5wpoLTL7ym0YgqpNcTMziBxAzLdE+6fPG4Dfkz3Gw1GwcMA/G6RUF
+3KJfiS7SIrgiWgywIDFR7APmsfqqoe2YUARUYuZV52lpTeMpFg/QEQpg5zBEqlcSB3YDSxUNuLC
DgxqBzRcZlxcH+VWUNO9KlK6LKxFFHt7OXgYXxVRNKGCwhKzt0Cd3ZMbztAbIQqG7eN/dhJhJoUp
bZNYEsytVGYZhvOxkK+HBC8dmT6ZfBmS9VDizLOQLT5Jvid11i2BK7I0rWwdH2hEgbkyGo8o1MHY
QFzG4KzuDiS8+rqQtASVxBHuPb81iq9RTrgWAMOFEVbQMZycceHJjLRGfxCSFBkKxr87xxiMoOEy
wcNJ21MOdIl+7wGPWg+w8DrDpLwgFIUFpzh5+85dWmw6YMhVmIk3qTDqgDxGKTMNO0wNYXBEMR6A
klUbjiRBg/U3l5SSxDsVLEHG7ckK5BZCEShSWiapqUxymeDZX7VaPATrsL3UYWmUARD0fcZRKWyw
rJWkLhDU6N6vSEr697NUcUJhSlpelnLEnMJBG8aozWkWQySgkN9R/dKKZLoNrHcGsOw3qlfqegtC
RUXQX1nfiPE6BmNJ18EnPErSU0l89xWBxN4tgaOs2cImpJusDfgatR9Ep4pKgmf107OlWgaeImJF
H6IwrNXjzxpkUJD3oGMo2FBb2rv6QPSBgaw6gNaNpyG842g+8YiRJoTHJMawPWBVOjpxiqhKOkqK
lQvXtideuqnpXUqyVBW1I+iFR6E6W9UyRDNWKxVpKVIQrCSLw8mUaHEyiXcBcxXWSOMlAoSU0j1O
nGPapoqXyQmRYu91X3FhxU1Rritu3mCK8grCzOZOY2o+4uORI3UKAVp04xYA0BBlfJRJHL+Mfcxo
HBh6AMT4GPbkSZQ1ki23QGIGKwQEI3B5+BMUmKQdPwrDkMcV2qiQw207NBEzC9QsQcSBMPV8jIqN
Az1ozOTzpxGLBi0qFeevxxpKhKkqKQiSYvIaAjJzQFTC1XDmsscXMqkQXY0SA/ktLk2DBJaWL4wa
Z4aF0h+hgcdEwaCMj75CWZymYK4Y+2rFBXN4G0kHx9qoHMj0qArcbBm8wfyIH+ALQJnfkLC1W+8/
+LuSKcKEhI/CGFg=


--===============0939903989==--