Skip to content

sqlite: use DictionaryTemplate for run() result #61432

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 1 commit into from
Feb 5, 2026
Merged

sqlite: use DictionaryTemplate for run() result #61432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
sqlite: use DictionaryTemplate for run() result
  • Loading branch information
@mertcanaltin
mertcanaltin committed Jan 18, 2026
commit 232e9324c036998b4331a887695383ae3b609578
1 change: 1 addition & 0 deletions src/env_properties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@
V(socketaddress_constructor_template, v8::FunctionTemplate) \
V(space_stats_template, v8::DictionaryTemplate) \
V(sqlite_column_template, v8::DictionaryTemplate) \
V(sqlite_run_result_template, v8::DictionaryTemplate) \
V(sqlite_statement_sync_constructor_template, v8::FunctionTemplate) \
V(sqlite_statement_sync_iterator_constructor_template, v8::FunctionTemplate) \
V(sqlite_session_constructor_template, v8::FunctionTemplate) \
Expand Down
21 changes: 13 additions & 8 deletions src/node_sqlite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2305,7 +2305,7 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
sqlite3_step(stmt);
int r = sqlite3_reset(stmt);
CHECK_ERROR_OR_THROW(isolate, db, r, SQLITE_OK, MaybeLocal<Object>());
Local<Object> result = Object::New(isolate);

sqlite3_int64 last_insert_rowid = sqlite3_last_insert_rowid(db->Connection());
sqlite3_int64 changes = sqlite3_changes64(db->Connection());
Local<Value> last_insert_rowid_val;
Expand All @@ -2319,13 +2319,18 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
changes_val = Number::New(isolate, changes);
}

if (result
->Set(env->context(),
env->last_insert_rowid_string(),
last_insert_rowid_val)
.IsNothing() ||
result->Set(env->context(), env->changes_string(), changes_val)
.IsNothing()) {
auto run_result_template = env->sqlite_run_result_template();
if (run_result_template.IsEmpty()) {
static constexpr std::string_view run_result_keys[] = {"changes",
"lastInsertRowid"};
run_result_template = DictionaryTemplate::New(isolate, run_result_keys);
env->set_sqlite_run_result_template(run_result_template);
}

MaybeLocal<Value> values[] = {changes_val, last_insert_rowid_val};
Local<Object> result;
if (!NewDictionaryInstance(env->context(), run_result_template, values)
.ToLocal(&result)) {
return MaybeLocal<Object>();
}

Expand Down
Loading