From: Reggie Burnett
Date: June 22 2011 3:57pm
Subject: bzr commit into connector-net-6.4 branch (reggie.burnett:1008)
List-Archive: http://lists.mysql.com/commits/139696
Message-Id: <201106221557.p5MFveUg023785@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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

 1008 Reggie Burnett	2011-06-22 [merge]
      merged

    modified:
      MySQLClient.sln
      Source/MySql.Data.Entity/MySql.Data.Entity.csproj
      Source/MySql.Data/MySql.Data.csproj
      Source/MySql.VisualStudio/DDEX/MySqlDataObjectEnumerator.cs
      Source/MySql.VisualStudio/DDEX/MySqlDataObjectSupport.xml
      Source/MySql.VisualStudio/MySql.VisualStudio.csproj
      Source/MySql.Web/MySql.Web.csproj
      package.proj
=== modified file 'MySQLClient.sln'
=== modified file 'MySQLClient.sln'
--- a/MySQLClient.sln	2011-06-22 03:09:40 +0000
+++ b/MySQLClient.sln	2011-06-22 15:56:52 +0000
@@ -206,6 +206,7 @@
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.ActiveCfg = Release|Any CPU
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x86.ActiveCfg = Release|Any CPU
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.Build.0 = Commercial|x86
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.ActiveCfg = Commercial|x86
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.Build.0 = Commercial|x86
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x64.ActiveCfg = Commercial|x86

=== modified file 'Source/MySql.Data.Entity/MySql.Data.Entity.csproj'
--- a/Source/MySql.Data.Entity/MySql.Data.Entity.csproj	2011-06-21 18:51:27 +0000
+++ b/Source/MySql.Data.Entity/MySql.Data.Entity.csproj	2011-06-22 14:06:05 +0000
@@ -37,7 +37,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CLR4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -46,7 +46,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;CLR4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

=== modified file 'Source/MySql.Data/MySql.Data.csproj'
--- a/Source/MySql.Data/MySql.Data.csproj	2011-06-21 19:32:35 +0000
+++ b/Source/MySql.Data/MySql.Data.csproj	2011-06-22 15:57:37 +0000
@@ -33,7 +33,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;CLR4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -42,7 +42,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;CLR4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

=== modified file 'Source/MySql.VisualStudio/DDEX/MySqlDataObjectEnumerator.cs'
--- a/Source/MySql.VisualStudio/DDEX/MySqlDataObjectEnumerator.cs	2011-02-14 17:19:36 +0000
+++ b/Source/MySql.VisualStudio/DDEX/MySqlDataObjectEnumerator.cs	2011-06-22 15:56:36 +0000
@@ -75,20 +75,60 @@
             if (typeName == null)
                 throw new ArgumentNullException("typeName");
 
-			Debug.Assert(typeName == String.Empty);
-
-			DbConnection conn = (DbConnection)Connection.GetLockedProviderObject();
-			DataTable table = new DataTable();
-			table.Columns.Add("SERVER_NAME");
-			table.Columns.Add("CATALOG_NAME");
-			table.Columns.Add("SCHEMA_NAME");
-			DataRow row = table.NewRow();
-			row["SERVER_NAME"] = conn.DataSource;
-			row["SCHEMA_NAME"] = conn.Database;
-			table.Rows.Add(row);
-			Connection.UnlockProviderObject();
-
-			return new AdoDotNetDataTableReader(table);
+            if (typeName == String.Empty)
+                return EnumerateRoot();
+            else return EnumerateSchemaObjects(parameters[0] as string, restrictions);
+        }
+
+        private DataReader EnumerateRoot()
+        {
+            DbConnection conn = (DbConnection)Connection.GetLockedProviderObject();
+            try
+            {
+                DataTable table = new DataTable();
+                table.Columns.Add("SERVER_NAME");
+                table.Columns.Add("CATALOG_NAME");
+                table.Columns.Add("SCHEMA_NAME");
+                DataRow row = table.NewRow();
+                row["SERVER_NAME"] = conn.DataSource;
+                row["SCHEMA_NAME"] = conn.Database;
+                table.Rows.Add(row);
+                return new AdoDotNetDataTableReader(table);
+            }
+            finally
+            {
+                Connection.UnlockProviderObject();
+            }
+        }
+
+        private DataReader EnumerateSchemaObjects(string typeName, object[] restrictions)
+        {
+            DbConnection conn = (DbConnection)Connection.GetLockedProviderObject();
+            try
+            {
+                string[] rest;
+                DataTable tables = null;
+
+                if (restrictions != null)
+                {
+                    int i = 0;
+                    rest = new string[restrictions.Length];
+                    foreach (object o in restrictions)
+                        rest[i++] = (string)o;
+                    tables = conn.GetSchema(typeName, rest);
+                }
+                else
+                    tables = conn.GetSchema(typeName);
+
+                foreach (DataRow row in tables.Rows)
+                    row["TABLE_CATALOG"] = DBNull.Value;
+                return new AdoDotNetDataTableReader(tables);
+            }
+            finally
+            {
+                Connection.UnlockProviderObject();
+            }
+        }
 
 /*
             // Chose restricitions array
@@ -132,7 +172,6 @@
 
             // Enumerete objects in to DataReader
             return new AdoDotNetDataTableReader(table);*/
-        }
 
         #region Connection wrapper
         /// <summary>

=== modified file 'Source/MySql.VisualStudio/DDEX/MySqlDataObjectSupport.xml'
--- a/Source/MySql.VisualStudio/DDEX/MySqlDataObjectSupport.xml	2011-02-14 17:19:36 +0000
+++ b/Source/MySql.VisualStudio/DDEX/MySqlDataObjectSupport.xml	2011-06-22 15:56:36 +0000
@@ -84,10 +84,9 @@
         <Property name="Comment" type="System.String" itemName="TABLE_COMMENT"/>
       </Properties>
       <Actions>
