Connector/NET commit: r759 - in trunk/VisualStudio: Commands DocumentView/Documents

[rburnett]

Modified:
   trunk/VisualStudio/Commands/CreateNewFunctionCommand.cs
   trunk/VisualStudio/Commands/CreateNewProcedureCommand.cs
   trunk/VisualStudio/DocumentView/Documents/StoredProcDocument.cs
Log:
small fixes to make sure create new procedure and create new function still work

Modified: trunk/VisualStudio/Commands/CreateNewFunctionCommand.cs
===================================================================
--- trunk/VisualStudio/Commands/CreateNewFunctionCommand.cs	2007-06-14 16:31:04 UTC (rev 758)
+++ trunk/VisualStudio/Commands/CreateNewFunctionCommand.cs	2007-06-14 16:32:48 UTC (rev 759)
@@ -62,7 +62,7 @@
             if (schema == null)
                 return null;
 
-            return new object[] { null, schema, StoredProcDescriptor.Function, null };
+            return new object[] { null, schema, null };
         }
 
         /// <summary>
@@ -77,5 +77,13 @@
         {
             return "Function";
         }
+
+        protected override IDocument CreateDocument(ServerExplorerFacade hierarchy, string typeName, object[] objectID, bool isNew)
+        {
+            IDocument doc = base.CreateDocument(hierarchy, typeName, objectID, isNew);
+            StoredProcDocument spDoc = (doc as StoredProcDocument);
+            spDoc.IsFunction = true;
+            return doc;
+        }
     }
 }

Modified: trunk/VisualStudio/Commands/CreateNewProcedureCommand.cs
===================================================================
--- trunk/VisualStudio/Commands/CreateNewProcedureCommand.cs	2007-06-14 16:31:04 UTC (rev 758)
+++ trunk/VisualStudio/Commands/CreateNewProcedureCommand.cs	2007-06-14 16:32:48 UTC (rev 759)
@@ -62,7 +62,7 @@
             if (schema == null)
                 return null;
 
-            return new object[] { null, schema, StoredProcDescriptor.Procedure, null };
+            return new object[] { null, schema, null };
         }
     }
 }

Modified: trunk/VisualStudio/DocumentView/Documents/StoredProcDocument.cs
===================================================================
--- trunk/VisualStudio/DocumentView/Documents/StoredProcDocument.cs	2007-06-14 16:31:04 UTC (rev 758)
+++ trunk/VisualStudio/DocumentView/Documents/StoredProcDocument.cs	2007-06-14 16:32:48 UTC (rev 759)
@@ -165,6 +165,12 @@
         }
         #endregion
 
+        internal bool IsFunction
+        {
+            get { return typeVal == RoutineTypes.FUNCTION; }
+            set { typeVal = value ? RoutineTypes.FUNCTION : RoutineTypes.PROCEDURE; }
+        }
+
         #region Checking properties
         /// <summary>
         /// Checks if just a few certain characteristics of the routine have been 
@@ -443,10 +449,6 @@
         {
             get
             {
-                object typeStr = Hierarchy.Accessor.GetObjectProperty(
-                    HierarchyItemIDVal, "RoutineType");
-                typeVal = GetRoutineType(typeStr.ToString());
-
                 object[] id = ObjectID;
                 object[] newId = new object[4];
                 newId[0] = id[0];