Remove unnecessary validation logic (and covering test)

Author: edwardneal

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

@@ -114,7 +114,7 @@ protected override void AfterCleared(SqlCommand owner)
         }
 
         private string _commandText;
-        internal CommandType _commandType;
+        private CommandType _commandType;
         private int? _commandTimeout;
         private UpdateRowSource _updatedRowSource = UpdateRowSource.Both;
         private bool _designTimeInvisible;

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

@@ -119,7 +119,7 @@ protected override void AfterCleared(SqlCommand owner)
         }
 
         private string _commandText;
-        internal CommandType _commandType;
+        private CommandType _commandType;
         private int? _commandTimeout;
         private UpdateRowSource _updatedRowSource = UpdateRowSource.Both;
         private bool _designTimeInvisible;

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommandSet.cs

@@ -98,24 +98,16 @@ internal void Append(SqlCommand command)
         {
             ADP.CheckArgumentNull(command, nameof(command));
             SqlClientEventSource.Log.TryTraceEvent("SqlCommandSet.Append | API | Object Id {0}, Command '{1}', Parameter Count {2}", ObjectID, command.ObjectID, command.Parameters.Count);
+
+            // SqlCommandSet only supports commands of type Text or StoredProcedure. This aligns with SqlCommand (validated by its CommandType setter.)
+            Debug.Assert(command.CommandType is CommandType.Text or CommandType.StoredProcedure);
+
             string cmdText = command.CommandText;
             if (string.IsNullOrEmpty(cmdText))
             {
                 throw ADP.CommandTextRequired(nameof(Append));
             }
 
-            CommandType commandType = command.CommandType;
-            switch (commandType)
-            {
-                case CommandType.Text:
-                case CommandType.StoredProcedure:
-                    break;
-                case CommandType.TableDirect:
-                    throw SQL.NotSupportedCommandType(commandType);
-                default:
-                    throw ADP.InvalidCommandType(commandType);
-            }
-
             SqlParameterCollection parameters = null;
 
             SqlParameterCollection collection = command.Parameters;

src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlCommandSetTest.cs

@@ -42,36 +42,6 @@ public void AppendCommandWithEmptyString_Throws()
         Assert.Contains("CommandText property has not been initialized", ex.Message, StringComparison.OrdinalIgnoreCase);
     }
 
-    /// <summary>
-    /// Returns a set of invalid CommandType values.
-    /// </summary>
-    /// <see cref="AppendBadCommandType_Throws(CommandType)"/>
-    /// <remarks>
-    /// .NET Framework puts system enums in the Global Assembly Cache (GAC), and xUnit refuses to serialize enums that live there.
-    /// We make these system enum values a method, then disable enumeration of the test data to avoid warnings on the console when running tests.
-    /// </remarks>
-    public static TheoryData<CommandType> CommandTypeData()
-        => new(CommandType.TableDirect, (CommandType)5);
-
-    /// <summary>
-    /// Verifies that adding a SqlCommand with an invalid CommandType to a SqlCommandSet throws an ArgumentOutOfRangeException.
-    /// </summary>
-    [Theory]
-    [MemberData(
-        nameof(CommandTypeData)
-#if NETFRAMEWORK
-        , DisableDiscoveryEnumeration = true
-#endif
-        )]
-    public void AppendBadCommandType_Throws(CommandType commandType)
-    {
-        SqlCommandSet cmdSet = new();
-        using SqlCommand cmd = GenerateBadCommand(commandType);
-
-        ArgumentOutOfRangeException ex = Assert.Throws<ArgumentOutOfRangeException>(() => cmdSet.Append(cmd));
-        Assert.Contains("CommandType", ex.Message, StringComparison.OrdinalIgnoreCase);
-    }
-
     /// <summary>
     /// Verifies that adding a SqlCommand containing a SqlParameter with an invalid name to a SqlCommandSet throws an ArgumentException.
     /// </summary>
@@ -164,13 +134,4 @@ public void NotSupportedCommandBehaviorValidateCommandBehavior_Throws()
         ArgumentOutOfRangeException ex = Assert.Throws<ArgumentOutOfRangeException>(() => cmdSet.ValidateCommandBehavior("ExecuteNonQuery", CommandBehavior.KeyInfo));
         Assert.Contains("not supported", ex.Message, StringComparison.OrdinalIgnoreCase);
     }
-
-    private static SqlCommand GenerateBadCommand(CommandType cType)
-    {
-        SqlCommand cmd = new("Test");
-        // There's validation done on the CommandType property, but we need to create one that avoids the check for the test case.
-        cmd._commandType = cType;
-
-        return cmd;
-    }
 }