bzr commit into connector-net-6.2 branch (reggie.burnett:873)

[Reggie Burnett]

#At file:///C:/work/bzr-connector-net/6.2/ based on revid:vvaintroub@stripped

  873 Reggie Burnett	2010-07-19 [merge]
      merged

    modified:
      CHANGES
      MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.0.ssdl
      MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.1.ssdl
      MySql.Data.Entity/Provider/Properties/SchemaDefinition-6.0.ssdl
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-07-16 14:55:01 +0000
+++ b/CHANGES	2010-07-19 18:32:25 +0000
@@ -31,6 +31,7 @@
 - changed DbCommandBuilder and added a MySqlDataObjectIdentifierConverter so we don't output
   the databasename in our typed datasets.  This allows users to move the dataset to a new
   database/server with no trouble (bug #33870)
+- fixed recognition of char(36) columns to be guids when used in views with entity models (bug #52085)
 
 Version 6.2.3
 - fixed InvalidOperationException when accessing Stream.ReadTimeout or Stream.WriteTimeout on CF

=== modified file 'MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.0.ssdl'
--- a/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.0.ssdl	2009-10-28 16:02:29 +0000
+++ b/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.0.ssdl	2010-07-19 18:30:42 +0000
@@ -71,7 +71,7 @@
         ORDINAL_POSITION AS `Ordinal`,
         CASE IS_NULLABLE WHEN 'YES' THEN 1 ELSE 0 END AS `IsNullable`,
         IF(LEFT(COLUMN_TYPE,10) = 'tinyint(1)', 'bool',
-          IF (LEFT(COLUMN_TYPE,10) = 'binary(16)', 'guid',
+          IF (LEFT(COLUMN_TYPE,10) = 'binary(16)' OR LEFT(COLUMN_TYPE,8) = 'char(36)', 'guid',
             IF (INSTR(COLUMN_TYPE, 'unsigned') = 0, DATA_TYPE,
               CONCAT('u', DATA_TYPE)))) AS `TypeName`,
         IF (CHARACTER_MAXIMUM_LENGTH > 2147483647, 2147483647, CHARACTER_MAXIMUM_LENGTH) AS `MaxLength`,

=== modified file 'MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.1.ssdl'
--- a/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.1.ssdl	2009-10-28 16:02:29 +0000
+++ b/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.1.ssdl	2010-07-19 18:30:42 +0000
@@ -71,7 +71,7 @@
         ORDINAL_POSITION AS `Ordinal`,
         CASE IS_NULLABLE WHEN 'YES' THEN 1 ELSE 0 END AS `IsNullable`,
         IF(LEFT(COLUMN_TYPE,10) = 'tinyint(1)', 'bool',
-          IF (LEFT(COLUMN_TYPE,10) = 'binary(16)', 'guid',
+          IF (LEFT(COLUMN_TYPE,10) = 'binary(16)' OR LEFT(COLUMN_TYPE,8) = 'char(36)', 'guid',
             IF (INSTR(COLUMN_TYPE, 'unsigned') = 0, DATA_TYPE,
               CONCAT('u', DATA_TYPE)))) AS `TypeName`,
         IF (CHARACTER_MAXIMUM_LENGTH > 2147483647, 2147483647, CHARACTER_MAXIMUM_LENGTH) AS `MaxLength`,

=== modified file 'MySql.Data.Entity/Provider/Properties/SchemaDefinition-6.0.ssdl'
--- a/MySql.Data.Entity/Provider/Properties/SchemaDefinition-6.0.ssdl	2009-10-28 16:02:29 +0000
+++ b/MySql.Data.Entity/Provider/Properties/SchemaDefinition-6.0.ssdl	2010-07-19 18:30:42 +0000
@@ -71,7 +71,7 @@
         ORDINAL_POSITION AS `Ordinal`,
         CASE IS_NULLABLE WHEN 'YES' THEN 1 ELSE 0 END AS `IsNullable`,
         IF(LEFT(COLUMN_TYPE,10) = 'tinyint(1)', 'bool',
-          IF (LEFT(COLUMN_TYPE,10) = 'binary(16)', 'guid',
+          IF (LEFT(COLUMN_TYPE,10) = 'binary(16)' OR LEFT(COLUMN_TYPE,8) = 'char(36)', 'guid',
             IF (INSTR(COLUMN_TYPE, 'unsigned') = 0, DATA_TYPE,
               CONCAT('u', DATA_TYPE)))) AS `TypeName`,
         IF (CHARACTER_MAXIMUM_LENGTH > 2147483647, 2147483647, CHARACTER_MAXIMUM_LENGTH) AS `MaxLength`,


Attachment: [text/bzr-bundle] bzr/[e-mail]