sqlite: check sqlite3_step() and sqlite3_reset() results#63319

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
nodejs-github-bot merged 4 commits into from
Aug 11, 2026
+139 −14
Merged

sqlite: check sqlite3_step() and sqlite3_reset() results #63319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c683d0
sqlite: check sqlite3_step() and sqlite3_reset() results
semimikoh May 15, 2026
f369e87
sqlite: address review feedback on reset error handling
semimikoh Aug 7, 2026
1dd0a31
sqlite: set done_ before the checked reset in Next()
semimikoh Aug 9, 2026
90fe5e2
sqlite: fix build after rebase onto upstream refactor
semimikoh Aug 9, 2026
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
77 changes: 63 additions & 14 deletions src/node_sqlite.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,17 @@ inline MaybeLocal<String> Utf8StringMaybeOneByte(Isolate* isolate,
} \
} while (0)

#define RESET_OR_THROW(isolate, db, stmt, ret) \
CHECK_ERROR_OR_THROW((isolate), (db), sqlite3_reset((stmt)), SQLITE_OK, (ret))

// Surface deferred SQLite errors that sqlite3_reset() returns from the prior
// sqlite3_step(). Disables the safety-net reset guard via |needs_reset|.
#define RESET_AND_CHECK(isolate, db, stmt, needs_reset, ret) \
do { \
(needs_reset) = false; \
RESET_OR_THROW((isolate), (db), (stmt), (ret)); \
} while (0)

#define THROW_AND_RETURN_ON_BAD_STATE(env, condition, msg) \
do { \
if ((condition)) { \
Expand DownExpand Up@@ -3005,9 +3016,20 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
bool use_big_ints) {
Isolate* isolate = env->isolate();
EscapableHandleScope scope(isolate);
sqlite3_step(stmt);
int r = sqlite3_reset(stmt);
CHECK_ERROR_OR_THROW(isolate, db, r, SQLITE_OK, MaybeLocal<Object>());
bool needs_reset = true;
auto reset = OnScopeLeave([&]() {
if (needs_reset) sqlite3_reset(stmt);
});

int step_r = sqlite3_step(stmt);
// SQLITE_ROW is accepted here (and discarded) so that run() can still be
// used on RETURNING/SELECT statements, matching prior behavior of
// ignoring the step result entirely.
if (step_r != SQLITE_DONE && step_r != SQLITE_ROW) {
Comment thread
trivikr marked this conversation as resolved.
THROW_ERR_SQLITE_ERROR(isolate, db);
return MaybeLocal<Object>();
}
RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Object>());

sqlite3_int64 last_insert_rowid = sqlite3_last_insert_rowid(db->Connection());
sqlite3_int64 changes = sqlite3_changes64(db->Connection());
Expand DownExpand Up@@ -3081,18 +3103,25 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
bool use_big_ints) {
Isolate* isolate = env->isolate();
EscapableHandleScope scope(isolate);
auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt); });
bool needs_reset = true;
auto reset = OnScopeLeave([&]() {
if (needs_reset) sqlite3_reset(stmt);
});

int r = sqlite3_step(stmt);
if (r == SQLITE_DONE) return scope.Escape(Undefined(isolate));
if (r == SQLITE_DONE) {
RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
return scope.Escape(Undefined(isolate));
}
if (r != SQLITE_ROW) {
THROW_ERR_SQLITE_ERROR(isolate, db);
return MaybeLocal<Value>();
}

int num_cols = sqlite3_column_count(stmt);
if (num_cols == 0) {
return Undefined(isolate);
RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
return scope.Escape(Undefined(isolate));
}

LocalVector<Value> row_values(isolate);
Expand All@@ -3101,9 +3130,9 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
return MaybeLocal<Value>();
}

Local<Value> result;
if (return_arrays) {
return scope.Escape(
Array::New(isolate, row_values.data(), row_values.size()));
result = Array::New(isolate, row_values.data(), row_values.size());
} else {
LocalVector<Name> keys(isolate);
keys.reserve(num_cols);
Expand All@@ -3116,9 +3145,12 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
}

DCHECK_EQ(keys.size(), row_values.size());
return scope.Escape(Object::New(
isolate, Null(isolate), keys.data(), row_values.data(), num_cols));
result = Object::New(
isolate, Null(isolate), keys.data(), row_values.data(), num_cols);
}

RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
Comment thread
trivikr marked this conversation as resolved.
return scope.Escape(result);
}

void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -3135,15 +3167,19 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
return;
}

auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

bool needs_reset = true;
auto reset = OnScopeLeave([&]() {
if (needs_reset) sqlite3_reset(stmt->statement_);
});
Local<Value> result;
if (StatementExecutionHelper::All(env,
stmt->db_.get(),
stmt->statement_,
stmt->return_arrays_,
stmt->use_big_ints_)
.ToLocal(&result)) {
RESET_AND_CHECK(
isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
args.GetReturnValue().Set(result);
}
}
Expand DownExpand Up@@ -3577,14 +3613,20 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
return;
}

auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });
Isolate* isolate = env->isolate();
bool needs_reset = true;
auto reset = OnScopeLeave([&]() {
if (needs_reset) sqlite3_reset(stmt->statement_);
});
Local<Value> result;
if (StatementExecutionHelper::All(env,
stmt->db_.get(),
stmt->statement_,
stmt->return_arrays_,
stmt->use_big_ints_)
.ToLocal(&result)) {
RESET_AND_CHECK(
isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
args.GetReturnValue().Set(result);
}
}
Expand DownExpand Up@@ -3811,8 +3853,11 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
if (r != SQLITE_ROW) {
CHECK_ERROR_OR_THROW(
env->isolate(), iter->stmt_->db_.get(), r, SQLITE_DONE, void());
sqlite3_reset(iter->stmt_->statement_);
iter->done_ = true;
RESET_OR_THROW(env->isolate(),
Comment thread
trivikr marked this conversation as resolved.
iter->stmt_->db_.get(),
iter->stmt_->statement_,
void());
MaybeLocal<Value> values[] = {Boolean::New(isolate, true), Null(isolate)};
Local<Object> result;
if (NewDictionaryInstanceNullProto(env->context(), iter_template, values)
Expand DownExpand Up@@ -3864,6 +3909,10 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
env, iter->stmt_->IsFinalized(), "statement has been finalized");
Isolate* isolate = env->isolate();

// Unlike Next(), the reset result is intentionally ignored here: Return()
// is invoked by the language during abrupt completion (e.g. a `throw`
// inside a `for...of` body), and throwing on a deferred SQLite error
// would discard the caller's already-pending exception.
sqlite3_reset(iter->stmt_->statement_);
iter->done_ = true;

Expand Down
76 changes: 76 additions & 0 deletions test/parallel/test-sqlite-statement-sync.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,28 @@ suite('StatementSync.prototype.get()', () => {
message: /statement has been finalized/,
});
});

