List:Commits« Previous MessageNext Message »
From:rburnett Date:May 26 2009 7:34pm
Subject:Connector/NET commit: r1623 - in branches/6.0: . MySql.Data.Entity/Provider/Properties
View as plain text  
Modified:
   branches/6.0/CHANGES
   branches/6.0/MySql.Data.Entity/Provider/Properties/ProviderManifest.xml
   branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.0.ssdl
   branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.1.ssdl
   branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-6.0.ssdl
Log:
- fixed conversion of binary(16) type to guid for entity framework models (bug #44986)


Modified: branches/6.0/CHANGES
===================================================================
--- branches/6.0/CHANGES	2009-05-22 21:31:02 UTC (rev 1622)
+++ branches/6.0/CHANGES	2009-05-26 19:34:03 UTC (rev 1623)
@@ -7,6 +7,7 @@
 - fixed display name of triggers inside server explorer
 - fixed trigger editing
 - fixed tokenization of escaped backslashes (bug #44960)
+- fixed conversion of binary(16) type to guid for entity framework models (bug #44986)
 
 Version 6.0.3 - 4/22/09
 - fixed broken connection prompting

Modified: branches/6.0/MySql.Data.Entity/Provider/Properties/ProviderManifest.xml
===================================================================
--- branches/6.0/MySql.Data.Entity/Provider/Properties/ProviderManifest.xml	2009-05-22 21:31:02 UTC (rev 1622)
+++ branches/6.0/MySql.Data.Entity/Provider/Properties/ProviderManifest.xml	2009-05-26 19:34:03 UTC (rev 1623)
@@ -9,6 +9,7 @@
 -->
 <ProviderManifest Namespace="MySql" xmlns="http://schemas.microsoft.com/ado/2006/04/edm/providermanifest">
   <Types>
+    <Type Name ="guid" PrimitiveTypeKind ="Guid"/>
     <Type Name="bool" PrimitiveTypeKind="Boolean"/>
     <Type Name="tinyint" PrimitiveTypeKind="Byte"/>
     <Type Name="smallint" PrimitiveTypeKind="Int16"/>

Modified: branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.0.ssdl
===================================================================
--- branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.0.ssdl	2009-05-22 21:31:02 UTC (rev 1622)
+++ branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.0.ssdl	2009-05-26 19:34:03 UTC (rev 1623)
@@ -27,7 +27,7 @@
         COLUMN_NAME AS `Name`,
         ORDINAL_POSITION AS `Ordinal`,
         CASE IS_NULLABLE WHEN 'YES' THEN 1 ELSE 0 END AS `IsNullable`,
-        IF(LOWER(COLUMN_TYPE) = 'tinyint(1)', 'bool', DATA_TYPE) AS `TypeName`,
+        IF(LOWER(COLUMN_TYPE) = 'tinyint(1)', 'bool', IF (LOWER(COLUMN_TYPE) = 'binary(16)', 'guid', DATA_TYPE)) AS `TypeName`,
         IF (CHARACTER_MAXIMUM_LENGTH > 2147483647, 2147483647, CHARACTER_MAXIMUM_LENGTH) AS `MaxLength`,
         NUMERIC_PRECISION AS `Precision`,
         0 AS `DateTimePrecision`,

Modified: branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.1.ssdl
===================================================================
--- branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.1.ssdl	2009-05-22 21:31:02 UTC (rev 1622)
+++ branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.1.ssdl	2009-05-26 19:34:03 UTC (rev 1623)
@@ -27,7 +27,7 @@
         COLUMN_NAME AS `Name`,
         ORDINAL_POSITION AS `Ordinal`,
         CASE IS_NULLABLE WHEN 'YES' THEN 1 ELSE 0 END AS `IsNullable`,
-        IF(LOWER(COLUMN_TYPE) = 'tinyint(1)', 'bool', DATA_TYPE) AS `TypeName`,
+        IF(LOWER(COLUMN_TYPE) = 'tinyint(1)', 'bool', IF (LOWER(COLUMN_TYPE) = 'binary(16)', 'guid', DATA_TYPE)) AS `TypeName`,
         IF (CHARACTER_MAXIMUM_LENGTH > 2147483647, 2147483647, CHARACTER_MAXIMUM_LENGTH) AS `MaxLength`,
         NUMERIC_PRECISION AS `Precision`,
         0 AS `DateTimePrecision`,

Modified: branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-6.0.ssdl
===================================================================
--- branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-6.0.ssdl	2009-05-22 21:31:02 UTC (rev 1622)
+++ branches/6.0/MySql.Data.Entity/Provider/Properties/SchemaDefinition-6.0.ssdl	2009-05-26 19:34:03 UTC (rev 1623)
@@ -27,7 +27,7 @@
         COLUMN_NAME AS `Name`,
         ORDINAL_POSITION AS `Ordinal`,
         CASE IS_NULLABLE WHEN 'YES' THEN 1 ELSE 0 END AS `IsNullable`,
-        IF(LOWER(COLUMN_TYPE) = 'tinyint(1)', 'bool', DATA_TYPE) AS `TypeName`,
+        IF(LOWER(COLUMN_TYPE) = 'tinyint(1)', 'bool', IF (LOWER(COLUMN_TYPE) = 'binary(16)', 'guid', DATA_TYPE)) AS `TypeName`,
         IF (CHARACTER_MAXIMUM_LENGTH > 2147483647, 2147483647, CHARACTER_MAXIMUM_LENGTH) AS `MaxLength`,
         NUMERIC_PRECISION AS `Precision`,
         0 AS `DateTimePrecision`,

Thread
Connector/NET commit: r1623 - in branches/6.0: . MySql.Data.Entity/Provider/Propertiesrburnett26 May