Skip to content

Automatically suppress line prompts when stdin is redirected #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stuartpa merged 5 commits into from
May 28, 2025
Merged

Automatically suppress line prompts when stdin is redirected #582

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c8331b
Initial plan for issue
Copilot May 22, 2025
adff5ef
Add --disable-prompts flag to suppress line prompts in non-interactiv…
Copilot May 22, 2025
2c454b5
Add detection of redirected stdin for proper interactive mode detection
Copilot May 22, 2025
36accd3
Implement stdin redirection detection in console.go instead of using …
Copilot May 22, 2025
b9540ca
Consolidate platform-specific console redirection code into a single …
Copilot May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmd/sqlcmd/sqlcmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ type SQLCmdArguments struct {
EnableColumnEncryption bool
ChangePassword string
ChangePasswordAndExit string
DisablePrompts bool
// Keep Help at the end of the list
Help bool
}
Expand Down Expand Up @@ -438,6 +439,7 @@ func setFlags(rootCmd *cobra.Command, args *SQLCmdArguments) {
rootCmd.Flags().BoolVarP(&args.EnableColumnEncryption, "enable-column-encryption", "g", false, localizer.Sprintf("Enable column encryption"))
rootCmd.Flags().StringVarP(&args.ChangePassword, "change-password", "z", "", localizer.Sprintf("New password"))
rootCmd.Flags().StringVarP(&args.ChangePasswordAndExit, "change-password-exit", "Z", "", localizer.Sprintf("New password and exit"))
rootCmd.Flags().BoolVar(&args.DisablePrompts, "disable-prompts", false, localizer.Sprintf("Disables line prompts when running as a subprocess"))
}

func setScriptVariable(v string) string {
Expand Down Expand Up @@ -738,6 +740,7 @@ func run(vars *sqlcmd.Variables, args *SQLCmdArguments) (int, error) {
s.SetupCloseHandler()
defer s.StopCloseHandler()
s.UnicodeOutputFile = args.UnicodeOutputFile
s.DisablePrompts = args.DisablePrompts

if args.DisableCmd != nil {
s.Cmd.DisableSysCommands(args.errorOnBlockedCmd())
Expand Down
6 changes: 5 additions & 1 deletion pkg/sqlcmd/sqlcmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ type Sqlcmd struct {
UnicodeOutputFile bool
// EchoInput tells the GO command to print the batch text before running the query
EchoInput bool
// DisablePrompts suppresses printing of line prompts like "1>" when running in non-interactive mode
DisablePrompts bool
colorizer color.Colorizer
termchan chan os.Signal
}
Expand Down Expand Up @@ -349,7 +351,9 @@ func (s *Sqlcmd) IncludeFile(path string, processAll bool) error {
ln = append(ln, line...)
}
if err == nil && echoFileLines {
_, _ = s.GetOutput().Write([]byte(s.Prompt()))
if !s.DisablePrompts {
_, _ = s.GetOutput().Write([]byte(s.Prompt()))
}
_, _ = s.GetOutput().Write(ln)
_, _ = s.GetOutput().Write([]byte(SqlcmdEol))
}
Expand Down