test('surfaces a deferred SQLite error from reset() even though a row was already built', (t) => {
using db = new DatabaseSync(':memory:');
db.exec(`
PRAGMA foreign_keys = ON;
PRAGMA defer_foreign_keys = ON;
CREATE TABLE parent(id INTEGER PRIMARY KEY);
CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
`);
// The FK check is deferred until the implicit transaction commits, which
// happens inside reset() here because RETURNING leaves the statement's
// VDBE running after the row is produced.
const stmt = db.prepare(
'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
);
t.assert.throws(() => {
stmt.get();
}, {
code: 'ERR_SQLITE_ERROR',
message: /FOREIGN KEY constraint failed/,
});
});
});

suite('StatementSync.prototype.all()', () => {
Expand DownExpand Up@@ -144,6 +166,25 @@ suite('StatementSync.prototype.all()', () => {
message: /statement has been finalized/,
});
});

test('surfaces a deferred SQLite error from reset() even though the array was already built', (t) => {
using db = new DatabaseSync(':memory:');
db.exec(`
PRAGMA foreign_keys = ON;
PRAGMA defer_foreign_keys = ON;
CREATE TABLE parent(id INTEGER PRIMARY KEY);
CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
`);
const stmt = db.prepare(
'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
);
t.assert.throws(() => {
stmt.all();
}, {
code: 'ERR_SQLITE_ERROR',
message: /FOREIGN KEY constraint failed/,
});
});
});

suite('StatementSync.prototype.iterate()', () => {
Expand DownExpand Up@@ -322,6 +363,41 @@ suite('StatementSync.prototype.iterate()', () => {
message: /statement has been finalized/,
});
});

test('does not replay results after the iterator is naturally exhausted', (t) => {
using db = new DatabaseSync(':memory:');
db.exec(`
CREATE TABLE test(key TEXT);
INSERT INTO test (key) VALUES ('key1');
`);
const it = db.prepare('SELECT * FROM test').iterate();
t.assert.deepStrictEqual(it.next(), {
__proto__: null, done: false, value: { __proto__: null, key: 'key1' },
});
t.assert.deepStrictEqual(
it.next(), { __proto__: null, done: true, value: null });
// Calling next() again on an exhausted iterator must keep reporting
// done, not silently reset the statement and replay from row 1.
t.assert.deepStrictEqual(
it.next(), { __proto__: null, done: true, value: null });
});

test('propagates a pending exception when the loop body throws mid-iteration', (t) => {
using db = new DatabaseSync(':memory:');
db.exec(`
CREATE TABLE test(key TEXT);
INSERT INTO test (key) VALUES ('key1');
INSERT INTO test (key) VALUES ('key2');
`);
const stmt = db.prepare('SELECT * FROM test');
const userError = new Error('boom');
t.assert.throws(() => {
// eslint-disable-next-line no-unused-vars
for (const row of stmt.iterate()) {
throw userError;
}
}, (err) => err === userError);
});
});

suite('StatementSync.prototype.run()', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
sqlite: check sqlite3_step() and sqlite3_reset() results#63319

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

nodejs-github-bot
merged 4 commits into

from

Aug 11, 2026

+139

−14

 Merged


sqlite: check sqlite3_step() and sqlite3_reset() results
#63319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6c683d0

sqlite: check sqlite3_step() and sqlite3_reset() results


semimikoh May 15, 2026
f369e87

sqlite: address review feedback on reset error handling


semimikoh Aug 7, 2026
1dd0a31

sqlite: set done_ before the checked reset in Next()


semimikoh Aug 9, 2026
90fe5e2

sqlite: fix build after rebase onto upstream refactor


semimikoh Aug 9, 2026

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


77 changes: 63 additions & 14 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,17 @@ inline MaybeLocal<String> Utf8StringMaybeOneByte(Isolate* isolate,
 } \
 } while (0)

#define RESET_OR_THROW(isolate, db, stmt, ret) \
 CHECK_ERROR_OR_THROW((isolate), (db), sqlite3_reset((stmt)), SQLITE_OK, (ret))

// Surface deferred SQLite errors that sqlite3_reset() returns from the prior
// sqlite3_step(). Disables the safety-net reset guard via |needs_reset|.
#define RESET_AND_CHECK(isolate, db, stmt, needs_reset, ret) \
 do { \
 (needs_reset) = false; \
 RESET_OR_THROW((isolate), (db), (stmt), (ret)); \
 } while (0)

#define THROW_AND_RETURN_ON_BAD_STATE(env, condition, msg) \
 do { \
 if ((condition)) { \
Expand DownExpand Up@@ -3005,9 +3016,20 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 sqlite3_step(stmt);
 int r = sqlite3_reset(stmt);
 CHECK_ERROR_OR_THROW(isolate, db, r, SQLITE_OK, MaybeLocal<Object>());
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int step_r = sqlite3_step(stmt);
 // SQLITE_ROW is accepted here (and discarded) so that run() can still be
 // used on RETURNING/SELECT statements, matching prior behavior of
 // ignoring the step result entirely.
 if (step_r != SQLITE_DONE && step_r != SQLITE_ROW) {
Comment thread
trivikr marked this conversation as resolved.

 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Object>();
 }
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Object>());

 sqlite3_int64 last_insert_rowid = sqlite3_last_insert_rowid(db->Connection());
 sqlite3_int64 changes = sqlite3_changes64(db->Connection());
Expand DownExpand Up@@ -3081,18 +3103,25 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt); });
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int r = sqlite3_step(stmt);
 if (r == SQLITE_DONE) return scope.Escape(Undefined(isolate));
 if (r == SQLITE_DONE) {
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }
 if (r != SQLITE_ROW) {
 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Value>();
 }

 int num_cols = sqlite3_column_count(stmt);
 if (num_cols == 0) {
 return Undefined(isolate);
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }

 LocalVector<Value> row_values(isolate);
Expand All@@ -3101,9 +3130,9 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 return MaybeLocal<Value>();
 }

 Local<Value> result;
 if (return_arrays) {
 return scope.Escape(
 Array::New(isolate, row_values.data(), row_values.size()));
 result = Array::New(isolate, row_values.data(), row_values.size());
 } else {
 LocalVector<Name> keys(isolate);
 keys.reserve(num_cols);
Expand All@@ -3116,9 +3145,12 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 }

 DCHECK_EQ(keys.size(), row_values.size());
return scope.Escape(Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols));
result = Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols);
 }

 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
Comment thread
trivikr marked this conversation as resolved.

 return scope.Escape(result);
}

