fix: apply FormatterOption values on the ascii result-format path

NewSQLCmdDefaultFormatter previously returned the ascii formatter without applying caller-supplied FormatterOption values, so -j raw-errors silently did nothing when the ascii output format was selected. Apply options to the embedded sqlCmdFormatterType in both branches and add a regression test.

Author: dlevy-msft-sql

pkg/sqlcmd/format.go

@@ -101,23 +101,29 @@ func WithRawErrors(raw bool) FormatterOption {
 
 // NewSQLCmdDefaultFormatter returns a Formatter based on the configuration.
 // It returns an ASCII formatter if the format is set to "ascii", otherwise it returns a formatter that mimics the original ODBC-based sqlcmd formatter.
-// Any FormatterOption values passed via opts (e.g. WithRawErrors) are applied to the ODBC-mimicking formatter; the ASCII formatter ignores them.
+// Any FormatterOption values (e.g. WithRawErrors) are applied to the returned formatter.
 func NewSQLCmdDefaultFormatter(vars *Variables, removeTrailingSpaces bool, ccb ControlCharacterBehavior, opts ...FormatterOption) Formatter {
 	if vars.Format() == "ascii" {
-		return NewSQLCmdAsciiFormatter(vars, removeTrailingSpaces, ccb)
+		f := NewSQLCmdAsciiFormatter(vars, removeTrailingSpaces, ccb).(*asciiFormatter)
+		applyFormatterOptions(f.sqlCmdFormatterType, opts)
+		return f
 	}
 	f := &sqlCmdFormatterType{
 		removeTrailingSpaces: removeTrailingSpaces,
 		format:               "horizontal",
 		colorizer:            color.New(false),
 		ccb:                  ccb,
 	}
+	applyFormatterOptions(f, opts)
+	return f
+}
+
+func applyFormatterOptions(f *sqlCmdFormatterType, opts []FormatterOption) {
 	for _, opt := range opts {
 		if opt != nil {
 			opt(f)
 		}
 	}
-	return f
 }
 
 // Adds the given string to the current line, wrapping it based on the screen width setting

pkg/sqlcmd/format_test.go

@@ -190,3 +190,17 @@ func TestAddErrorWithRawErrorsKeepsMssqlPrefix(t *testing.T) {
 	assert.Contains(t, got, "Msg 50000, Level 16, State 1, Server server, Line 7")
 	assert.Contains(t, got, "mssql: Something failed")
 }
+
+// TestAddErrorWithRawErrorsAppliesToAsciiFormatter guards against silently dropping
+// FormatterOption values when the caller has selected the ascii result format.
+func TestAddErrorWithRawErrorsAppliesToAsciiFormatter(t *testing.T) {
+	out, errOut := new(strings.Builder), new(strings.Builder)
+	vars := InitializeVariables(false)
+	vars.Set(SQLCMDFORMAT, "ascii")
+	f := NewSQLCmdDefaultFormatter(vars, false, ControlIgnore, WithRawErrors(true))
+	f.BeginBatch("", vars, out, errOut)
+
+	f.AddError(mssql.Error{Number: 50000, State: 1, Class: 16, Message: "Something failed", ServerName: "server", LineNo: 7})
+
+	assert.Contains(t, errOut.String(), "mssql: Something failed", "ascii formatter must honor WithRawErrors")
+}