Skip to content

Commit 403f8eb

Browse files
authored
on error name back-compat with odbc (#192)
1 parent 6749e02 commit 403f8eb

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pkg/sqlcmd/commands.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func newCommands() Commands {
103103
isSystem: true,
104104
},
105105
"ONERROR": {
106-
regex: regexp.MustCompile(`(?im)^[\t ]*?:?ONERROR(?:[ \t]+(.*$)|$)`),
106+
regex: regexp.MustCompile(`(?im)^[\t ]*?:?ON ERROR(?:[ \t]+(.*$)|$)`),
107107
action: onerrorCommand,
108108
name: "ONERROR",
109109
},

pkg/sqlcmd/commands_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,22 +232,22 @@ func TestOnErrorCommand(t *testing.T) {
232232
s.SetOutput(buf)
233233
err := onerrorCommand(s, []string{""}, 1)
234234
assert.EqualError(t, err, InvalidCommandError("ON ERROR", 1).Error(), "onerrorCommand with empty content")
235-
err = runSqlCmd(t, s, []string{":ONERROR ignore", "printtgit N'message'", "SELECT @@versionn", "GO"})
235+
err = runSqlCmd(t, s, []string{":ON ERROR ignore", "printtgit N'message'", "SELECT @@versionn", "GO"})
236236
assert.NoError(t, err, "runSqlCmd")
237237
o := buf.buf.String()
238238
assert.Equal(t, 0, s.Exitcode, "ExitCode")
239239
assert.Contains(t, o, "Must declare the scalar variable \"@@versionn\"", "output not equal to expected")
240-
err = runSqlCmd(t, s, []string{":ONERROR exit", "printtgit N'message'", "SELECT @@versionn", "GO"})
240+
err = runSqlCmd(t, s, []string{":ON ERROR exit", "printtgit N'message'", "SELECT @@versionn", "GO"})
241241
assert.NoError(t, err, "runSqlCmd")
242242
assert.Equal(t, 1, s.Exitcode, "ExitCode")
243243
// -b sets ExitOnError true
244244
s.Connect.ExitOnError = true
245-
err = runSqlCmd(t, s, []string{":ONERROR ignore", "printtgit N'message'", "SELECT @@versionn", "GO"})
245+
err = runSqlCmd(t, s, []string{":ON ERROR ignore", "printtgit N'message'", "SELECT @@versionn", "GO"})
246246
// when ignore is set along with -b command , ignore takes precedence and resets ExitOnError
247247
assert.Equal(t, false, s.Connect.ExitOnError, "ExitOnError")
248248
assert.NoError(t, err, "runSqlCmd")
249249
// checking ExitonError with Exit option
250-
err = runSqlCmd(t, s, []string{":ONERROR exit", "printtgit N'message'", "SELECT @@versionn", "GO"})
250+
err = runSqlCmd(t, s, []string{":ON ERROR exit", "printtgit N'message'", "SELECT @@versionn", "GO"})
251251
assert.Equal(t, true, s.Connect.ExitOnError, "ExitOnError")
252252
assert.NoError(t, err, "runSqlCmd")
253253
}

0 commit comments

Comments
 (0)