void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -3135,15 +3167,19 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3577,14 +3613,20 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });
 Isolate* isolate = env->isolate();
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3811,8 +3853,11 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
 env->isolate(), iter->stmt_->db_.get(), r, SQLITE_DONE, void());
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;
 RESET_OR_THROW(env->isolate(),
Comment thread
trivikr marked this conversation as resolved.

 iter->stmt_->db_.get(),
 iter->stmt_->statement_,
 void());
 MaybeLocal<Value> values[] = {Boolean::New(isolate, true), Null(isolate)};
 Local<Object> result;
 if (NewDictionaryInstanceNullProto(env->context(), iter_template, values)
Expand DownExpand Up@@ -3864,6 +3909,10 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 Isolate* isolate = env->isolate();

 // Unlike Next(), the reset result is intentionally ignored here: Return()
 // is invoked by the language during abrupt completion (e.g. a `throw`
 // inside a `for...of` body), and throwing on a deferred SQLite error
 // would discard the caller's already-pending exception.
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;

Expand Down

76 changes: 76 additions & 0 deletions
test/parallel/test-sqlite-statement-sync.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,28 @@ suite('StatementSync.prototype.get()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though a row was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 // The FK check is deferred until the implicit transaction commits, which
 // happens inside reset() here because RETURNING leaves the statement's
 // VDBE running after the row is produced.
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.get();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.all()', () => {
Expand DownExpand Up@@ -144,6 +166,25 @@ suite('StatementSync.prototype.all()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though the array was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.all();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.iterate()', () => {
Expand DownExpand Up@@ -322,6 +363,41 @@ suite('StatementSync.prototype.iterate()', () => {
 message: /statement has been finalized/,
 });
 });

 test('does not replay results after the iterator is naturally exhausted', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 `);
 const it = db.prepare('SELECT * FROM test').iterate();
 t.assert.deepStrictEqual(it.next(), {
 __proto__: null, done: false, value: { __proto__: null, key: 'key1' },
 });
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 // Calling next() again on an exhausted iterator must keep reporting
 // done, not silently reset the statement and replay from row 1.
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 });

 test('propagates a pending exception when the loop body throws mid-iteration', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 INSERT INTO test (key) VALUES ('key2');
 `);
 const stmt = db.prepare('SELECT * FROM test');
 const userError = new Error('boom');
 t.assert.throws(() => {
 // eslint-disable-next-line no-unused-vars
 for (const row of stmt.iterate()) {
 throw userError;
 }
 }, (err) => err === userError);
 });
});

suite('StatementSync.prototype.run()', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
sqlite: check sqlite3_step() and sqlite3_reset() results#63319

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

nodejs-github-bot
merged 4 commits into

from

Aug 11, 2026

+139

−14

 Merged


sqlite: check sqlite3_step() and sqlite3_reset() results
#63319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6c683d0

sqlite: check sqlite3_step() and sqlite3_reset() results


semimikoh May 15, 2026
f369e87

sqlite: address review feedback on reset error handling


semimikoh Aug 7, 2026
1dd0a31

sqlite: set done_ before the checked reset in Next()


semimikoh Aug 9, 2026
90fe5e2

sqlite: fix build after rebase onto upstream refactor


semimikoh Aug 9, 2026

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


77 changes: 63 additions & 14 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,17 @@ inline MaybeLocal<String> Utf8StringMaybeOneByte(Isolate* isolate,
 } \
 } while (0)

#define RESET_OR_THROW(isolate, db, stmt, ret) \
 CHECK_ERROR_OR_THROW((isolate), (db), sqlite3_reset((stmt)), SQLITE_OK, (ret))

// Surface deferred SQLite errors that sqlite3_reset() returns from the prior
// sqlite3_step(). Disables the safety-net reset guard via |needs_reset|.
#define RESET_AND_CHECK(isolate, db, stmt, needs_reset, ret) \
 do { \
 (needs_reset) = false; \
 RESET_OR_THROW((isolate), (db), (stmt), (ret)); \
 } while (0)

#define THROW_AND_RETURN_ON_BAD_STATE(env, condition, msg) \
 do { \
 if ((condition)) { \
Expand DownExpand Up@@ -3005,9 +3016,20 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 sqlite3_step(stmt);
 int r = sqlite3_reset(stmt);
 CHECK_ERROR_OR_THROW(isolate, db, r, SQLITE_OK, MaybeLocal<Object>());
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int step_r = sqlite3_step(stmt);
 // SQLITE_ROW is accepted here (and discarded) so that run() can still be
 // used on RETURNING/SELECT statements, matching prior behavior of
 // ignoring the step result entirely.
 if (step_r != SQLITE_DONE && step_r != SQLITE_ROW) {
Comment thread
trivikr marked this conversation as resolved.

 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Object>();
 }
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Object>());

 sqlite3_int64 last_insert_rowid = sqlite3_last_insert_rowid(db->Connection());
 sqlite3_int64 changes = sqlite3_changes64(db->Connection());
Expand DownExpand Up@@ -3081,18 +3103,25 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt); });
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int r = sqlite3_step(stmt);
 if (r == SQLITE_DONE) return scope.Escape(Undefined(isolate));
 if (r == SQLITE_DONE) {
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }
 if (r != SQLITE_ROW) {
 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Value>();
 }

 int num_cols = sqlite3_column_count(stmt);
 if (num_cols == 0) {
 return Undefined(isolate);
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }

 LocalVector<Value> row_values(isolate);
Expand All@@ -3101,9 +3130,9 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 return MaybeLocal<Value>();
 }

 Local<Value> result;
 if (return_arrays) {
 return scope.Escape(
 Array::New(isolate, row_values.data(), row_values.size()));
 result = Array::New(isolate, row_values.data(), row_values.size());
 } else {
 LocalVector<Name> keys(isolate);
 keys.reserve(num_cols);
Expand All@@ -3116,9 +3145,12 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 }

 DCHECK_EQ(keys.size(), row_values.size());
return scope.Escape(Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols));
result = Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols);
 }

 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
Comment thread
trivikr marked this conversation as resolved.

 return scope.Escape(result);
}

