Merge | SqlCommand The Mop Up

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.netcore.cs

@@ -1124,37 +1124,6 @@ private static int GetParameterCount(SqlParameterCollection parameters)
             return parameters != null ? parameters.Count : 0;
         }
 
-        // Adds quotes to each part of a SQL identifier that may be multi-part, while leaving
-        //  the result as a single composite name.
-        private static string ParseAndQuoteIdentifier(string identifier, bool isUdtTypeName)
-        {
-            string[] strings = SqlParameter.ParseTypeName(identifier, isUdtTypeName);
-            return QuoteIdentifier(strings);
-        }
-
-        private static string QuoteIdentifier(ReadOnlySpan<string> strings)
-        {
-            StringBuilder bld = new StringBuilder();
-
-            // Stitching back together is a little tricky. Assume we want to build a full multi-part name
-            //  with all parts except trimming separators for leading empty names (null or empty strings,
-            //  but not whitespace). Separators in the middle should be added, even if the name part is 
-            //  null/empty, to maintain proper location of the parts.
-            for (int i = 0; i < strings.Length; i++)
-            {
-                if (0 < bld.Length)
-                {
-                    bld.Append('.');
-                }
-                if (strings[i] != null && 0 != strings[i].Length)
-                {
-                    ADP.AppendQuotedString(bld, "[", "]", strings[i]);
-                }
-            }
-
-            return bld.ToString();
-        }
-
         // returns set option text to turn on format only and key info on and off
         //  When we are executing as a text command, then we never need
         // to turn off the options since they command text is executed in the scope of sp_executesql.

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.netfx.cs

@@ -1072,7 +1072,7 @@ private void SetUpRPCParameters(_SqlRPC rpc, bool inSchema, SqlParameterCollecti
                                     parts[1] != null // server should not be null or we don't need to remove it
                                 )
                                 {
-                                    parameter.TypeName = QuoteIdentifier(parts, 2, 2);
+                                    parameter.TypeName = QuoteIdentifier(parts.AsSpan(2, 2));
                                 }
                             }
                         }
@@ -1135,37 +1135,6 @@ private static int GetParameterCount(SqlParameterCollection parameters)
             return parameters != null ? parameters.Count : 0;
         }
 
-        // Adds quotes to each part of a SQL identifier that may be multi-part, while leaving
-        //  the result as a single composite name.
-        private static string ParseAndQuoteIdentifier(string identifier, bool isUdtTypeName)
-        {
-            string[] strings = SqlParameter.ParseTypeName(identifier, isUdtTypeName);
-            return ADP.BuildMultiPartName(strings);
-        }
-
-        private static string QuoteIdentifier(string[] strings, int offset, int length)
-        {
-            StringBuilder bld = new StringBuilder();
-
-            // Stitching back together is a little tricky. Assume we want to build a full multi-part name
-            //  with all parts except trimming separators for leading empty names (null or empty strings,
-            //  but not whitespace). Separators in the middle should be added, even if the name part is 
-            //  null/empty, to maintain proper location of the parts.
-            for (int i = offset; i < (offset + length); i++)
-            {
-                if (0 < bld.Length)
-                {
-                    bld.Append('.');
-                }
-                if (strings[i] != null && 0 != strings[i].Length)
-                {
-                    ADP.AppendQuotedString(bld, "[", "]", strings[i]);
-                }
-            }
-
-            return bld.ToString();
-        }
-
         // returns set option text to turn on format only and key info on and off
         //  When we are executing as a text command, then we never need
         // to turn off the options since they command text is executed in the scope of sp_executesql.

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs

@@ -1592,6 +1592,39 @@ private static void OnDone(TdsParserStateObject stateObj, int index, IList<_SqlR
             current.warnings = stateObj._warnings;
         }
 
+        /// <summary>
+        /// Adds quotes to each part of a SQL identifier that may be multi-part, while leaving the
+        /// result as a single composite name.
+        /// </summary>
+        // @TODO: This little utility is either likely duplicated in other places, and likely belongs in some other class.
+        private static string ParseAndQuoteIdentifier(string identifier, bool isUdtTypeName) =>
+            QuoteIdentifier(SqlParameter.ParseTypeName(identifier, isUdtTypeName));
+
+        // @TODO: This little utility is either likely duplicated in other places, and likely belongs in some other class.
+        private static string QuoteIdentifier(ReadOnlySpan<string> strings)
+        {
+            // Stitching back together is a little tricky. Assume we want to build a full
+            // multipart name with all parts except trimming separators for leading empty names
+            // (null or empty strings, but not whitespace). Separators in the middle should be
+            // added, even if the name part is null/empty, to maintain proper location of the parts
+            StringBuilder builder = new StringBuilder();
+            for (int i = 0; i < strings.Length; i++)
+            {
+                if (builder.Length > 0)
+                {
+                    builder.Append('.');
+                }
+
+                string str = strings[i];
+                if (!string.IsNullOrEmpty(str))
+                {
+                    ADP.AppendQuotedString(builder, "[", "]", str);
+                }
+            }
+
+            return builder.ToString();
+        }
+
         /// <summary>
         /// Generates a parameter list string for use with sp_executesql, sp_prepare, and sp_prepexec.
         /// </summary>