bzr commit into connector-net-6.0 branch (reggie.burnett:771) Bug#47872

[Reggie Burnett]

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

  771 Reggie Burnett	2009-10-28
      - fixed unsigned types in views when used as entities (bug # 47872)

    modified:
      CHANGES
      MySql.Data.Entity/Provider/MySql.Data.Entity.csproj
      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
      MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.csproj
      MySql.Data.Entity/Tests/TestModel.Designer.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2009-10-23 18:45:57 +0000
+++ b/CHANGES	2009-10-28 15:56:50 +0000
@@ -40,6 +40,7 @@
 - fixed mono compilation problem (bug #47048)
 - we are now throwing an InvalidOperationException is the TableDirect command type is used    
 - fixed indexes schema collection so that it still works with bad table names such as b``a`d (bug #48101)
+- fixed unsigned types in views when used as entities (bug #   47872) 
     
 Version 6.0.4
 - fixed regression where using stored procs with datasets (bug #44460)

=== modified file 'MySql.Data.Entity/Provider/MySql.Data.Entity.csproj'
--- a/MySql.Data.Entity/Provider/MySql.Data.Entity.csproj	2009-09-15 00:20:38 +0000
+++ b/MySql.Data.Entity/Provider/MySql.Data.Entity.csproj	2009-10-28 15:56:50 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -70,6 +70,8 @@
     <Compile Include="Generators\SqlGenerator.cs" />
     <Compile Include="Generators\UpdateGenerator.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Statements\DeleteStatement.cs" />
@@ -86,6 +88,7 @@
     <EmbeddedResource Include="Properties\SchemaDefinition-5.1.ssdl" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

=== modified file 'MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.0.ssdl'
--- a/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.0.ssdl	2009-06-09 19:54:16 +0000
+++ b/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.0.ssdl	2009-10-28 15:56:50 +0000
@@ -70,7 +70,10 @@
         COLUMN_NAME AS `Name`,
         ORDINAL_POSITION AS `Ordinal`,
         CASE IS_NULLABLE WHEN 'YES' THEN 1 ELSE 0 END AS `IsNullable`,
-        DATA_TYPE AS `TypeName`,
+        IF(LEFT(COLUMN_TYPE,10) = 'tinyint(1)', 'bool',
+          IF (LEFT(COLUMN_TYPE,10) = 'binary(16)', '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`,
         NUMERIC_PRECISION AS `Precision`,
         0 AS `DateTimePrecision`,

=== modified file 'MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.1.ssdl'
--- a/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.1.ssdl	2009-06-09 19:54:16 +0000
+++ b/MySql.Data.Entity/Provider/Properties/SchemaDefinition-5.1.ssdl	2009-10-28 15:56:50 +0000
@@ -70,7 +70,10 @@
         COLUMN_NAME AS `Name`,
         ORDINAL_POSITION AS `Ordinal`,
         CASE IS_NULLABLE WHEN 'YES' THEN 1 ELSE 0 END AS `IsNullable`,
-        DATA_TYPE AS `TypeName`,
+        IF(LEFT(COLUMN_TYPE,10) = 'tinyint(1)', 'bool',
+          IF (LEFT(COLUMN_TYPE,10) = 'binary(16)', '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`,
         NUMERIC_PRECISION AS `Precision`,
         0 AS `DateTimePrecision`,

=== modified file 'MySql.Data.Entity/Provider/Properties/SchemaDefinition-6.0.ssdl'
--- a/MySql.Data.Entity/Provider/Properties/SchemaDefinition-6.0.ssdl	2009-08-21 15:05:35 +0000
+++ b/MySql.Data.Entity/Provider/Properties/SchemaDefinition-6.0.ssdl	2009-10-28 15:56:50 +0000
@@ -70,7 +70,10 @@
         COLUMN_NAME AS `Name`,
         ORDINAL_POSITION AS `Ordinal`,
         CASE IS_NULLABLE WHEN 'YES' THEN 1 ELSE 0 END AS `IsNullable`,
-        DATA_TYPE AS `TypeName`,
+        IF(LEFT(COLUMN_TYPE,10) = 'tinyint(1)', 'bool',
+          IF (LEFT(COLUMN_TYPE,10) = 'binary(16)', '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`,
         NUMERIC_PRECISION AS `Precision`,
         0 AS `DateTimePrecision`,

=== modified file 'MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.csproj'
--- a/MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.csproj	2009-09-15 00:20:38 +0000
+++ b/MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.csproj	2009-10-28 15:56:50 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -68,6 +68,8 @@
     <Compile Include="JoinTests.cs" />
     <Compile Include="SchemaInformation.cs" />
     <Compile Include="TestModel.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
       <DependentUpon>TestModel.csdl</DependentUpon>
     </Compile>
     <Compile Include="Wizard.cs" />
@@ -97,6 +99,7 @@
     <None Include="Properties\schema.sql" />
     <EmbeddedResource Include="TestModel.csdl">
       <Generator>EntityModelCodeGenerator</Generator>
+      <LastGenOutput>TestModel.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="TestModel.msl" />
     <EmbeddedResource Include="TestModel.ssdl" />

=== modified file 'MySql.Data.Entity/Tests/TestModel.Designer.cs'
--- a/MySql.Data.Entity/Tests/TestModel.Designer.cs	2009-09-01 00:49:03 +0000
+++ b/MySql.Data.Entity/Tests/TestModel.Designer.cs	2009-10-28 15:56:50 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
+//     Runtime Version:2.0.50727.3603
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -15,7 +15,7 @@
 [assembly: global::System.Data.Objects.DataClasses.EdmRelationshipAttribute("testModel", "FK_Books_Publishers", "Publishers", global::System.Data.Metadata.Edm.RelationshipMultiplicity.One, typeof(MySql.Data.Entity.Tests.Publisher), "Books", global::System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(MySql.Data.Entity.Tests.Book))]
 
 // Original file name:
-// Generation date: 8/31/2009 7:46:19 PM
+// Generation date: 10/28/2009 10:41:21 AM
 namespace MySql.Data.Entity.Tests
 {
     

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