void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -3135,15 +3167,19 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3577,14 +3613,20 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });
 Isolate* isolate = env->isolate();
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3811,8 +3853,11 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
 env->isolate(), iter->stmt_->db_.get(), r, SQLITE_DONE, void());
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;
 RESET_OR_THROW(env->isolate(),
Comment thread
trivikr marked this conversation as resolved.

 iter->stmt_->db_.get(),
 iter->stmt_->statement_,
 void());
 MaybeLocal<Value> values[] = {Boolean::New(isolate, true), Null(isolate)};
 Local<Object> result;
 if (NewDictionaryInstanceNullProto(env->context(), iter_template, values)
Expand DownExpand Up@@ -3864,6 +3909,10 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 Isolate* isolate = env->isolate();

 // Unlike Next(), the reset result is intentionally ignored here: Return()
 // is invoked by the language during abrupt completion (e.g. a `throw`
 // inside a `for...of` body), and throwing on a deferred SQLite error
 // would discard the caller's already-pending exception.
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;

Expand Down

76 changes: 76 additions & 0 deletions
test/parallel/test-sqlite-statement-sync.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,28 @@ suite('StatementSync.prototype.get()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though a row was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 // The FK check is deferred until the implicit transaction commits, which
 // happens inside reset() here because RETURNING leaves the statement's
 // VDBE running after the row is produced.
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.get();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.all()', () => {
Expand DownExpand Up@@ -144,6 +166,25 @@ suite('StatementSync.prototype.all()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though the array was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.all();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.iterate()', () => {
Expand DownExpand Up@@ -322,6 +363,41 @@ suite('StatementSync.prototype.iterate()', () => {
 message: /statement has been finalized/,
 });
 });

 test('does not replay results after the iterator is naturally exhausted', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 `);
 const it = db.prepare('SELECT * FROM test').iterate();
 t.assert.deepStrictEqual(it.next(), {
 __proto__: null, done: false, value: { __proto__: null, key: 'key1' },
 });
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 // Calling next() again on an exhausted iterator must keep reporting
 // done, not silently reset the statement and replay from row 1.
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 });

 test('propagates a pending exception when the loop body throws mid-iteration', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 INSERT INTO test (key) VALUES ('key2');
 `);
 const stmt = db.prepare('SELECT * FROM test');
 const userError = new Error('boom');
 t.assert.throws(() => {
 // eslint-disable-next-line no-unused-vars
 for (const row of stmt.iterate()) {
 throw userError;
 }
 }, (err) => err === userError);
 });
});

suite('StatementSync.prototype.run()', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
sqlite: check sqlite3_step() and sqlite3_reset() results#63319

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

nodejs-github-bot
merged 4 commits into

from

Aug 11, 2026

+139

−14

 Merged


sqlite: check sqlite3_step() and sqlite3_reset() results
#63319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6c683d0

sqlite: check sqlite3_step() and sqlite3_reset() results


semimikoh May 15, 2026
f369e87

sqlite: address review feedback on reset error handling


semimikoh Aug 7, 2026
1dd0a31

sqlite: set done_ before the checked reset in Next()


semimikoh Aug 9, 2026
90fe5e2

sqlite: fix build after rebase onto upstream refactor


semimikoh Aug 9, 2026

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


77 changes: 63 additions & 14 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,17 @@ inline MaybeLocal<String> Utf8StringMaybeOneByte(Isolate* isolate,
 } \
 } while (0)

#define RESET_OR_THROW(isolate, db, stmt, ret) \
 CHECK_ERROR_OR_THROW((isolate), (db), sqlite3_reset((stmt)), SQLITE_OK, (ret))

// Surface deferred SQLite errors that sqlite3_reset() returns from the prior
// sqlite3_step(). Disables the safety-net reset guard via |needs_reset|.
#define RESET_AND_CHECK(isolate, db, stmt, needs_reset, ret) \
 do { \
 (needs_reset) = false; \
 RESET_OR_THROW((isolate), (db), (stmt), (ret)); \
 } while (0)

#define THROW_AND_RETURN_ON_BAD_STATE(env, condition, msg) \
 do { \
 if ((condition)) { \
Expand DownExpand Up@@ -3005,9 +3016,20 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 sqlite3_step(stmt);
 int r = sqlite3_reset(stmt);
 CHECK_ERROR_OR_THROW(isolate, db, r, SQLITE_OK, MaybeLocal<Object>());
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int step_r = sqlite3_step(stmt);
 // SQLITE_ROW is accepted here (and discarded) so that run() can still be
 // used on RETURNING/SELECT statements, matching prior behavior of
 // ignoring the step result entirely.
 if (step_r != SQLITE_DONE && step_r != SQLITE_ROW) {
Comment thread
trivikr marked this conversation as resolved.

 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Object>();
 }
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Object>());

 sqlite3_int64 last_insert_rowid = sqlite3_last_insert_rowid(db->Connection());
 sqlite3_int64 changes = sqlite3_changes64(db->Connection());
Expand DownExpand Up@@ -3081,18 +3103,25 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt); });
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int r = sqlite3_step(stmt);
 if (r == SQLITE_DONE) return scope.Escape(Undefined(isolate));
 if (r == SQLITE_DONE) {
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }
 if (r != SQLITE_ROW) {
 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Value>();
 }

 int num_cols = sqlite3_column_count(stmt);
 if (num_cols == 0) {
 return Undefined(isolate);
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }

 LocalVector<Value> row_values(isolate);
Expand All@@ -3101,9 +3130,9 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 return MaybeLocal<Value>();
 }

 Local<Value> result;
 if (return_arrays) {
 return scope.Escape(
 Array::New(isolate, row_values.data(), row_values.size()));
 result = Array::New(isolate, row_values.data(), row_values.size());
 } else {
 LocalVector<Name> keys(isolate);
 keys.reserve(num_cols);
Expand All@@ -3116,9 +3145,12 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 }

 DCHECK_EQ(keys.size(), row_values.size());
return scope.Escape(Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols));
result = Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols);
 }

 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
Comment thread
trivikr marked this conversation as resolved.

 return scope.Escape(result);
}

void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -3135,15 +3167,19 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3577,14 +3613,20 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });
 Isolate* isolate = env->isolate();
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3811,8 +3853,11 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
 env->isolate(), iter->stmt_->db_.get(), r, SQLITE_DONE, void());
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;
 RESET_OR_THROW(env->isolate(),
Comment thread
trivikr marked this conversation as resolved.

 iter->stmt_->db_.get(),
 iter->stmt_->statement_,
 void());
 MaybeLocal<Value> values[] = {Boolean::New(isolate, true), Null(isolate)};
 Local<Object> result;
 if (NewDictionaryInstanceNullProto(env->context(), iter_template, values)
Expand DownExpand Up@@ -3864,6 +3909,10 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 Isolate* isolate = env->isolate();

 // Unlike Next(), the reset result is intentionally ignored here: Return()
 // is invoked by the language during abrupt completion (e.g. a `throw`
 // inside a `for...of` body), and throwing on a deferred SQLite error
 // would discard the caller's already-pending exception.
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;

Expand Down

76 changes: 76 additions & 0 deletions
test/parallel/test-sqlite-statement-sync.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,28 @@ suite('StatementSync.prototype.get()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though a row was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 // The FK check is deferred until the implicit transaction commits, which
 // happens inside reset() here because RETURNING leaves the statement's
 // VDBE running after the row is produced.
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.get();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.all()', () => {
Expand DownExpand Up@@ -144,6 +166,25 @@ suite('StatementSync.prototype.all()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though the array was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.all();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.iterate()', () => {
Expand DownExpand Up@@ -322,6 +363,41 @@ suite('StatementSync.prototype.iterate()', () => {
 message: /statement has been finalized/,
 });
 });

 test('does not replay results after the iterator is naturally exhausted', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 `);
 const it = db.prepare('SELECT * FROM test').iterate();
 t.assert.deepStrictEqual(it.next(), {
 __proto__: null, done: false, value: { __proto__: null, key: 'key1' },
 });
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 // Calling next() again on an exhausted iterator must keep reporting
 // done, not silently reset the statement and replay from row 1.
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 });

 test('propagates a pending exception when the loop body throws mid-iteration', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 INSERT INTO test (key) VALUES ('key2');
 `);
 const stmt = db.prepare('SELECT * FROM test');
 const userError = new Error('boom');
 t.assert.throws(() => {
 // eslint-disable-next-line no-unused-vars
 for (const row of stmt.iterate()) {
 throw userError;
 }
 }, (err) => err === userError);
 });
});

