Skip to content

Commit b011e51

Browse files
Copilotshueybubbles
andcommitted
Fix early return bug in isConsoleInitializationRequired function
Co-authored-by: shueybubbles <[email protected]>
1 parent 0fb01c4 commit b011e51

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

cmd/sqlcmd/sqlcmd.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -715,11 +715,7 @@ func setConnect(connect *sqlcmd.ConnectSettings, args *SQLCmdArguments, vars *sq
715715
}
716716

717717
func isConsoleInitializationRequired(connect *sqlcmd.ConnectSettings, args *SQLCmdArguments) (bool, bool) {
718-
// Password input always requires console initialization
719-
if connect.RequiresPassword() {
720-
// Need console for password, but that doesn't mean we're in interactive mode
721-
return true, false
722-
}
718+
needsConsole := false
723719

724720
// Check if stdin is from a terminal or a redirection
725721
isStdinRedirected := false
@@ -734,12 +730,15 @@ func isConsoleInitializationRequired(connect *sqlcmd.ConnectSettings, args *SQLC
734730
// Determine if we're in interactive mode
735731
iactive := args.InputFile == nil && args.Query == "" && len(args.ChangePasswordAndExit) == 0 && !isStdinRedirected
736732

737-
// If stdin is redirected, we don't need a console
738-
if isStdinRedirected {
739-
return false, false
733+
// Password input always requires console initialization
734+
if connect.RequiresPassword() {
735+
needsConsole = true
736+
} else if iactive {
737+
// Interactive mode also requires console
738+
needsConsole = true
740739
}
741740

742-
return iactive, iactive
741+
return needsConsole, iactive
743742
}
744743

745744
func run(vars *sqlcmd.Variables, args *SQLCmdArguments) (int, error) {

0 commit comments

Comments
 (0)