Commit 82939b556d9 for nodejs
commit 82939b556d94f6d49e2b19155beccb83c8f83697
Author: James M Snell <jasnell@gmail.com>
Date: Sun Nov 15 18:04:11 2026 +0000
sqlite: share SQLTagStore statement preparation
SQLTagStore::Run(), Iterate(), Get(), and All() each duplicated the
database state checks, statement preparation, and parameter binding.
Move them into a shared PrepareForExecution() helper.
Assisted-by: Claude
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/67495
Reviewed-By: Guilherme Araújo <arauujogui@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc
index 58ae9410340..74fa2a55fe0 100644
--- a/src/node_sqlite.cc
+++ b/src/node_sqlite.cc
@@ -4375,7 +4375,8 @@ bool SQLTagStore::ResetAndBindStatement(
return true;
}
-void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
+void SQLTagStore::PrepareForExecution(const FunctionCallbackInfo<Value>& args,
+ BaseObjectPtr<Statement>* out) {
SQLTagStore* session;
ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
Environment* env = Environment::GetCurrent(args);
@@ -4396,6 +4397,17 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
return;
}
+ *out = std::move(stmt);
+}
+
+void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
+ BaseObjectPtr<Statement> stmt;
+ PrepareForExecution(args, &stmt);
+ if (!stmt) {
+ return;
+ }
+ Environment* env = Environment::GetCurrent(args);
+
Local<Object> result;
if (StatementExecutionHelper::Run(env, stmt.get()).ToLocal(&result)) {
args.GetReturnValue().Set(result);
@@ -4403,25 +4415,12 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
}
void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
- SQLTagStore* session;
- ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
- Environment* env = Environment::GetCurrent(args);
-
- THROW_AND_RETURN_ON_BAD_STATE(
- env, !session->database_->IsOpen(), "database is not open");
- THROW_AND_RETURN_IF_IN_AUTHORIZER(env, session->database_.get());
-
- BaseObjectPtr<Statement> stmt = PrepareStatement(args);
-
+ BaseObjectPtr<Statement> stmt;
+ PrepareForExecution(args, &stmt);
if (!stmt) {
return;
}
-
- THROW_AND_RETURN_IF_STEPPING(env, stmt.get());
-
- if (!ResetAndBindStatement(env, stmt.get(), args)) {
- return;
- }
+ Environment* env = Environment::GetCurrent(args);
BaseObjectPtr<StatementIterator> iter =
StatementExecutionHelper::Iterate(env, BaseObjectPtr<Statement>(stmt));
@@ -4434,25 +4433,12 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
}
void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
- SQLTagStore* session;
- ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
- Environment* env = Environment::GetCurrent(args);
-
- THROW_AND_RETURN_ON_BAD_STATE(
- env, !session->database_->IsOpen(), "database is not open");
- THROW_AND_RETURN_IF_IN_AUTHORIZER(env, session->database_.get());
-
- BaseObjectPtr<Statement> stmt = PrepareStatement(args);
-
+ BaseObjectPtr<Statement> stmt;
+ PrepareForExecution(args, &stmt);
if (!stmt) {
return;
}
-
- THROW_AND_RETURN_IF_STEPPING(env, stmt.get());
-
- if (!ResetAndBindStatement(env, stmt.get(), args)) {
- return;
- }
+ Environment* env = Environment::GetCurrent(args);
Local<Value> result;
if (StatementExecutionHelper::Get(env, stmt.get()).ToLocal(&result)) {
@@ -4461,25 +4447,12 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
}
void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
- SQLTagStore* session;
- ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
- Environment* env = Environment::GetCurrent(args);
-
- THROW_AND_RETURN_ON_BAD_STATE(
- env, !session->database_->IsOpen(), "database is not open");
- THROW_AND_RETURN_IF_IN_AUTHORIZER(env, session->database_.get());
-
- BaseObjectPtr<Statement> stmt = PrepareStatement(args);
-
+ BaseObjectPtr<Statement> stmt;
+ PrepareForExecution(args, &stmt);
if (!stmt) {
return;
}
-
- THROW_AND_RETURN_IF_STEPPING(env, stmt.get());
-
- if (!ResetAndBindStatement(env, stmt.get(), args)) {
- return;
- }
+ Environment* env = Environment::GetCurrent(args);
Isolate* isolate = env->isolate();
bool needs_reset = true;
diff --git a/src/node_sqlite.h b/src/node_sqlite.h
index 2bba70c3bba..c14a7c3cdea 100644
--- a/src/node_sqlite.h
+++ b/src/node_sqlite.h
@@ -534,6 +534,13 @@ class SQLTagStore : public BaseObject {
Environment* env,
Statement* stmt,
const v8::FunctionCallbackInfo<v8::Value>& args);
+ // Performs the state checks, statement preparation, and parameter binding
+ // shared by Run(), Iterate(), Get(), and All(). On success, `*out` is set to
+ // the prepared statement. On failure, a JavaScript exception is pending and
+ // `*out` is left empty.
+ static void PrepareForExecution(
+ const v8::FunctionCallbackInfo<v8::Value>& args,
+ BaseObjectPtr<Statement>* out);
BaseObjectWeakPtr<Database> database_;
LRUCache<std::string, BaseObjectPtr<Statement>> sql_tags_;
friend class StatementExecutionHelper;