suite('StatementSync.prototype.run()', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
sqlite: check sqlite3_step() and sqlite3_reset() results#63319

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

nodejs-github-bot
merged 4 commits into

from

Aug 11, 2026

+139

−14

 Merged


sqlite: check sqlite3_step() and sqlite3_reset() results
#63319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6c683d0

sqlite: check sqlite3_step() and sqlite3_reset() results


semimikoh May 15, 2026
f369e87

sqlite: address review feedback on reset error handling


semimikoh Aug 7, 2026
1dd0a31

sqlite: set done_ before the checked reset in Next()


semimikoh Aug 9, 2026
90fe5e2

sqlite: fix build after rebase onto upstream refactor


semimikoh Aug 9, 2026

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


77 changes: 63 additions & 14 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,17 @@ inline MaybeLocal<String> Utf8StringMaybeOneByte(Isolate* isolate,
 } \
 } while (0)

#define RESET_OR_THROW(isolate, db, stmt, ret) \
 CHECK_ERROR_OR_THROW((isolate), (db), sqlite3_reset((stmt)), SQLITE_OK, (ret))

// Surface deferred SQLite errors that sqlite3_reset() returns from the prior
// sqlite3_step(). Disables the safety-net reset guard via |needs_reset|.
#define RESET_AND_CHECK(isolate, db, stmt, needs_reset, ret) \
 do { \
 (needs_reset) = false; \
 RESET_OR_THROW((isolate), (db), (stmt), (ret)); \
 } while (0)

#define THROW_AND_RETURN_ON_BAD_STATE(env, condition, msg) \
 do { \
 if ((condition)) { \
Expand DownExpand Up@@ -3005,9 +3016,20 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 sqlite3_step(stmt);
 int r = sqlite3_reset(stmt);
 CHECK_ERROR_OR_THROW(isolate, db, r, SQLITE_OK, MaybeLocal<Object>());
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int step_r = sqlite3_step(stmt);
 // SQLITE_ROW is accepted here (and discarded) so that run() can still be
 // used on RETURNING/SELECT statements, matching prior behavior of
 // ignoring the step result entirely.
 if (step_r != SQLITE_DONE && step_r != SQLITE_ROW) {
Comment thread
trivikr marked this conversation as resolved.

 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Object>();
 }
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Object>());

 sqlite3_int64 last_insert_rowid = sqlite3_last_insert_rowid(db->Connection());
 sqlite3_int64 changes = sqlite3_changes64(db->Connection());
Expand DownExpand Up@@ -3081,18 +3103,25 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt); });
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int r = sqlite3_step(stmt);
 if (r == SQLITE_DONE) return scope.Escape(Undefined(isolate));
 if (r == SQLITE_DONE) {
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }
 if (r != SQLITE_ROW) {
 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Value>();
 }

 int num_cols = sqlite3_column_count(stmt);
 if (num_cols == 0) {
 return Undefined(isolate);
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }

 LocalVector<Value> row_values(isolate);
Expand All@@ -3101,9 +3130,9 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 return MaybeLocal<Value>();
 }

 Local<Value> result;
 if (return_arrays) {
 return scope.Escape(
 Array::New(isolate, row_values.data(), row_values.size()));
 result = Array::New(isolate, row_values.data(), row_values.size());
 } else {
 LocalVector<Name> keys(isolate);
 keys.reserve(num_cols);
Expand All@@ -3116,9 +3145,12 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 }

 DCHECK_EQ(keys.size(), row_values.size());
return scope.Escape(Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols));
result = Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols);
 }

 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
Comment thread
trivikr marked this conversation as resolved.

 return scope.Escape(result);
}

void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -3135,15 +3167,19 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3577,14 +3613,20 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });
 Isolate* isolate = env->isolate();
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3811,8 +3853,11 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
 env->isolate(), iter->stmt_->db_.get(), r, SQLITE_DONE, void());
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;
 RESET_OR_THROW(env->isolate(),
Comment thread
trivikr marked this conversation as resolved.

 iter->stmt_->db_.get(),
 iter->stmt_->statement_,
 void());
 MaybeLocal<Value> values[] = {Boolean::New(isolate, true), Null(isolate)};
 Local<Object> result;
 if (NewDictionaryInstanceNullProto(env->context(), iter_template, values)
Expand DownExpand Up@@ -3864,6 +3909,10 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 Isolate* isolate = env->isolate();

 // Unlike Next(), the reset result is intentionally ignored here: Return()
 // is invoked by the language during abrupt completion (e.g. a `throw`
 // inside a `for...of` body), and throwing on a deferred SQLite error
 // would discard the caller's already-pending exception.
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;

Expand Down

76 changes: 76 additions & 0 deletions
test/parallel/test-sqlite-statement-sync.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,28 @@ suite('StatementSync.prototype.get()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though a row was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 // The FK check is deferred until the implicit transaction commits, which
 // happens inside reset() here because RETURNING leaves the statement's
 // VDBE running after the row is produced.
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.get();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.all()', () => {
Expand DownExpand Up@@ -144,6 +166,25 @@ suite('StatementSync.prototype.all()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though the array was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.all();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.iterate()', () => {
Expand DownExpand Up@@ -322,6 +363,41 @@ suite('StatementSync.prototype.iterate()', () => {
 message: /statement has been finalized/,
 });
 });

 test('does not replay results after the iterator is naturally exhausted', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 `);
 const it = db.prepare('SELECT * FROM test').iterate();
 t.assert.deepStrictEqual(it.next(), {
 __proto__: null, done: false, value: { __proto__: null, key: 'key1' },
 });
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 // Calling next() again on an exhausted iterator must keep reporting
 // done, not silently reset the statement and replay from row 1.
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 });

 test('propagates a pending exception when the loop body throws mid-iteration', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 INSERT INTO test (key) VALUES ('key2');
 `);
 const stmt = db.prepare('SELECT * FROM test');
 const userError = new Error('boom');
 t.assert.throws(() => {
 // eslint-disable-next-line no-unused-vars
 for (const row of stmt.iterate()) {
 throw userError;
 }
 }, (err) => err === userError);
 });
});

