Update isConsoleInitializationRequired to return both console and interactive status

Co-authored-by: shueybubbles <[email protected]>

Author: Copilot

cmd/sqlcmd/sqlcmd.go

@@ -714,25 +714,32 @@ func setConnect(connect *sqlcmd.ConnectSettings, args *SQLCmdArguments, vars *sq
 	}
 }
 
-func isConsoleInitializationRequired(connect *sqlcmd.ConnectSettings, args *SQLCmdArguments) bool {
+func isConsoleInitializationRequired(connect *sqlcmd.ConnectSettings, args *SQLCmdArguments) (bool, bool) {
 	// Password input always requires console initialization
 	if connect.RequiresPassword() {
-		return true
+		// Need console for password, but that doesn't mean we're in interactive mode
+		return true, false
 	}
 
 	// Check if stdin is from a terminal or a redirection
+	isStdinRedirected := false
 	file, err := os.Stdin.Stat()
 	if err == nil {
 		// If stdin is not a character device, it's coming from a pipe or redirect
 		if (file.Mode() & os.ModeCharDevice) == 0 {
-			// Non-interactive: stdin is redirected
-			return false
+			isStdinRedirected = true
 		}
 	}
 
-	// If we get here, stdin is from a terminal or we couldn't determine
-	iactive := args.InputFile == nil && args.Query == "" && len(args.ChangePasswordAndExit) == 0
-	return iactive
+	// Determine if we're in interactive mode
+	iactive := args.InputFile == nil && args.Query == "" && len(args.ChangePasswordAndExit) == 0 && !isStdinRedirected
+
+	// If stdin is redirected, we don't need a console
+	if isStdinRedirected {
+		return false, false
+	}
+
+	return iactive, iactive
 }
 
 func run(vars *sqlcmd.Variables, args *SQLCmdArguments) (int, error) {
@@ -744,7 +751,8 @@ func run(vars *sqlcmd.Variables, args *SQLCmdArguments) (int, error) {
 	var connectConfig sqlcmd.ConnectSettings
 	setConnect(&connectConfig, args, vars)
 	var line sqlcmd.Console = nil
-	if isConsoleInitializationRequired(&connectConfig, args) {
+	needsConsole, isInteractive := isConsoleInitializationRequired(&connectConfig, args)
+	if needsConsole {
 		line = console.NewConsole("")
 		defer line.Close()
 	}
@@ -835,15 +843,9 @@ func run(vars *sqlcmd.Variables, args *SQLCmdArguments) (int, error) {
 		}
 		iactive := args.InputFile == nil && args.Query == ""
 		if iactive || s.Query != "" {
-			processAll := false
-			if iactive {
-				// Check if stdin is a pipe rather than a terminal
-				fi, _ := os.Stdin.Stat()
-				if fi != nil && (fi.Mode()&os.ModeCharDevice) == 0 {
-					// Stdin is not a terminal, it's being piped in
-					processAll = true
-				}
-			}
+			// If we're not in interactive mode and stdin is redirected,
+			// we want to process all input without requiring GO statements
+			processAll := !isInteractive
 			err = s.Run(once, processAll)
 		} else {
 			for f := range args.InputFile {

cmd/sqlcmd/sqlcmd_test.go

@@ -506,7 +506,8 @@ func TestConditionsForPasswordPrompt(t *testing.T) {
 		setConnect(&connectConfig, &args, vars)
 		connectConfig.AuthenticationMethod = testcase.authenticationMethod
 		connectConfig.Password = testcase.pwd
-		assert.Equal(t, testcase.expectedResult, isConsoleInitializationRequired(&connectConfig, &args), "Unexpected test result encountered for console initialization")
+		needsConsole, _ := isConsoleInitializationRequired(&connectConfig, &args)
+		assert.Equal(t, testcase.expectedResult, needsConsole, "Unexpected test result encountered for console initialization")
 		assert.Equal(t, testcase.expectedResult, connectConfig.RequiresPassword() && connectConfig.Password == "", "Unexpected test result encountered for password prompt conditions")
 	}
 }

cmd/sqlcmd/stdin_console_test.go

@@ -56,13 +56,25 @@ func TestIsConsoleInitializationRequiredWithRedirectedStdin(t *testing.T) {
 	t.Logf("RequiresPassword() returns: %v", connectConfig.RequiresPassword())
 
 	// Test with SQL authentication that requires a password
-	res := isConsoleInitializationRequired(&connectConfig, args)
-	// Should be true since password is required, even with redirected stdin
-	assert.True(t, res, "Console initialization should be required when SQL authentication is used")
+	needsConsole, isInteractive := isConsoleInitializationRequired(&connectConfig, args)
+	// Should need console since password is required, but not be interactive
+	assert.True(t, needsConsole, "Console should be needed when SQL authentication is used")
+	assert.False(t, isInteractive, "Should not be interactive mode with redirected stdin")
 
 	// Now test with no authentication (no password required)
 	connectConfig = sqlcmd.ConnectSettings{}
-	res = isConsoleInitializationRequired(&connectConfig, args)
-	// Should be false since stdin is redirected and no password is required
-	assert.False(t, res, "Console initialization should not be required with redirected stdin and no password")
+	needsConsole, isInteractive = isConsoleInitializationRequired(&connectConfig, args)
+	// Should not need console and not be interactive
+	assert.False(t, needsConsole, "Console should not be needed with redirected stdin and no password")
+	assert.False(t, isInteractive, "Should not be interactive mode with redirected stdin")
+
+	// Test with direct terminal input (simulated by restoring original stdin)
+	os.Stdin = originalStdin
+	connectConfig = sqlcmd.ConnectSettings{} // No password needed
+	needsConsole, isInteractive = isConsoleInitializationRequired(&connectConfig, args)
+	// If no input file or query is specified, it should be interactive mode
+	assert.Equal(t, args.InputFile == nil && args.Query == "" && len(args.ChangePasswordAndExit) == 0, needsConsole,
+		"Console needs should match interactive mode requirements with terminal stdin")
+	assert.Equal(t, args.InputFile == nil && args.Query == "" && len(args.ChangePasswordAndExit) == 0, isInteractive,
+		"Interactive mode should be true with terminal stdin and no input files or queries")
 }