Fix 593

Author: David Shiflet (from Dev Box)

cmd/sqlcmd/sqlcmd.go

@@ -318,7 +318,7 @@ func checkDefaultValue(args []string, i int) (val string) {
 		'X': "0",
 		'N': "true",
 	}
-	if isFlag(args[i]) && (len(args) == i+1 || args[i+1][0] == '-') {
+	if isFlag(args[i]) && len(args[i]) == 2 && (len(args) == i+1 || args[i+1][0] == '-') {
 		if v, ok := flags[rune(args[i][1])]; ok {
 			val = v
 			return

cmd/sqlcmd/sqlcmd_test.go

@@ -556,6 +556,16 @@ func TestConvertOsArgs(t *testing.T) {
 			[]string{"-ifoo.sql", "bar.sql", "-V10", "-X", "-va=b", "c=d"},
 			[]string{"-ifoo.sql", "-i", "bar.sql", "-V10", "-X", "0", "-va=b", "-v", "c=d"},
 		},
+		{
+			"X1 k2",
+			[]string{"-X1", "-k2"},
+			[]string{"-X1", "-k2"},
+		},
+		{
+			"X k2",
+			[]string{"-X", "-k2"},
+			[]string{"-X", "0", "-k2"},
+		},
 	}
 	for _, c := range tests {
 		t.Run(c.name, func(t *testing.T) {