suite('StatementSync.prototype.run()', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
sqlite: check sqlite3_step() and sqlite3_reset() results#63319

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

nodejs-github-bot
merged 4 commits into

from

Aug 11, 2026

+139

−14

 Merged


sqlite: check sqlite3_step() and sqlite3_reset() results
#63319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6c683d0

sqlite: check sqlite3_step() and sqlite3_reset() results


semimikoh May 15, 2026
f369e87

sqlite: address review feedback on reset error handling


semimikoh Aug 7, 2026
1dd0a31

sqlite: set done_ before the checked reset in Next()


semimikoh Aug 9, 2026
90fe5e2

sqlite: fix build after rebase onto upstream refactor


semimikoh Aug 9, 2026

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


77 changes: 63 additions & 14 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,17 @@ inline MaybeLocal<String> Utf8StringMaybeOneByte(Isolate* isolate,
 } \
 } while (0)

#define RESET_OR_THROW(isolate, db, stmt, ret) \
 CHECK_ERROR_OR_THROW((isolate), (db), sqlite3_reset((stmt)), SQLITE_OK, (ret))

// Surface deferred SQLite errors that sqlite3_reset() returns from the prior
// sqlite3_step(). Disables the safety-net reset guard via |needs_reset|.
#define RESET_AND_CHECK(isolate, db, stmt, needs_reset, ret) \
 do { \
 (needs_reset) = false; \
 RESET_OR_THROW((isolate), (db), (stmt), (ret)); \
 } while (0)

#define THROW_AND_RETURN_ON_BAD_STATE(env, condition, msg) \
 do { \
 if ((condition)) { \
Expand DownExpand Up@@ -3005,9 +3016,20 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 sqlite3_step(stmt);
 int r = sqlite3_reset(stmt);
 CHECK_ERROR_OR_THROW(isolate, db, r, SQLITE_OK, MaybeLocal<Object>());
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int step_r = sqlite3_step(stmt);
 // SQLITE_ROW is accepted here (and discarded) so that run() can still be
 // used on RETURNING/SELECT statements, matching prior behavior of
 // ignoring the step result entirely.
 if (step_r != SQLITE_DONE && step_r != SQLITE_ROW) {
Comment thread
trivikr marked this conversation as resolved.

 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Object>();
 }
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Object>());

 sqlite3_int64 last_insert_rowid = sqlite3_last_insert_rowid(db->Connection());
 sqlite3_int64 changes = sqlite3_changes64(db->Connection());
Expand DownExpand Up@@ -3081,18 +3103,25 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt); });
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int r = sqlite3_step(stmt);
 if (r == SQLITE_DONE) return scope.Escape(Undefined(isolate));
 if (r == SQLITE_DONE) {
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }
 if (r != SQLITE_ROW) {
 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Value>();
 }

 int num_cols = sqlite3_column_count(stmt);
 if (num_cols == 0) {
 return Undefined(isolate);
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }

 LocalVector<Value> row_values(isolate);
Expand All@@ -3101,9 +3130,9 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 return MaybeLocal<Value>();
 }

 Local<Value> result;
 if (return_arrays) {
 return scope.Escape(
 Array::New(isolate, row_values.data(), row_values.size()));
 result = Array::New(isolate, row_values.data(), row_values.size());
 } else {
 LocalVector<Name> keys(isolate);
 keys.reserve(num_cols);
Expand All@@ -3116,9 +3145,12 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 }

 DCHECK_EQ(keys.size(), row_values.size());
return scope.Escape(Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols));
result = Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols);
 }

 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
Comment thread
trivikr marked this conversation as resolved.

 return scope.Escape(result);
}

void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -3135,15 +3167,19 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3577,14 +3613,20 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });
 Isolate* isolate = env->isolate();
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3811,8 +3853,11 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
 env->isolate(), iter->stmt_->db_.get(), r, SQLITE_DONE, void());
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;
 RESET_OR_THROW(env->isolate(),
Comment thread
trivikr marked this conversation as resolved.

 iter->stmt_->db_.get(),
 iter->stmt_->statement_,
 void());
 MaybeLocal<Value> values[] = {Boolean::New(isolate, true), Null(isolate)};
 Local<Object> result;
 if (NewDictionaryInstanceNullProto(env->context(), iter_template, values)
Expand DownExpand Up@@ -3864,6 +3909,10 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 Isolate* isolate = env->isolate();

 // Unlike Next(), the reset result is intentionally ignored here: Return()
 // is invoked by the language during abrupt completion (e.g. a `throw`
 // inside a `for...of` body), and throwing on a deferred SQLite error
 // would discard the caller's already-pending exception.
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;

Expand Down

76 changes: 76 additions & 0 deletions
test/parallel/test-sqlite-statement-sync.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,28 @@ suite('StatementSync.prototype.get()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though a row was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 // The FK check is deferred until the implicit transaction commits, which
 // happens inside reset() here because RETURNING leaves the statement's
 // VDBE running after the row is produced.
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.get();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.all()', () => {
Expand DownExpand Up@@ -144,6 +166,25 @@ suite('StatementSync.prototype.all()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though the array was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.all();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.iterate()', () => {
Expand DownExpand Up@@ -322,6 +363,41 @@ suite('StatementSync.prototype.iterate()', () => {
 message: /statement has been finalized/,
 });
 });

 test('does not replay results after the iterator is naturally exhausted', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 `);
 const it = db.prepare('SELECT * FROM test').iterate();
 t.assert.deepStrictEqual(it.next(), {
 __proto__: null, done: false, value: { __proto__: null, key: 'key1' },
 });
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 // Calling next() again on an exhausted iterator must keep reporting
 // done, not silently reset the statement and replay from row 1.
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 });

 test('propagates a pending exception when the loop body throws mid-iteration', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 INSERT INTO test (key) VALUES ('key2');
 `);
 const stmt = db.prepare('SELECT * FROM test');
 const userError = new Error('boom');
 t.assert.throws(() => {
 // eslint-disable-next-line no-unused-vars
 for (const row of stmt.iterate()) {
 throw userError;
 }
 }, (err) => err === userError);
 });
});

suite('StatementSync.prototype.run()', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
sqlite: check sqlite3_step() and sqlite3_reset() results#63319

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

nodejs-github-bot
merged 4 commits into

from

Aug 11, 2026

+139

−14

 Merged


sqlite: check sqlite3_step() and sqlite3_reset() results
#63319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6c683d0

sqlite: check sqlite3_step() and sqlite3_reset() results


semimikoh May 15, 2026
f369e87

sqlite: address review feedback on reset error handling


semimikoh Aug 7, 2026
1dd0a31

sqlite: set done_ before the checked reset in Next()


semimikoh Aug 9, 2026
90fe5e2

sqlite: fix build after rebase onto upstream refactor


semimikoh Aug 9, 2026

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


77 changes: 63 additions & 14 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,17 @@ inline MaybeLocal<String> Utf8StringMaybeOneByte(Isolate* isolate,
 } \
 } while (0)

