Skip to content

Commit 0294ca1

Browse files
committed
swap errstr and errmsg
1 parent 71a8a57 commit 0294ca1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/node_sqlite.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
197197
Local<String> js_errstr;
198198
Local<String> js_errmsg;
199199
Local<Object> e;
200-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
201-
!String::NewFromUtf8(isolate, errmsg).ToLocal(&js_errstr) ||
200+
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
201+
!String::NewFromUtf8(isolate, errmsg).ToLocal(&js_errmsg) ||
202202
!CreateSQLiteError(isolate, message).ToLocal(&e) ||
203203
e->Set(isolate->GetCurrentContext(),
204204
Environment::GetCurrent(isolate)->errcode_string(),

test/parallel/test-sqlite-template-tag.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ test('sql.db returns the associated DatabaseSync instance', () => {
103103

104104
test('failed prepares throw', () => {
105105
assert.throws(() => {
106-
sql.all`SELECT * FROM does_not_exist`; // eslint-disable-line no-unused-expressions
106+
sql.all`SELECT * FROM does_not_exist`;
107107
}, {
108108
name: 'Error',
109109
message: 'Failed to prepare statement',
110110
code: 'ERR_SQLITE_ERROR',
111111
errcode: 1,
112-
errstr: 'no such table: does_not_exist',
113-
errmsg: 'SQL logic error'
112+
errstr: 'SQL logic error',
113+
errmsg: 'no such table: does_not_exist'
114114
});
115115
});

0 commit comments

Comments
 (0)