Fix review comments for PR microsoft#635

- Remove dead code: empty string case in errorsToStderr switch (unreachable due to early return)
- Add test for bare -r flag without argument to verify it defaults to 0

Author: dlevy-msft-sql

cmd/sqlcmd/sqlcmd.go

@@ -518,7 +518,7 @@ func normalizeFlags(cmd *cobra.Command) error {
 			}
 		case errorsToStderr:
 			switch v {
-			case "0", "1", "":
+			case "0", "1":
 				return pflag.NormalizedName(name)
 			default:
 				err = invalidParameterError("-r", v, "0", "1")

cmd/sqlcmd/sqlcmd_test.go

@@ -261,16 +261,36 @@ func TestErrorsToStderrDefaultValue(t *testing.T) {
 		SilenceUsage:  true,
 	}
 	setFlags(cmd, arguments)
-	// Test -r0 explicit
-	cmd.SetArgs([]string{"-r0"})
+	// Test -r alone (bare flag)
+	cmd.SetArgs(convertOsArgs([]string{"-r"}))
 	err := cmd.Execute()
+	assert.NoError(t, err, "-r should not error")
+	assert.NotNil(t, arguments.ErrorsToStderr, "ErrorsToStderr should be set when using -r alone")
+	assert.Equal(t, 0, *arguments.ErrorsToStderr, "-r alone should default to 0")
+
+	// Test -r0 explicit
+	arguments = &SQLCmdArguments{}
+	cmd2 := &cobra.Command{
+		Use: "testCommand",
+		PreRunE: func(cmd *cobra.Command, argss []string) error {
+			SetScreenWidthFlags(arguments, cmd)
+			return nil
+		},
+		Run: func(cmd *cobra.Command, argss []string) {
+		},
+		SilenceErrors: true,
+		SilenceUsage:  true,
+	}
+	setFlags(cmd2, arguments)
+	cmd2.SetArgs([]string{"-r0"})
+	err = cmd2.Execute()
 	assert.NoError(t, err, "-r0 should not error")
 	assert.NotNil(t, arguments.ErrorsToStderr, "ErrorsToStderr should be set")
 	assert.Equal(t, 0, *arguments.ErrorsToStderr, "-r0 should set value to 0")
 
 	// Test -r1 explicit
 	arguments = &SQLCmdArguments{}
-	cmd2 := &cobra.Command{
+	cmd3 := &cobra.Command{
 		Use: "testCommand",
 		PreRunE: func(cmd *cobra.Command, argss []string) error {
 			SetScreenWidthFlags(arguments, cmd)
@@ -281,9 +301,9 @@ func TestErrorsToStderrDefaultValue(t *testing.T) {
 		SilenceErrors: true,
 		SilenceUsage:  true,
 	}
-	setFlags(cmd2, arguments)
-	cmd2.SetArgs([]string{"-r1"})
-	err = cmd2.Execute()
+	setFlags(cmd3, arguments)
+	cmd3.SetArgs([]string{"-r1"})
+	err = cmd3.Execute()
 	assert.NoError(t, err, "-r1 should not error")
 	assert.NotNil(t, arguments.ErrorsToStderr, "ErrorsToStderr should be set")
 	assert.Equal(t, 1, *arguments.ErrorsToStderr, "-r1 should set value to 1")