#define RESET_OR_THROW(isolate, db, stmt, ret) \
 CHECK_ERROR_OR_THROW((isolate), (db), sqlite3_reset((stmt)), SQLITE_OK, (ret))

// Surface deferred SQLite errors that sqlite3_reset() returns from the prior
// sqlite3_step(). Disables the safety-net reset guard via |needs_reset|.
#define RESET_AND_CHECK(isolate, db, stmt, needs_reset, ret) \
 do { \
 (needs_reset) = false; \
 RESET_OR_THROW((isolate), (db), (stmt), (ret)); \
 } while (0)

#define THROW_AND_RETURN_ON_BAD_STATE(env, condition, msg) \
 do { \
 if ((condition)) { \
Expand DownExpand Up@@ -3005,9 +3016,20 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 sqlite3_step(stmt);
 int r = sqlite3_reset(stmt);
 CHECK_ERROR_OR_THROW(isolate, db, r, SQLITE_OK, MaybeLocal<Object>());
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int step_r = sqlite3_step(stmt);
 // SQLITE_ROW is accepted here (and discarded) so that run() can still be
 // used on RETURNING/SELECT statements, matching prior behavior of
 // ignoring the step result entirely.
 if (step_r != SQLITE_DONE && step_r != SQLITE_ROW) {
Comment thread
trivikr marked this conversation as resolved.

 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Object>();
 }
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Object>());

 sqlite3_int64 last_insert_rowid = sqlite3_last_insert_rowid(db->Connection());
 sqlite3_int64 changes = sqlite3_changes64(db->Connection());
Expand DownExpand Up@@ -3081,18 +3103,25 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt); });
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int r = sqlite3_step(stmt);
 if (r == SQLITE_DONE) return scope.Escape(Undefined(isolate));
 if (r == SQLITE_DONE) {
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }
 if (r != SQLITE_ROW) {
 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Value>();
 }

 int num_cols = sqlite3_column_count(stmt);
 if (num_cols == 0) {
 return Undefined(isolate);
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }

 LocalVector<Value> row_values(isolate);
Expand All@@ -3101,9 +3130,9 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 return MaybeLocal<Value>();
 }

 Local<Value> result;
 if (return_arrays) {
 return scope.Escape(
 Array::New(isolate, row_values.data(), row_values.size()));
 result = Array::New(isolate, row_values.data(), row_values.size());
 } else {
 LocalVector<Name> keys(isolate);
 keys.reserve(num_cols);
Expand All@@ -3116,9 +3145,12 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 }

 DCHECK_EQ(keys.size(), row_values.size());
return scope.Escape(Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols));
result = Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols);
 }

 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
Comment thread
trivikr marked this conversation as resolved.

 return scope.Escape(result);
}

void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -3135,15 +3167,19 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3577,14 +3613,20 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });
 Isolate* isolate = env->isolate();
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3811,8 +3853,11 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
 env->isolate(), iter->stmt_->db_.get(), r, SQLITE_DONE, void());
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;
 RESET_OR_THROW(env->isolate(),
Comment thread
trivikr marked this conversation as resolved.

 iter->stmt_->db_.get(),
 iter->stmt_->statement_,
 void());
 MaybeLocal<Value> values[] = {Boolean::New(isolate, true), Null(isolate)};
 Local<Object> result;
 if (NewDictionaryInstanceNullProto(env->context(), iter_template, values)
Expand DownExpand Up@@ -3864,6 +3909,10 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 Isolate* isolate = env->isolate();

 // Unlike Next(), the reset result is intentionally ignored here: Return()
 // is invoked by the language during abrupt completion (e.g. a `throw`
 // inside a `for...of` body), and throwing on a deferred SQLite error
 // would discard the caller's already-pending exception.
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;

Expand Down

76 changes: 76 additions & 0 deletions
test/parallel/test-sqlite-statement-sync.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,28 @@ suite('StatementSync.prototype.get()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though a row was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 // The FK check is deferred until the implicit transaction commits, which
 // happens inside reset() here because RETURNING leaves the statement's
 // VDBE running after the row is produced.
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.get();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.all()', () => {
Expand DownExpand Up@@ -144,6 +166,25 @@ suite('StatementSync.prototype.all()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though the array was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.all();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.iterate()', () => {
Expand DownExpand Up@@ -322,6 +363,41 @@ suite('StatementSync.prototype.iterate()', () => {
 message: /statement has been finalized/,
 });
 });

 test('does not replay results after the iterator is naturally exhausted', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 `);
 const it = db.prepare('SELECT * FROM test').iterate();
 t.assert.deepStrictEqual(it.next(), {
 __proto__: null, done: false, value: { __proto__: null, key: 'key1' },
 });
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 // Calling next() again on an exhausted iterator must keep reporting
 // done, not silently reset the statement and replay from row 1.
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 });

 test('propagates a pending exception when the loop body throws mid-iteration', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 INSERT INTO test (key) VALUES ('key2');
 `);
 const stmt = db.prepare('SELECT * FROM test');
 const userError = new Error('boom');
 t.assert.throws(() => {
 // eslint-disable-next-line no-unused-vars
 for (const row of stmt.iterate()) {
 throw userError;
 }
 }, (err) => err === userError);
 });
});

suite('StatementSync.prototype.run()', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
sqlite: check sqlite3_step() and sqlite3_reset() results#63319

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

nodejs-github-bot
merged 4 commits into

from

Aug 11, 2026

+139

−14

 Merged


sqlite: check sqlite3_step() and sqlite3_reset() results
#63319
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
6c683d0

sqlite: check sqlite3_step() and sqlite3_reset() results


semimikoh May 15, 2026
f369e87

sqlite: address review feedback on reset error handling


semimikoh Aug 7, 2026
1dd0a31

sqlite: set done_ before the checked reset in Next()


semimikoh Aug 9, 2026
90fe5e2

sqlite: fix build after rebase onto upstream refactor


semimikoh Aug 9, 2026

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


77 changes: 63 additions & 14 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,17 @@ inline MaybeLocal<String> Utf8StringMaybeOneByte(Isolate* isolate,
 } \
 } while (0)

#define RESET_OR_THROW(isolate, db, stmt, ret) \
 CHECK_ERROR_OR_THROW((isolate), (db), sqlite3_reset((stmt)), SQLITE_OK, (ret))

// Surface deferred SQLite errors that sqlite3_reset() returns from the prior
// sqlite3_step(). Disables the safety-net reset guard via |needs_reset|.
#define RESET_AND_CHECK(isolate, db, stmt, needs_reset, ret) \
 do { \
 (needs_reset) = false; \
 RESET_OR_THROW((isolate), (db), (stmt), (ret)); \
 } while (0)

