Visual Studio Plugin commit: r20 - in branches/1.0: . Descriptors

[rburnett]

Modified:
   branches/1.0/Descriptors/RootDescriptor.cs
   branches/1.0/MySqlDataObjectSupport.xml
Log:
Bug #24875 Add Connection Dialog of Server Explorer will freeze with capitalized db names 

Fixed this by replacing code that was depending on I_S so that it works properly on MySQL
4.1

Modified: branches/1.0/Descriptors/RootDescriptor.cs
===================================================================
--- branches/1.0/Descriptors/RootDescriptor.cs	2006-11-30 15:15:07 UTC (rev 19)
+++ branches/1.0/Descriptors/RootDescriptor.cs	2006-12-08 17:29:11 UTC (rev 20)
@@ -27,7 +27,8 @@
         /// Schema enumeration template.
         /// </summary>
         protected new const string EnumerateSqlTemplate =
-            "SELECT "
+            "SELECT {0} AS SERVER_NAME, NULL AS CATALOG_NAME, database() AS SCHEMA_NAME";
+/*            "SELECT "
             + "{0} AS SERVER_NAME, "
             + "CATALOG_NAME, "
             + "SCHEMA_NAME, "
@@ -35,7 +36,7 @@
             + "DEFAULT_COLLATION_NAME, "
             + "SQL_PATH "
             + "FROM information_schema.SCHEMATA "
-            + "WHERE SCHEMA_NAME = {1} ";
+            + "WHERE SCHEMA_NAME = {1} ";*/
         
         /// <summary>
         /// Schema enumeration defaults.
@@ -71,7 +72,7 @@
                 return base.GetEnumerateSqlTemplate(connection);
 
             // For legacy version use SHOW DATABASES
-            return "SHOW DATABASES LIKE {1}";
+            return EnumerateSqlTemplate; // "SHOW DATABASES LIKE {1}";
         }
 
         /// <summary>
@@ -109,7 +110,7 @@
                 throw new ArgumentNullException("table");
 
             // Extract server version
-            Version serverVersion = connection.ServerVersion;
+/*            Version serverVersion = connection.ServerVersion;
             
             // For legacy version rename column returned from SHOW DATABASES to
SCHEMA_NAME
             if (serverVersion != null && serverVersion.Major < 5)
@@ -126,7 +127,7 @@
                 table.Columns[0].ColumnName = Attributes.Schema;
             }
             
-            base.PostProcessData(connection, table);
+            base.PostProcessData(connection, table);*/
         }
 
         /// <summary>

Modified: branches/1.0/MySqlDataObjectSupport.xml
===================================================================
--- branches/1.0/MySqlDataObjectSupport.xml	2006-11-30 15:15:07 UTC (rev 19)
+++ branches/1.0/MySqlDataObjectSupport.xml	2006-12-08 17:29:11 UTC (rev 20)
@@ -11,9 +11,9 @@
         <Property name="Server" itemName="SERVER_NAME" type="System.String"/>
         <Property name="Database" itemName="CATALOG_NAME" type="System.String"/>
         <Property name="Schema" itemName="SCHEMA_NAME" type="System.String"/>
-        <Property name="DefaultCharset" itemName="DEFAULT_CHARACTER_SET_NAME"
type="System.String"/>
+<!--        <Property name="DefaultCharset" itemName="DEFAULT_CHARACTER_SET_NAME"
type="System.String"/>
         <Property name="DefaultCollation" itemName="DEFAULT_COLLATION_NAME"
type="System.String"/>
-        <Property name="SQLPath" itemName="SQL_PATH" type="System.String"/>
+        <Property name="SQLPath" itemName="SQL_PATH" type="System.String"/>-->
       </Properties>
       <Actions>
         <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="MySql.Data.VisualStudio.MySqlDataObjectEnumerator"/>
@@ -148,7 +148,6 @@
         <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="Microsoft.VisualStudio.Data.AdoDotNet.AdoDotNetObjectEnumerator">
           <Parameter value="Views"/>
         </Action>
-        <!--        <Action name="Enumerate"
guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="MySql.Data.VisualStudio.MySqlDataObjectEnumerator" />-->
       </Actions>
     </Type>
 
@@ -196,7 +195,7 @@
             </Concept>
           </Concepts>
         </Property>
-        <Property name="Default" type="System.String" itemName="TRUE_DEFAULT">
+        <Property name="Default" type="System.String" itemName="COLUMN_DEFAULT">
           <Concepts>
             <Concept name="Default"/>
           </Concepts>
@@ -243,7 +242,7 @@
             </Concept>
           </Concepts>
         </Property>
-        <Property name="OctetLength" type="System.Int64"
itemName='CHARACTER_OCTET_LENGTH'/>
+<!--        <Property name="OctetLength" type="System.Int64"
itemName='CHARACTER_OCTET_LENGTH'/>-->
         <Property name="Precision" type="System.Int64"
itemName="NUMERIC_PRECISION">
           <Concepts>
             <Concept name="Precision">
@@ -273,8 +272,6 @@
         <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="Microsoft.VisualStudio.Data.AdoDotNet.AdoDotNetObjectEnumerator">
           <Parameter value="Columns"/>
         </Action>
-
-        <!--        <Action name="Enumerate"
guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="MySql.Data.VisualStudio.MySqlDataObjectEnumerator" />-->
       </Actions>
     </Type>
 
@@ -390,7 +387,9 @@
         <Property name="Comment" type="System.String" itemName="COLUMN_COMMENT" />
       </Properties>
       <Actions>
-        <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="MySql.Data.VisualStudio.MySqlDataObjectEnumerator" />
+        <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="Microsoft.VisualStudio.Data.AdoDotNet.AdoDotNetObjectEnumerator">
+          <Parameter value="ViewColumns"/>
+        </Action>
       </Actions>
     </Type>
 
@@ -418,11 +417,6 @@
             <Concept name="Identifier2" />
           </Concepts>
         </Part>
-        <Part name="Type" itemName="ROUTINE_TYPE">
-          <Concepts>
-            <Concept name="Identifier3" />
-          </Concepts>
-        </Part>
       </Identifier>
       <Restrictions>
         <Restriction name="Database" />
@@ -574,7 +568,9 @@
         </AggregatedConcepts>
       </Properties>
       <Actions>
-        <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="MySql.Data.VisualStudio.MySqlDataObjectEnumerator" />
+        <Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="Microsoft.VisualStudio.Data.AdoDotNet.AdoDotNetObjectEnumerator">
+          <Parameter value="Procedure Parameters"/>
+        </Action>
       </Actions>
     </Type>