diff --git a/cmd/sqlcmd/sqlcmd.go b/cmd/sqlcmd/sqlcmd.go index e0664955..81841b47 100644 --- a/cmd/sqlcmd/sqlcmd.go +++ b/cmd/sqlcmd/sqlcmd.go @@ -364,20 +364,20 @@ func checkDefaultValue(args []string, i int) (val string) { 'L': "|", // | is the sentinel for no value since users are unlikely to use it. It's "reserved" in most shells 'X': "0", } - if isFlag(args[i]) && len(args[i]) == 2 && (len(args) == i+1 || args[i+1][0] == '-') { + if isFlag(args[i]) && len(args[i]) == 2 && (len(args) == i+1 || isFlag(args[i+1])) { if v, ok := flags[rune(args[i][1])]; ok { val = v return } } - if args[i] == "-N" && (len(args) == i+1 || args[i+1][0] == '-') { + if args[i] == "-N" && (len(args) == i+1 || isFlag(args[i+1])) { val = "true" } return } func isFlag(arg string) bool { - return arg[0] == '-' + return len(arg) > 0 && arg[0] == '-' } func isListFlag(arg string) bool { diff --git a/cmd/sqlcmd/sqlcmd_test.go b/cmd/sqlcmd/sqlcmd_test.go index 2880e331..a30726cd 100644 --- a/cmd/sqlcmd/sqlcmd_test.go +++ b/cmd/sqlcmd/sqlcmd_test.go @@ -619,6 +619,28 @@ func TestConvertOsArgs(t *testing.T) { } } +func TestConvertOsArgsEmptyValues(t *testing.T) { + tests := []struct { + name string + args []string + want []string + }{ + {"empty password", []string{"-P", ""}, []string{"-P", ""}}, + {"connection options", []string{"-S", "server", "-U", "user", "-P", "", "-d", "database"}, []string{"-S", "server", "-U", "user", "-P", "", "-d", "database"}}, + {"empty server and user", []string{"-S", "", "-U", "", "-d", "database"}, []string{"-S", "", "-U", "", "-d", "database"}}, + {"empty argument", []string{""}, []string{""}}, + {"empty list values", []string{"-i", "", "file.sql", "-v", "", "x=y"}, []string{"-i", "", "-i", "file.sql", "-v", "", "-v", "x=y"}}, + {"empty optional values", []string{"-r", "", "-k", "", "-L", "", "-X", "", "-N", ""}, []string{"-r", "", "-k", "", "-L", "", "-X", "", "-N", ""}}, + {"optional defaults before flag", []string{"-r", "-N", "-C"}, []string{"-r", "0", "-N", "true", "-C"}}, + {"optional defaults at end", []string{"-X", "-N"}, []string{"-X", "0", "-N", "true"}}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + assert.Equal(t, tt.want, convertOsArgs(tt.args)) + }) + } +} + func TestPreprocessHelpFlags(t *testing.T) { type test struct { name string