#define THROW_AND_RETURN_ON_BAD_STATE(env, condition, msg) \
 do { \
 if ((condition)) { \
Expand DownExpand Up@@ -3005,9 +3016,20 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 sqlite3_step(stmt);
 int r = sqlite3_reset(stmt);
 CHECK_ERROR_OR_THROW(isolate, db, r, SQLITE_OK, MaybeLocal<Object>());
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int step_r = sqlite3_step(stmt);
 // SQLITE_ROW is accepted here (and discarded) so that run() can still be
 // used on RETURNING/SELECT statements, matching prior behavior of
 // ignoring the step result entirely.
 if (step_r != SQLITE_DONE && step_r != SQLITE_ROW) {
Comment thread
trivikr marked this conversation as resolved.

 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Object>();
 }
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Object>());

 sqlite3_int64 last_insert_rowid = sqlite3_last_insert_rowid(db->Connection());
 sqlite3_int64 changes = sqlite3_changes64(db->Connection());
Expand DownExpand Up@@ -3081,18 +3103,25 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 bool use_big_ints) {
 Isolate* isolate = env->isolate();
 EscapableHandleScope scope(isolate);
 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt); });
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt);
 });

 int r = sqlite3_step(stmt);
 if (r == SQLITE_DONE) return scope.Escape(Undefined(isolate));
 if (r == SQLITE_DONE) {
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }
 if (r != SQLITE_ROW) {
 THROW_ERR_SQLITE_ERROR(isolate, db);
 return MaybeLocal<Value>();
 }

 int num_cols = sqlite3_column_count(stmt);
 if (num_cols == 0) {
 return Undefined(isolate);
 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
 return scope.Escape(Undefined(isolate));
 }

 LocalVector<Value> row_values(isolate);
Expand All@@ -3101,9 +3130,9 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 return MaybeLocal<Value>();
 }

 Local<Value> result;
 if (return_arrays) {
 return scope.Escape(
 Array::New(isolate, row_values.data(), row_values.size()));
 result = Array::New(isolate, row_values.data(), row_values.size());
 } else {
 LocalVector<Name> keys(isolate);
 keys.reserve(num_cols);
Expand All@@ -3116,9 +3145,12 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
 }

 DCHECK_EQ(keys.size(), row_values.size());
return scope.Escape(Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols));
result = Object::New(
 isolate, Null(isolate), keys.data(), row_values.data(), num_cols);
 }

 RESET_AND_CHECK(isolate, db, stmt, needs_reset, MaybeLocal<Value>());
Comment thread
trivikr marked this conversation as resolved.

 return scope.Escape(result);
}

void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
Expand All@@ -3135,15 +3167,19 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3577,14 +3613,20 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });
 Isolate* isolate = env->isolate();
 bool needs_reset = true;
 auto reset = OnScopeLeave([&]() {
 if (needs_reset) sqlite3_reset(stmt->statement_);
 });
 Local<Value> result;
 if (StatementExecutionHelper::All(env,
 stmt->db_.get(),
 stmt->statement_,
 stmt->return_arrays_,
 stmt->use_big_ints_)
 .ToLocal(&result)) {
 RESET_AND_CHECK(
 isolate, stmt->db_.get(), stmt->statement_, needs_reset, void());
 args.GetReturnValue().Set(result);
 }
}
Expand DownExpand Up@@ -3811,8 +3853,11 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
 env->isolate(), iter->stmt_->db_.get(), r, SQLITE_DONE, void());
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;
 RESET_OR_THROW(env->isolate(),
Comment thread
trivikr marked this conversation as resolved.

 iter->stmt_->db_.get(),
 iter->stmt_->statement_,
 void());
 MaybeLocal<Value> values[] = {Boolean::New(isolate, true), Null(isolate)};
 Local<Object> result;
 if (NewDictionaryInstanceNullProto(env->context(), iter_template, values)
Expand DownExpand Up@@ -3864,6 +3909,10 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 Isolate* isolate = env->isolate();

 // Unlike Next(), the reset result is intentionally ignored here: Return()
 // is invoked by the language during abrupt completion (e.g. a `throw`
 // inside a `for...of` body), and throwing on a deferred SQLite error
 // would discard the caller's already-pending exception.
 sqlite3_reset(iter->stmt_->statement_);
 iter->done_ = true;

Expand Down

76 changes: 76 additions & 0 deletions
test/parallel/test-sqlite-statement-sync.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,28 @@ suite('StatementSync.prototype.get()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though a row was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 // The FK check is deferred until the implicit transaction commits, which
 // happens inside reset() here because RETURNING leaves the statement's
 // VDBE running after the row is produced.
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.get();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.all()', () => {
Expand DownExpand Up@@ -144,6 +166,25 @@ suite('StatementSync.prototype.all()', () => {
 message: /statement has been finalized/,
 });
 });

 test('surfaces a deferred SQLite error from reset() even though the array was already built', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 PRAGMA foreign_keys = ON;
 PRAGMA defer_foreign_keys = ON;
 CREATE TABLE parent(id INTEGER PRIMARY KEY);
 CREATE TABLE child(id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parent(id));
 `);
 const stmt = db.prepare(
 'INSERT INTO child (parent_id) VALUES (999) RETURNING id'
 );
 t.assert.throws(() => {
 stmt.all();
 }, {
 code: 'ERR_SQLITE_ERROR',
 message: /FOREIGN KEY constraint failed/,
 });
 });
});

suite('StatementSync.prototype.iterate()', () => {
Expand DownExpand Up@@ -322,6 +363,41 @@ suite('StatementSync.prototype.iterate()', () => {
 message: /statement has been finalized/,
 });
 });

 test('does not replay results after the iterator is naturally exhausted', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 `);
 const it = db.prepare('SELECT * FROM test').iterate();
 t.assert.deepStrictEqual(it.next(), {
 __proto__: null, done: false, value: { __proto__: null, key: 'key1' },
 });
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 // Calling next() again on an exhausted iterator must keep reporting
 // done, not silently reset the statement and replay from row 1.
 t.assert.deepStrictEqual(
 it.next(), { __proto__: null, done: true, value: null });
 });

 test('propagates a pending exception when the loop body throws mid-iteration', (t) => {
 using db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE test(key TEXT);
 INSERT INTO test (key) VALUES ('key1');
 INSERT INTO test (key) VALUES ('key2');
 `);
 const stmt = db.prepare('SELECT * FROM test');
 const userError = new Error('boom');
 t.assert.throws(() => {
 // eslint-disable-next-line no-unused-vars
 for (const row of stmt.iterate()) {
 throw userError;
 }
 }, (err) => err === userError);
 });
});

suite('StatementSync.prototype.run()', () => {
Expand Down
Loading