-        <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
-                handler="Microsoft.VisualStudio.Data.AdoDotNet.AdoDotNetObjectEnumerator">
-          <Parameter value="Tables"/>
-        </Action>
+          <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A" handler="MySql.Data.VisualStudio.MySqlDataObjectEnumerator">
+            <Parameter value="Tables"/>
+          </Action>
         <Action name="BuildDSRef" guid="7C030900-E8DD-471b-8F18-D83DA7036144"
                 handler="Microsoft.VisualStudio.Data.DSRefBuilder">
           <Parameter>
@@ -166,7 +165,7 @@
         <Property name="SecurityType" type="System.String" itemName="SECURITY_TYPE" />
       </Properties>
       <Actions>
-        <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A" handler="Microsoft.VisualStudio.Data.AdoDotNet.AdoDotNetObjectEnumerator">
+        <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A" handler="MySql.Data.VisualStudio.MySqlDataObjectEnumerator">
           <Parameter value="Views"/>
         </Action>
         <Action name="BuildDSRef" guid="7C030900-E8DD-471b-8F18-D83DA7036144" handler="Microsoft.VisualStudio.Data.DSRefBuilder">
@@ -300,7 +299,7 @@
         <Property name="Comment" type="System.String" itemName="COLUMN_COMMENT" />
       </Properties>
       <Actions>
-        <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A" handler="Microsoft.VisualStudio.Data.AdoDotNet.AdoDotNetObjectEnumerator">
+        <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A" handler="MySql.Data.VisualStudio.MySqlDataObjectEnumerator">
           <Parameter value="Columns"/>
         </Action>
         <Action name="BuildDSRef" guid="7C030900-E8DD-471b-8F18-D83DA7036144" handler="MySql.Data.VisualStudio.MyDSRefBuilder">

=== modified file 'Source/MySql.VisualStudio/MySql.VisualStudio.csproj'
--- a/Source/MySql.VisualStudio/MySql.VisualStudio.csproj	2011-06-21 19:16:59 +0000
+++ b/Source/MySql.VisualStudio/MySql.VisualStudio.csproj	2011-06-22 15:57:37 +0000
@@ -41,7 +41,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CLR4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <RegisterForComInterop>false</RegisterForComInterop>
@@ -51,7 +51,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;CLR4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

=== modified file 'Source/MySql.Web/MySql.Web.csproj'
--- a/Source/MySql.Web/MySql.Web.csproj	2011-06-21 18:51:27 +0000
+++ b/Source/MySql.Web/MySql.Web.csproj	2011-06-22 14:06:05 +0000
@@ -41,7 +41,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CLR4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>1699</NoWarn>
@@ -53,7 +53,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;CLR4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>1699</NoWarn>

=== modified file 'package.proj'
--- a/package.proj	2011-04-22 14:29:34 +0000
+++ b/package.proj	2011-06-22 15:56:52 +0000
@@ -28,7 +28,7 @@
   </Target>
 
   <Target Name="PackageInstall">
-    <GetVersion Assembly="MySql.Data/Provider/bin/release/mysql.data.dll" Format="{0}.{1}.{2}">
+    <GetVersion Assembly="VS2008/Source/MySql.Data/bin/release/mysql.data.dll" Format="{0}.{1}.{2}">
       <Output TaskParameter = "AsString" PropertyName="Version"/>
     </GetVersion>
     <Copy SourceFiles="Installer/bin/$(Configuration)/mysql.data.msi"
@@ -76,16 +76,18 @@
 
   <Target Name="PackageZip">
     <ItemGroup>
-      <V2Assemblies Include="MySql.Data\Provider\bin\release\mysql.data.dll"/>
-      <V2Assemblies Include="MySql.Data\Provider\bin\release\mysql.data.cf.dll"/>
-      <V2Assemblies Include="MySql.Web\Providers\bin\release\mysql.web.dll"/>
-      <V2Assemblies Include="MySql.Data.Entity\Provider\bin\release\mysql.data.entity.dll"/>
-      <V2Assemblies Include="MySql.VisualStudio\bin\release\mysql.visualstudio.dll"/>
+      <V2Assemblies Include="VS2008\Source\MySql.Data\bin\release\mysql.data.dll"/>
+      <V2Assemblies Include="VS2008\Source\MySql.Data.CF\bin\release\mysql.data.cf.dll"/>
+      <V2Assemblies Include="VS2008\Source\MySql.Web\bin\release\mysql.web.dll"/>
+      <V2Assemblies Include="VS2008\Source\MySql.Data.Entity\bin\release\mysql.data.entity.dll"/>
+      <V2Assemblies Include="VS2008\Source\MySql.VisualStudio\bin\release\mysql.visualstudio.dll"/>
     </ItemGroup>
 
     <ItemGroup>
-      <V4Assemblies Include="MySql.Data.Entity\Provider\bin\release-4.0\mysql.data.entity.dll"/>
-      <V4Assemblies Include="MySql.VisualStudio\bin\release-4.0\mysql.visualstudio.dll"/>
+      <V4Assemblies Include="Source\MySql.Data\bin\release\mysql.data.dll"/>
+      <V4Assemblies Include="Source\MySql.Web\bin\release\mysql.web.dll"/>
+      <V4Assemblies Include="Source\MySql.Data.Entity\bin\release\mysql.data.entity.dll"/>
+      <V4Assemblies Include="Source\MySql.VisualStudio\bin\release\mysql.visualstudio.dll"/>
     </ItemGroup>
 
     <ItemGroup>

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).