Modified:
trunk/MySqlDataObjectSupport.xml
trunk/MySqlDataViewSupport.xml
Log:
Added minSourceVersion attributes to the proper type and node elements so that objects
such as stored procedures, sproc parameters, views, view columns, and triggers only show
if the connection is to a version of MySQL that supports them.
Modified: trunk/MySqlDataObjectSupport.xml
===================================================================
--- trunk/MySqlDataObjectSupport.xml 2006-11-28 22:37:48 UTC (rev 16)
+++ trunk/MySqlDataObjectSupport.xml 2006-11-28 22:39:15 UTC (rev 17)
@@ -90,12 +90,38 @@
<Property name="Comment" type="System.String" itemName="TABLE_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="Tables"/>
</Action>
+ <Action name="BuildDSRef" guid="7C030900-E8DD-471b-8F18-D83DA7036144"
handler="Microsoft.VisualStudio.Data.DSRefBuilder">
+ <Parameter>
+ <!--The name of the node (Identifier2 passed).-->
+ <Parameter value="{2}"/>
+ <!--The owner of the node.(Identifier1 passed).-->
+ <Parameter value="{1}"/>
+ <!--The node type.-->
+ <Parameter value="Table"/>
+ <!--The extended type of the node.-->
+ <Parameter/>
+ <!--
+ A collection of custom properties specified as child parameters where
+ the value is the GUID of the custom property and an embedded
+ parameter contains the value.
+ TODO: understand what it for
+ -->
+ <Parameter>
+ <!-- GUID_DSRefDisplayName_PreciseType -->
+ <Parameter value="39A5A7E7-513F-44a4-B79D-7652CD8962D9">
+ <Parameter value="101" type="System.Int32"/>
+ <!-- Table -->
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Action>
</Actions>
</Type>
- <Type name="View" defaultSort="Schema, Name">
+ <Type name="View" defaultSort="Schema, Name" minSourceVersion="5.0.0">
<Concepts>
<Concept name="View" restrictions="{Catalog},{Schema},{Name}" />
</Concepts>
@@ -144,7 +170,25 @@
<Property name="SecurityType" type="System.String" itemName="SECURITY_TYPE"
/>
</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="Views"/>
+ </Action>
+ <!-- <Action name="Enumerate"
guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="MySql.Data.VisualStudio.MySqlDataObjectEnumerator" />-->
+ <Action name="BuildDSRef" guid="7C030900-E8DD-471b-8F18-D83DA7036144"
handler="Microsoft.VisualStudio.Data.DSRefBuilder">
+ <Parameter>
+ <Parameter value="{2}"/>
+ <Parameter value="{1}"/>
+ <Parameter value="View"/>
+ <Parameter/>
+ <Parameter>
+ <!-- GUID_DSRefProperty_PreciseType -->
+ <Parameter value="39A5A7E7-513F-44a4-B79D-7652CD8962D9">
+ <Parameter value="301" type="System.Int32"/>
+ <!-- View -->
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Action>
</Actions>
</Type>
@@ -266,12 +310,67 @@
<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="Columns"/>
+ </Action>
+
+ <!-- <Action name="Enumerate"
guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="MySql.Data.VisualStudio.MySqlDataObjectEnumerator" />-->
+ <Action name="BuildDSRef" guid="7C030900-E8DD-471b-8F18-D83DA7036144"
handler="Microsoft.VisualStudio.Data.DSRefBuilder">
+ <Parameter>
+ <!-- The name of the node (Identifier2 passed) -->
+ <Parameter value="{2}" />
+ <!-- The owner of the node (Identifier1 passed) -->
+ <Parameter value="{1}" />
+ <!-- The node type -->
+ <Parameter value="Table" />
+ <!-- The extended type of the node -->
+ <Parameter />
+ <!--
+ A collection of custom properties specified as child parameters where
+ the value is the GUID of the custom property and an embedded
+ parameter contains the value
+ -->
+ <Parameter>
+ <!-- GUID_DSRefDisplayName_PreciseType -->
+ <Parameter value="39A5A7E7-513F-44a4-B79D-7652CD8962D9">
+ <Parameter value="101" type="System.Int32" />
+ <!-- Table -->
+ </Parameter>
+ </Parameter>
+ <!--
+ A collection of child nodes specified as child parameters
+ -->
+ <Parameter>
+ <Parameter>
+ <!--The name of the node (Identifier3 passed).-->
+ <Parameter value="{3}"/>
+ <!--The owner of the node.(Skiped because we are in child nodes
parameters).-->
+ <Parameter/>
+ <!--The node type.-->
+ <Parameter value="Field"/>
+ <!--The extended type of the node.-->
+ <Parameter/>
+ <!--
+ A collection of custom properties specified as child parameters
+ where the value is the GUID of the custom property and an
+ embedded parameter contains the value.
+ -->
+ <Parameter>
+ <!-- GUID_DSRefDisplayName_PreciseType -->
+ <Parameter value="39A5A7E7-513F-44a4-B79D-7652CD8962D9">
+ <Parameter value="102" type="System.Int32"/>
+ <!-- Table_Column -->
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Action>
</Actions>
</Type>
<!-- View column type -->
- <Type name="ViewColumn" defaultSort="Schema, View, Ordinal">
+ <Type name="ViewColumn" defaultSort="Schema, View, Ordinal"
minSourceVersion="5.0.0">
<Concepts>
<Concept name="ViewColumn" restrictions="{Catalog},{Schema},{View},{Name}"
/>
</Concepts>
@@ -383,11 +482,43 @@
</Properties>
<Actions>
<Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="MySql.Data.VisualStudio.MySqlDataObjectEnumerator" />
+ <Action name="BuildDSRef" guid="7C030900-E8DD-471b-8F18-D83DA7036144"
handler="Microsoft.VisualStudio.Data.DSRefBuilder">
+ <Parameter>
+ <Parameter value="{2}"/>
+ <Parameter value="{1}"/>
+ <Parameter value="View"/>
+ <Parameter/>
+
+ <Parameter>
+ <!-- GUID_DSRefProperty_PreciseType -->
+ <Parameter value="39A5A7E7-513F-44a4-B79D-7652CD8962D9">
+ <Parameter value="301" type="System.Int32"/>
+ <!-- View -->
+ </Parameter>
+ </Parameter>
+
+ <Parameter>
+ <Parameter>
+ <Parameter value="{3}"/>
+ <Parameter/>
+ <Parameter value="Field"/>
+ <Parameter/>
+ <Parameter>
+ <!-- GUID_DSRefProperty_PreciseType -->
+ <Parameter value="39A5A7E7-513F-44a4-B79D-7652CD8962D9">
+ <Parameter value="302" type="System.Int32"/>
+ <!-- View_Column -->
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Action>
</Actions>
</Type>
<!-- Stored procedure -->
- <Type name="StoredProcedure" defaultSort="Schema, Name">
+ <Type name="StoredProcedure" defaultSort="Schema, Name"
minSourceVersion="5.0.0">
<Concepts>
<Concept name="StoredProcedure" restrictions="{Catalog}, {Schema}, {Name},
PROCEDURE" />
<Concept name="TabularFunction" restrictions="{Catalog}, {Schema}, {Name},
PROCEDURE" />
@@ -465,7 +596,7 @@
</Type>
<!-- Stored procedure parameter -->
- <Type name="StoredProcedureParameter" defaultSort="Database, Schema,
StoredProcedure, Ordinal">
+ <Type name="StoredProcedureParameter" defaultSort="Database, Schema,
StoredProcedure, Ordinal" minSourceVersion="5.0.0">
<Concepts>
<Concept name="StoredProcedureParameter" restrictions="{Catalog}, {Schema},
{StoredProcedure}, PROCEDURE, {Name}" />
<Concept name="FunctionParameter" restrictions="{Catalog}, {Schema},
{StoredProcedure}, FUNCTION, {Name}" />
@@ -795,6 +926,32 @@
<Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="Microsoft.VisualStudio.Data.AdoDotNet.AdoDotNetObjectEnumerator">
<Parameter value="Indexes"/>
</Action>
+ <Action name="BuildDSRef" guid="7C030900-E8DD-471b-8F18-D83DA7036144"
handler="Microsoft.VisualStudio.Data.DSRefBuilder">
+ <Parameter>
+ <Parameter value="{2}"/>
+ <Parameter value="{1}"/>
+ <Parameter value="Table"/>
+ <Parameter/>
+ <Parameter>
+ <!-- GUID_DSRefProperty_Qualifier -->
+ <Parameter value="4656BAEA-F397-11ce-BFE1-00AA0057B34E">
+ <Parameter value="{0}"/>
+ </Parameter>
+ <!-- GUID_DSRefProperty_PreciseType -->
+ <Parameter value="39A5A7E7-513F-44a4-B79D-7652CD8962D9">
+ <Parameter value="101" type="System.Int32"/>
+ <!-- Table -->
+ </Parameter>
+ </Parameter>
+ <Parameter>
+ <Parameter>
+ <Parameter value="{3}"/>
+ <Parameter/>
+ <Parameter value="Index"/>
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Action>
</Actions>
</Type>
@@ -849,6 +1006,41 @@
<Action name="Enumerate" guid="61CC0372-384D-42e5-9707-6D7C8DC5287A"
handler="Microsoft.VisualStudio.Data.AdoDotNet.AdoDotNetObjectEnumerator">
<Parameter value="IndexColumns"/>
</Action>
+ <Action name="BuildDSRef" guid="7C030900-E8DD-471b-8F18-D83DA7036144"
handler="Microsoft.VisualStudio.Data.DSRefBuilder">
+ <Parameter>
+ <Parameter value="{2}"/>
+ <Parameter value="{1}"/>
+ <Parameter value="Table"/>
+ <Parameter/>
+ <Parameter>
+ <!-- GUID_DSRefProperty_Qualifier -->
+ <Parameter value="4656BAEA-F397-11ce-BFE1-00AA0057B34E">
+ <Parameter value="{0}"/>
+ </Parameter>
+ <!-- GUID_DSRefProperty_PreciseType -->
+ <Parameter value="39A5A7E7-513F-44a4-B79D-7652CD8962D9">
+ <Parameter value="101" type="System.Int32"/>
+ <!-- Table -->
+ </Parameter>
+ </Parameter>
+ <Parameter>
+ <Parameter>
+ <Parameter value="{3}"/>
+ <Parameter/>
+ <Parameter value="Index"/>
+ <Parameter/>
+ <Parameter/>
+ <Parameter>
+ <Parameter>
+ <Parameter value="{4}"/>
+ <Parameter/>
+ <Parameter value="Field"/>
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Parameter>
+ </Action>
</Actions>
</Type>
</Types>
Modified: trunk/MySqlDataViewSupport.xml
===================================================================
--- trunk/MySqlDataViewSupport.xml 2006-11-28 22:37:48 UTC (rev 16)
+++ trunk/MySqlDataViewSupport.xml 2006-11-28 22:39:15 UTC (rev 17)
@@ -81,7 +81,7 @@
<Icon name="Column" />
</SelectionNode>
</Selection>
- <Selection type="Trigger"
restrictions="{Table.Database},{Table.Schema},{Table.Name}">
+ <Selection type="Trigger"
restrictions="{Table.Database},{Table.Schema},{Table.Name}" minSourceVersion="5.1.0">
<SelectionNode>
<Icon name="Trigger" />
</SelectionNode>
@@ -94,7 +94,7 @@
<!--
Static "Views" node
-->
- <StaticNode nid="Views" autoBrowseObject="true">
+ <StaticNode nid="Views" autoBrowseObject="true" minSourceVersion="5.0.0">
<DisplayName resource="Node_Views" />
<CommandBindings>
<CommandBinding name="CreateView"
guid="B87CB51F-8A01-4c5e-BF3E-5D0565D5397D" cmdid="272"
handler="MySql.Data.VisualStudio.MySqlDataViewCommandHandler" />
@@ -110,7 +110,7 @@
<SelectionNode nid="View">
<Icon name="View" />
<Children>
- <Selection type="ViewColumn"
restrictions="{View.Database},{View.Schema},{View.Name}">
+ <Selection type="ViewColumn"
restrictions="{View.Database},{View.Schema},{View.Name}" minSourceVersion="5.0.0">
<SelectionNode>
<Icon name="Column" />
</SelectionNode>
@@ -122,17 +122,17 @@
</StaticNode>
<!-- Stored procedures -->
- <StaticNode nid="StoredProcedures" autoBrowseObject="true">
+ <StaticNode nid="StoredProcedures" autoBrowseObject="true"
minSourceVersion="5.0.0">
<DisplayName resource="Node_StoredProcedures" />
<CommandBindings>
<CommandBinding name="CreateStoredProcedure"
guid="B87CB51F-8A01-4c5e-BF3E-5D0565D5397D" cmdid="288"
handler="MySql.Data.VisualStudio.MySqlDataViewCommandHandler" />
</CommandBindings>
<Children>
- <Selection type="StoredProcedure"
restrictions="{Root.Database},{Root.Schema},null,PROCEDURE">
+ <Selection type="StoredProcedure"
restrictions="{Root.Database},{Root.Schema},null,PROCEDURE" minSourceVersion="5.0.0">
<SelectionNode nid="StoredProcedure">
<Icon name="StoredProcedure" />
<Children>
- <Selection type="StoredProcedureParameter"
restrictions="{StoredProcedure.Database},{StoredProcedure.Schema},{StoredProcedure.Name},PROCEDURE">
+ <Selection type="StoredProcedureParameter"
restrictions="{StoredProcedure.Database},{StoredProcedure.Schema},{StoredProcedure.Name},PROCEDURE"
minSourceVersion="5.0.0">
<SelectionNode>
<Icon when="{IsResult} = 'YES'" name="ReturnValue" />
<Icon when="{Mode} = 'IN'" name="InputParameter" />
@@ -147,17 +147,17 @@
</StaticNode>
<!-- Stored functions -->
- <StaticNode nid="Functions" autoBrowseObject="true">
+ <StaticNode nid="Functions" autoBrowseObject="true"
minSourceVersion="5.0.0">
<DisplayName resource="Node_Functions" />
<CommandBindings>
<CommandBinding name="CreateFunction"
guid="B87CB51F-8A01-4c5e-BF3E-5D0565D5397D" cmdid="304"
handler="MySql.Data.VisualStudio.MySqlDataViewCommandHandler" />
</CommandBindings>
<Children>
- <Selection type="StoredProcedure"
restrictions="{Root.Database},{Root.Schema},FUNCTION">
+ <Selection type="StoredProcedure"
restrictions="{Root.Database},{Root.Schema},FUNCTION" minSourceVersion="5.0.0">
<SelectionNode nid="StoredProcedure">
<Icon name="ScalarValuedFunction" />
<Children>
- <Selection type="StoredProcedureParameter"
restrictions="{StoredProcedure.Database},{StoredProcedure.Schema},{StoredProcedure.Name},FUNCTION">
+ <Selection type="StoredProcedureParameter"
restrictions="{StoredProcedure.Database},{StoredProcedure.Schema},{StoredProcedure.Name},FUNCTION"
minSourceVersion="5.0.0">
<SelectionNode>
<Icon when="{IsResult} = 'YES'" name="ReturnValue" />
<Icon when="{Mode} = 'IN'" name="InputParameter" />
| Thread |
|---|
| • Visual Studio Plugin commit: r17 - trunk | rburnett | 28 Nov |
