reverset GetCommand unification and call GetOptionsResetString manually

Author: campersau

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

@@ -463,7 +463,7 @@ private void BuildExecuteSql(
             SqlParameter sqlParam;
 
             // @batch_text
-            string text = GetCommandText(behavior);
+            string text = GetCommandText(behavior) + GetOptionsResetString(behavior);
             sqlParam = rpc.systemParams[0];
             sqlParam.SqlDbType = (text.Length << 1) <= TdsEnums.TYPE_SIZE_LIMIT
                 ? SqlDbType.NVarChar
@@ -1383,7 +1383,7 @@ private SqlDataReader RunExecuteReaderTds(
                             $"Command Text '{CommandText}'");
                     }
 
-                    string text = GetCommandText(cmdBehavior);
+                    string text = GetCommandText(cmdBehavior) + GetOptionsResetString(cmdBehavior);
 
                     // If the query requires enclave computations, pass the enclave package in the
                     // SqlBatch TDS stream

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

@@ -2566,7 +2566,7 @@ private string GetCommandText(CommandBehavior behavior)
             // to the sproc.
             Debug.Assert(CommandType is CommandType.Text,
                 "invalid call to GetCommandText for stored proc!");
-            return GetOptionsSetString(behavior) + CommandText + GetOptionsResetString(behavior);
+            return GetOptionsSetString(behavior) + CommandText;
         }
 
         private SqlParameterCollection GetCurrentParameterCollection()