sqlite: refactor error helpers and user function pointers#62794

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 2 commits into from
Aug 8, 2026
+57 −66
Merged

sqlite: refactor error helpers and user function pointers #62794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36eab2b
sqlite: refactor error helpers and user function pointers
thisalihassan Apr 17, 2026
43d0172
sqlite: fixed compilation error
thisalihassan Aug 6, 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
119 changes: 55 additions & 64 deletions src/node_sqlite.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
return nullptr;
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
const char* message) {
namespace {
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
const char* message,
const char* errstr,
int errcode) {
Environment* env = Environment::GetCurrent(isolate);
Local<Context> context = isolate->GetCurrentContext();
Local<String> js_msg;
Local<Object> e;
Environment* env = Environment::GetCurrent(isolate);
if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
!Exception::Error(js_msg)
->ToObject(isolate->GetCurrentContext())
.ToLocal(&e) ||
e->Set(isolate->GetCurrentContext(),
env->code_string(),
env->err_sqlite_error_string())
!Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
e->Set(context, env->code_string(), env->err_sqlite_error_string())
.IsNothing()) {
return MaybeLocal<Object>();
}

if (errstr != nullptr) {
Local<String> js_errstr;
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
.IsNothing() ||
e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
return MaybeLocal<Object>();
}
}
return e;
}
} // namespace

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
const char* message) {
return CreateSQLiteErrorImpl(isolate, message, nullptr, 0);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
const char* errstr = sqlite3_errstr(errcode);
Local<String> js_errmsg;
Local<Object> e;
Environment* env = Environment::GetCurrent(isolate);
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
!CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
e->Set(env->context(),
env->errcode_string(),
Integer::New(isolate, errcode))
.IsNothing() ||
e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
return MaybeLocal<Object>();
}
return e;
return CreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
int errcode = sqlite3_extended_errcode(db);
const char* errstr = sqlite3_errstr(errcode);
const char* errmsg = sqlite3_errmsg(db);
Local<String> js_errmsg;
Local<Object> e;
Environment* env = Environment::GetCurrent(isolate);
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
!CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
e->Set(isolate->GetCurrentContext(),
env->errcode_string(),
Integer::New(isolate, errcode))
.IsNothing() ||
e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
.IsNothing()) {
return MaybeLocal<Object>();
}
return e;
return CreateSQLiteErrorImpl(
isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
}

void JSValueToSQLiteResult(Isolate* isolate,
Expand DownExpand Up@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
class CustomAggregate {
public:
explicit CustomAggregate(Environment* env,
DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
bool use_bigint_args,
Local<Value> start,
Local<Function> step_fn,
Local<Function> inverse_fn,
Local<Function> result_fn)
: env_(env),
db_(db),
db_(std::move(db)),
use_bigint_args_(use_bigint_args),
start_(env->isolate(), start),
step_fn_(env->isolate(), step_fn),
Expand DownExpand Up@@ -350,7 +340,7 @@ class CustomAggregate {
Global<Function> CustomAggregate::*mptr) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
CallbackDepthGuard guard(self->db_.get());
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -408,7 +398,7 @@ class CustomAggregate {
static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
CustomAggregate* self =
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
CallbackDepthGuard guard(self->db_.get());
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -487,7 +477,7 @@ class CustomAggregate {
}

Environment* env_;
DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
bool use_bigint_args_;
Global<Value> start_;
Global<Function> step_fn_;
Expand DownExpand Up@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {

UserDefinedFunction::UserDefinedFunction(Environment* env,
Local<Function> fn,
DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
bool use_bigint_args)
: env_(env),
fn_(env->isolate(), fn),
db_(db),
db_(std::move(db)),
use_bigint_args_(use_bigint_args) {}

UserDefinedFunction::~UserDefinedFunction() {}
Expand All@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
sqlite3_value** argv) {
UserDefinedFunction* self =
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
CallbackDepthGuard guard(self->db_);
CallbackDepthGuard guard(self->db_.get());
Environment* env = self->env_;
Isolate* isolate = env->isolate();
auto recv = Undefined(isolate);
Expand DownExpand Up@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
argc = js_len.As<Int32>()->Value();
}

UserDefinedFunction* user_data =
new UserDefinedFunction(env, fn, db, use_bigint_args);
UserDefinedFunction* user_data = new UserDefinedFunction(
env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
int text_rep = SQLITE_UTF8;

if (deterministic) {
Expand DownExpand Up@@ -2057,22 +2047,23 @@ void DatabaseSync::AggregateFunction(const FunctionCallbackInfo<Value>& args) {

auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
int r = sqlite3_create_window_function(db->connection_,
*name,
argc,
text_rep,
new CustomAggregate(env,
db,
use_bigint_args,
start_v,
stepFunction,
inverseFunc,
resultFunction),
CustomAggregate::xStep,
CustomAggregate::xFinal,
xValue,
xInverse,
CustomAggregate::xDestroy);
int r = sqlite3_create_window_function(
db->connection_,
*name,
argc,
text_rep,
new CustomAggregate(env,
BaseObjectWeakPtr<DatabaseSync>(db),
use_bigint_args,
start_v,
stepFunction,
inverseFunc,
resultFunction),
CustomAggregate::xStep,
CustomAggregate::xFinal,
xValue,
xInverse,
CustomAggregate::xDestroy);
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
}

Expand Down
4 changes: 2 additions & 2 deletions src/node_sqlite.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -426,7 +426,7 @@ class UserDefinedFunction {
public:
UserDefinedFunction(Environment* env,
v8::Local<v8::Function> fn,
DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
bool use_bigint_args);
~UserDefinedFunction();
static void xFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
Expand All@@ -435,7 +435,7 @@ class UserDefinedFunction {
private:
Environment* env_;
v8::Global<v8::Function> fn_;
DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
bool use_bigint_args_;
};

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: refactor error helpers and user function pointers#62794

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 2 commits into

from

Aug 8, 2026

+57

−66

 Merged


sqlite: refactor error helpers and user function pointers
#62794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
36eab2b

sqlite: refactor error helpers and user function pointers


thisalihassan Apr 17, 2026
43d0172

sqlite: fixed compilation error


thisalihassan Aug 6, 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


119 changes: 55 additions & 64 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
 return nullptr;
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
namespace {
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
 const char* message,
 const char* errstr,
 int errcode) {
 Environment* env = Environment::GetCurrent(isolate);
 Local<Context> context = isolate->GetCurrentContext();
 Local<String> js_msg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
 !Exception::Error(js_msg)
 ->ToObject(isolate->GetCurrentContext())
 .ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->code_string(),
 env->err_sqlite_error_string())
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
 .IsNothing()) {
 return MaybeLocal<Object>();
 }

 if (errstr != nullptr) {
 Local<String> js_errstr;
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
 return MaybeLocal<Object>();
 }
 }
 return e;
}
} // namespace

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
 return CreateSQLiteErrorImpl(isolate, message, nullptr, 0);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
 const char* errstr = sqlite3_errstr(errcode);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
 e->Set(env->context(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
 int errcode = sqlite3_extended_errcode(db);
 const char* errstr = sqlite3_errstr(errcode);
 const char* errmsg = sqlite3_errmsg(db);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
 .IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
}

void JSValueToSQLiteResult(Isolate* isolate,
Expand DownExpand Up@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
class CustomAggregate {
 public:
 explicit CustomAggregate(Environment* env,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args,
 Local<Value> start,
 Local<Function> step_fn,
 Local<Function> inverse_fn,
 Local<Function> result_fn)
 : env_(env),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args),
 start_(env->isolate(), start),
 step_fn_(env->isolate(), step_fn),
Expand DownExpand Up@@ -350,7 +340,7 @@ class CustomAggregate {
 Global<Function> CustomAggregate::*mptr) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -408,7 +398,7 @@ class CustomAggregate {
 static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -487,7 +477,7 @@ class CustomAggregate {
 }

 Environment* env_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
 Global<Value> start_;
 Global<Function> step_fn_;
Expand DownExpand Up@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {

UserDefinedFunction::UserDefinedFunction(Environment* env,
 Local<Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args)
 : env_(env),
 fn_(env->isolate(), fn),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args) {}

UserDefinedFunction::~UserDefinedFunction() {}
Expand All@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
 sqlite3_value** argv) {
 UserDefinedFunction* self =
 static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto recv = Undefined(isolate);
Expand DownExpand Up@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
 argc = js_len.As<Int32>()->Value();
 }

 UserDefinedFunction* user_data =
new UserDefinedFunction(env, fn, db, use_bigint_args);
 UserDefinedFunction* user_data = new UserDefinedFunction(
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
 int text_rep = SQLITE_UTF8;

 if (deterministic) {
Expand DownExpand Up@@ -2057,22 +2047,23 @@ void DatabaseSync::AggregateFunction(const FunctionCallbackInfo<Value>& args) {

 auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
 auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
 int r = sqlite3_create_window_function(db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 db,
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 int r = sqlite3_create_window_function(
 db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 BaseObjectWeakPtr<DatabaseSync>(db),
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
}

Expand Down

4 changes: 2 additions & 2 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -426,7 +426,7 @@ class UserDefinedFunction {
 public:
 UserDefinedFunction(Environment* env,
 v8::Local<v8::Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args);
 ~UserDefinedFunction();
 static void xFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
Expand All@@ -435,7 +435,7 @@ class UserDefinedFunction {
 private:
 Environment* env_;
 v8::Global<v8::Function> fn_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
};

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: refactor error helpers and user function pointers#62794

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 2 commits into

from

Aug 8, 2026

+57

−66

 Merged


sqlite: refactor error helpers and user function pointers
#62794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
36eab2b

sqlite: refactor error helpers and user function pointers


thisalihassan Apr 17, 2026
43d0172

sqlite: fixed compilation error


thisalihassan Aug 6, 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


119 changes: 55 additions & 64 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
 return nullptr;
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
namespace {
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
 const char* message,
 const char* errstr,
 int errcode) {
 Environment* env = Environment::GetCurrent(isolate);
 Local<Context> context = isolate->GetCurrentContext();
 Local<String> js_msg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
 !Exception::Error(js_msg)
 ->ToObject(isolate->GetCurrentContext())
 .ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->code_string(),
 env->err_sqlite_error_string())
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
 .IsNothing()) {
 return MaybeLocal<Object>();
 }

 if (errstr != nullptr) {
 Local<String> js_errstr;
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
 return MaybeLocal<Object>();
 }
 }
 return e;
}
} // namespace

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
 return CreateSQLiteErrorImpl(isolate, message, nullptr, 0);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
 const char* errstr = sqlite3_errstr(errcode);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
 e->Set(env->context(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
 int errcode = sqlite3_extended_errcode(db);
 const char* errstr = sqlite3_errstr(errcode);
 const char* errmsg = sqlite3_errmsg(db);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
 .IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
}

void JSValueToSQLiteResult(Isolate* isolate,
Expand DownExpand Up@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
class CustomAggregate {
 public:
 explicit CustomAggregate(Environment* env,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args,
 Local<Value> start,
 Local<Function> step_fn,
 Local<Function> inverse_fn,
 Local<Function> result_fn)
 : env_(env),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args),
 start_(env->isolate(), start),
 step_fn_(env->isolate(), step_fn),
Expand DownExpand Up@@ -350,7 +340,7 @@ class CustomAggregate {
 Global<Function> CustomAggregate::*mptr) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -408,7 +398,7 @@ class CustomAggregate {
 static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -487,7 +477,7 @@ class CustomAggregate {
 }

 Environment* env_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
 Global<Value> start_;
 Global<Function> step_fn_;
Expand DownExpand Up@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {

UserDefinedFunction::UserDefinedFunction(Environment* env,
 Local<Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args)
 : env_(env),
 fn_(env->isolate(), fn),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args) {}

UserDefinedFunction::~UserDefinedFunction() {}
Expand All@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
 sqlite3_value** argv) {
 UserDefinedFunction* self =
 static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto recv = Undefined(isolate);
Expand DownExpand Up@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
 argc = js_len.As<Int32>()->Value();
 }

 UserDefinedFunction* user_data =
new UserDefinedFunction(env, fn, db, use_bigint_args);
 UserDefinedFunction* user_data = new UserDefinedFunction(
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
 int text_rep = SQLITE_UTF8;

 if (deterministic) {
Expand DownExpand Up@@ -2057,22 +2047,23 @@ void DatabaseSync::AggregateFunction(const FunctionCallbackInfo<Value>& args) {

 auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
 auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
 int r = sqlite3_create_window_function(db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 db,
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 int r = sqlite3_create_window_function(
 db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 BaseObjectWeakPtr<DatabaseSync>(db),
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
}

Expand Down

4 changes: 2 additions & 2 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -426,7 +426,7 @@ class UserDefinedFunction {
 public:
 UserDefinedFunction(Environment* env,
 v8::Local<v8::Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args);
 ~UserDefinedFunction();
 static void xFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
Expand All@@ -435,7 +435,7 @@ class UserDefinedFunction {
 private:
 Environment* env_;
 v8::Global<v8::Function> fn_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
};

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: refactor error helpers and user function pointers#62794

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 2 commits into

from

Aug 8, 2026

+57

−66

 Merged


sqlite: refactor error helpers and user function pointers
#62794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
36eab2b

sqlite: refactor error helpers and user function pointers


thisalihassan Apr 17, 2026
43d0172

sqlite: fixed compilation error


thisalihassan Aug 6, 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


119 changes: 55 additions & 64 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
 return nullptr;
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
namespace {
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
 const char* message,
 const char* errstr,
 int errcode) {
 Environment* env = Environment::GetCurrent(isolate);
 Local<Context> context = isolate->GetCurrentContext();
 Local<String> js_msg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
 !Exception::Error(js_msg)
 ->ToObject(isolate->GetCurrentContext())
 .ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->code_string(),
 env->err_sqlite_error_string())
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
 .IsNothing()) {
 return MaybeLocal<Object>();
 }

 if (errstr != nullptr) {
 Local<String> js_errstr;
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
 return MaybeLocal<Object>();
 }
 }
 return e;
}
} // namespace

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
 return CreateSQLiteErrorImpl(isolate, message, nullptr, 0);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
 const char* errstr = sqlite3_errstr(errcode);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
 e->Set(env->context(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
 int errcode = sqlite3_extended_errcode(db);
 const char* errstr = sqlite3_errstr(errcode);
 const char* errmsg = sqlite3_errmsg(db);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
 .IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
}

void JSValueToSQLiteResult(Isolate* isolate,
Expand DownExpand Up@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
class CustomAggregate {
 public:
 explicit CustomAggregate(Environment* env,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args,
 Local<Value> start,
 Local<Function> step_fn,
 Local<Function> inverse_fn,
 Local<Function> result_fn)
 : env_(env),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args),
 start_(env->isolate(), start),
 step_fn_(env->isolate(), step_fn),
Expand DownExpand Up@@ -350,7 +340,7 @@ class CustomAggregate {
 Global<Function> CustomAggregate::*mptr) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -408,7 +398,7 @@ class CustomAggregate {
 static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -487,7 +477,7 @@ class CustomAggregate {
 }

 Environment* env_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
 Global<Value> start_;
 Global<Function> step_fn_;
Expand DownExpand Up@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {

UserDefinedFunction::UserDefinedFunction(Environment* env,
 Local<Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args)
 : env_(env),
 fn_(env->isolate(), fn),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args) {}

UserDefinedFunction::~UserDefinedFunction() {}
Expand All@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
 sqlite3_value** argv) {
 UserDefinedFunction* self =
 static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto recv = Undefined(isolate);
Expand DownExpand Up@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
 argc = js_len.As<Int32>()->Value();
 }

 UserDefinedFunction* user_data =
new UserDefinedFunction(env, fn, db, use_bigint_args);
 UserDefinedFunction* user_data = new UserDefinedFunction(
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
 int text_rep = SQLITE_UTF8;

 if (deterministic) {
Expand DownExpand Up@@ -2057,22 +2047,23 @@ void DatabaseSync::AggregateFunction(const FunctionCallbackInfo<Value>& args) {

 auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
 auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
 int r = sqlite3_create_window_function(db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 db,
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 int r = sqlite3_create_window_function(
 db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 BaseObjectWeakPtr<DatabaseSync>(db),
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
}

Expand Down

4 changes: 2 additions & 2 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -426,7 +426,7 @@ class UserDefinedFunction {
 public:
 UserDefinedFunction(Environment* env,
 v8::Local<v8::Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args);
 ~UserDefinedFunction();
 static void xFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
Expand All@@ -435,7 +435,7 @@ class UserDefinedFunction {
 private:
 Environment* env_;
 v8::Global<v8::Function> fn_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
};

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: refactor error helpers and user function pointers#62794

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 2 commits into

from

Aug 8, 2026

+57

−66

 Merged


sqlite: refactor error helpers and user function pointers
#62794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
36eab2b

sqlite: refactor error helpers and user function pointers


thisalihassan Apr 17, 2026
43d0172

sqlite: fixed compilation error


thisalihassan Aug 6, 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


119 changes: 55 additions & 64 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
 return nullptr;
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
namespace {
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
 const char* message,
 const char* errstr,
 int errcode) {
 Environment* env = Environment::GetCurrent(isolate);
 Local<Context> context = isolate->GetCurrentContext();
 Local<String> js_msg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
 !Exception::Error(js_msg)
 ->ToObject(isolate->GetCurrentContext())
 .ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->code_string(),
 env->err_sqlite_error_string())
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
 .IsNothing()) {
 return MaybeLocal<Object>();
 }

 if (errstr != nullptr) {
 Local<String> js_errstr;
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
 return MaybeLocal<Object>();
 }
 }
 return e;
}
} // namespace

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
 return CreateSQLiteErrorImpl(isolate, message, nullptr, 0);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
 const char* errstr = sqlite3_errstr(errcode);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
 e->Set(env->context(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
 int errcode = sqlite3_extended_errcode(db);
 const char* errstr = sqlite3_errstr(errcode);
 const char* errmsg = sqlite3_errmsg(db);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
 .IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
}

void JSValueToSQLiteResult(Isolate* isolate,
Expand DownExpand Up@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
class CustomAggregate {
 public:
 explicit CustomAggregate(Environment* env,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args,
 Local<Value> start,
 Local<Function> step_fn,
 Local<Function> inverse_fn,
 Local<Function> result_fn)
 : env_(env),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args),
 start_(env->isolate(), start),
 step_fn_(env->isolate(), step_fn),
Expand DownExpand Up@@ -350,7 +340,7 @@ class CustomAggregate {
 Global<Function> CustomAggregate::*mptr) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -408,7 +398,7 @@ class CustomAggregate {
 static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -487,7 +477,7 @@ class CustomAggregate {
 }

 Environment* env_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
 Global<Value> start_;
 Global<Function> step_fn_;
Expand DownExpand Up@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {

UserDefinedFunction::UserDefinedFunction(Environment* env,
 Local<Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args)
 : env_(env),
 fn_(env->isolate(), fn),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args) {}

UserDefinedFunction::~UserDefinedFunction() {}
Expand All@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
 sqlite3_value** argv) {
 UserDefinedFunction* self =
 static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto recv = Undefined(isolate);
Expand DownExpand Up@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
 argc = js_len.As<Int32>()->Value();
 }

 UserDefinedFunction* user_data =
new UserDefinedFunction(env, fn, db, use_bigint_args);
 UserDefinedFunction* user_data = new UserDefinedFunction(
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
 int text_rep = SQLITE_UTF8;

 if (deterministic) {
Expand DownExpand Up@@ -2057,22 +2047,23 @@ void DatabaseSync::AggregateFunction(const FunctionCallbackInfo<Value>& args) {

 auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
 auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
 int r = sqlite3_create_window_function(db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 db,
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 int r = sqlite3_create_window_function(
 db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 BaseObjectWeakPtr<DatabaseSync>(db),
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
}

Expand Down

4 changes: 2 additions & 2 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -426,7 +426,7 @@ class UserDefinedFunction {
 public:
 UserDefinedFunction(Environment* env,
 v8::Local<v8::Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args);
 ~UserDefinedFunction();
 static void xFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
Expand All@@ -435,7 +435,7 @@ class UserDefinedFunction {
 private:
 Environment* env_;
 v8::Global<v8::Function> fn_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
};

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: refactor error helpers and user function pointers#62794

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 2 commits into

from

Aug 8, 2026

+57

−66

 Merged


sqlite: refactor error helpers and user function pointers
#62794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
36eab2b

sqlite: refactor error helpers and user function pointers


thisalihassan Apr 17, 2026
43d0172

sqlite: fixed compilation error


thisalihassan Aug 6, 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


119 changes: 55 additions & 64 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
 return nullptr;
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
namespace {
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
 const char* message,
 const char* errstr,
 int errcode) {
 Environment* env = Environment::GetCurrent(isolate);
 Local<Context> context = isolate->GetCurrentContext();
 Local<String> js_msg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
 !Exception::Error(js_msg)
 ->ToObject(isolate->GetCurrentContext())
 .ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->code_string(),
 env->err_sqlite_error_string())
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
 .IsNothing()) {
 return MaybeLocal<Object>();
 }

 if (errstr != nullptr) {
 Local<String> js_errstr;
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
 return MaybeLocal<Object>();
 }
 }
 return e;
}
} // namespace

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
 return CreateSQLiteErrorImpl(isolate, message, nullptr, 0);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
 const char* errstr = sqlite3_errstr(errcode);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
 e->Set(env->context(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
 int errcode = sqlite3_extended_errcode(db);
 const char* errstr = sqlite3_errstr(errcode);
 const char* errmsg = sqlite3_errmsg(db);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
 .IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
}

void JSValueToSQLiteResult(Isolate* isolate,
Expand DownExpand Up@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
class CustomAggregate {
 public:
 explicit CustomAggregate(Environment* env,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args,
 Local<Value> start,
 Local<Function> step_fn,
 Local<Function> inverse_fn,
 Local<Function> result_fn)
 : env_(env),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args),
 start_(env->isolate(), start),
 step_fn_(env->isolate(), step_fn),
Expand DownExpand Up@@ -350,7 +340,7 @@ class CustomAggregate {
 Global<Function> CustomAggregate::*mptr) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -408,7 +398,7 @@ class CustomAggregate {
 static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -487,7 +477,7 @@ class CustomAggregate {
 }

 Environment* env_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
 Global<Value> start_;
 Global<Function> step_fn_;
Expand DownExpand Up@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {

UserDefinedFunction::UserDefinedFunction(Environment* env,
 Local<Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args)
 : env_(env),
 fn_(env->isolate(), fn),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args) {}

UserDefinedFunction::~UserDefinedFunction() {}
Expand All@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
 sqlite3_value** argv) {
 UserDefinedFunction* self =
 static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto recv = Undefined(isolate);
Expand DownExpand Up@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
 argc = js_len.As<Int32>()->Value();
 }

 UserDefinedFunction* user_data =
new UserDefinedFunction(env, fn, db, use_bigint_args);
 UserDefinedFunction* user_data = new UserDefinedFunction(
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
 int text_rep = SQLITE_UTF8;

 if (deterministic) {
Expand DownExpand Up@@ -2057,22 +2047,23 @@ void DatabaseSync::AggregateFunction(const FunctionCallbackInfo<Value>& args) {

 auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
 auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
 int r = sqlite3_create_window_function(db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 db,
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 int r = sqlite3_create_window_function(
 db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 BaseObjectWeakPtr<DatabaseSync>(db),
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
}

Expand Down

4 changes: 2 additions & 2 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -426,7 +426,7 @@ class UserDefinedFunction {
 public:
 UserDefinedFunction(Environment* env,
 v8::Local<v8::Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args);
 ~UserDefinedFunction();
 static void xFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
Expand All@@ -435,7 +435,7 @@ class UserDefinedFunction {
 private:
 Environment* env_;
 v8::Global<v8::Function> fn_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
};

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: refactor error helpers and user function pointers#62794

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 2 commits into

from

Aug 8, 2026

+57

−66

 Merged


sqlite: refactor error helpers and user function pointers
#62794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
36eab2b

sqlite: refactor error helpers and user function pointers


thisalihassan Apr 17, 2026
43d0172

sqlite: fixed compilation error


thisalihassan Aug 6, 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


119 changes: 55 additions & 64 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
 return nullptr;
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
namespace {
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
 const char* message,
 const char* errstr,
 int errcode) {
 Environment* env = Environment::GetCurrent(isolate);
 Local<Context> context = isolate->GetCurrentContext();
 Local<String> js_msg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
 !Exception::Error(js_msg)
 ->ToObject(isolate->GetCurrentContext())
 .ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->code_string(),
 env->err_sqlite_error_string())
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
 .IsNothing()) {
 return MaybeLocal<Object>();
 }

 if (errstr != nullptr) {
 Local<String> js_errstr;
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
 return MaybeLocal<Object>();
 }
 }
 return e;
}
} // namespace

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
 return CreateSQLiteErrorImpl(isolate, message, nullptr, 0);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
 const char* errstr = sqlite3_errstr(errcode);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
 e->Set(env->context(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
 int errcode = sqlite3_extended_errcode(db);
 const char* errstr = sqlite3_errstr(errcode);
 const char* errmsg = sqlite3_errmsg(db);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
 .IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
}

void JSValueToSQLiteResult(Isolate* isolate,
Expand DownExpand Up@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
class CustomAggregate {
 public:
 explicit CustomAggregate(Environment* env,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args,
 Local<Value> start,
 Local<Function> step_fn,
 Local<Function> inverse_fn,
 Local<Function> result_fn)
 : env_(env),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args),
 start_(env->isolate(), start),
 step_fn_(env->isolate(), step_fn),
Expand DownExpand Up@@ -350,7 +340,7 @@ class CustomAggregate {
 Global<Function> CustomAggregate::*mptr) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -408,7 +398,7 @@ class CustomAggregate {
 static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -487,7 +477,7 @@ class CustomAggregate {
 }

 Environment* env_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
 Global<Value> start_;
 Global<Function> step_fn_;
Expand DownExpand Up@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {

UserDefinedFunction::UserDefinedFunction(Environment* env,
 Local<Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args)
 : env_(env),
 fn_(env->isolate(), fn),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args) {}

UserDefinedFunction::~UserDefinedFunction() {}
Expand All@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
 sqlite3_value** argv) {
 UserDefinedFunction* self =
 static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto recv = Undefined(isolate);
Expand DownExpand Up@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
 argc = js_len.As<Int32>()->Value();
 }

 UserDefinedFunction* user_data =
new UserDefinedFunction(env, fn, db, use_bigint_args);
 UserDefinedFunction* user_data = new UserDefinedFunction(
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
 int text_rep = SQLITE_UTF8;

 if (deterministic) {
Expand DownExpand Up@@ -2057,22 +2047,23 @@ void DatabaseSync::AggregateFunction(const FunctionCallbackInfo<Value>& args) {

 auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
 auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
 int r = sqlite3_create_window_function(db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 db,
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 int r = sqlite3_create_window_function(
 db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 BaseObjectWeakPtr<DatabaseSync>(db),
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
}

Expand Down

4 changes: 2 additions & 2 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -426,7 +426,7 @@ class UserDefinedFunction {
 public:
 UserDefinedFunction(Environment* env,
 v8::Local<v8::Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args);
 ~UserDefinedFunction();
 static void xFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
Expand All@@ -435,7 +435,7 @@ class UserDefinedFunction {
 private:
 Environment* env_;
 v8::Global<v8::Function> fn_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
};

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: refactor error helpers and user function pointers#62794

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 2 commits into

from

Aug 8, 2026

+57

−66

 Merged


sqlite: refactor error helpers and user function pointers
#62794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
36eab2b

sqlite: refactor error helpers and user function pointers


thisalihassan Apr 17, 2026
43d0172

sqlite: fixed compilation error


thisalihassan Aug 6, 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


119 changes: 55 additions & 64 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
 return nullptr;
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
namespace {
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
 const char* message,
 const char* errstr,
 int errcode) {
 Environment* env = Environment::GetCurrent(isolate);
 Local<Context> context = isolate->GetCurrentContext();
 Local<String> js_msg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
 !Exception::Error(js_msg)
 ->ToObject(isolate->GetCurrentContext())
 .ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->code_string(),
 env->err_sqlite_error_string())
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
 .IsNothing()) {
 return MaybeLocal<Object>();
 }

 if (errstr != nullptr) {
 Local<String> js_errstr;
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
 return MaybeLocal<Object>();
 }
 }
 return e;
}
} // namespace

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
 const char* message) {
 return CreateSQLiteErrorImpl(isolate, message, nullptr, 0);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
 const char* errstr = sqlite3_errstr(errcode);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
 e->Set(env->context(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
}

inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
 int errcode = sqlite3_extended_errcode(db);
 const char* errstr = sqlite3_errstr(errcode);
 const char* errmsg = sqlite3_errmsg(db);
 Local<String> js_errmsg;
 Local<Object> e;
 Environment* env = Environment::GetCurrent(isolate);
 if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
 e->Set(isolate->GetCurrentContext(),
 env->errcode_string(),
 Integer::New(isolate, errcode))
 .IsNothing() ||
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
 .IsNothing()) {
 return MaybeLocal<Object>();
 }
 return e;
 return CreateSQLiteErrorImpl(
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
}

void JSValueToSQLiteResult(Isolate* isolate,
Expand DownExpand Up@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
class CustomAggregate {
 public:
 explicit CustomAggregate(Environment* env,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args,
 Local<Value> start,
 Local<Function> step_fn,
 Local<Function> inverse_fn,
 Local<Function> result_fn)
 : env_(env),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args),
 start_(env->isolate(), start),
 step_fn_(env->isolate(), step_fn),
Expand DownExpand Up@@ -350,7 +340,7 @@ class CustomAggregate {
 Global<Function> CustomAggregate::*mptr) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -408,7 +398,7 @@ class CustomAggregate {
 static inline void xValueBase(sqlite3_context* ctx, bool is_final) {
 CustomAggregate* self =
 static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto agg = self->GetAggregate(ctx);
Expand DownExpand Up@@ -487,7 +477,7 @@ class CustomAggregate {
 }

 Environment* env_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
 Global<Value> start_;
 Global<Function> step_fn_;
Expand DownExpand Up@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {

UserDefinedFunction::UserDefinedFunction(Environment* env,
 Local<Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args)
 : env_(env),
 fn_(env->isolate(), fn),
 db_(db),
 db_(std::move(db)),
 use_bigint_args_(use_bigint_args) {}

UserDefinedFunction::~UserDefinedFunction() {}
Expand All@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
 sqlite3_value** argv) {
 UserDefinedFunction* self =
 static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
 CallbackDepthGuard guard(self->db_);
 CallbackDepthGuard guard(self->db_.get());
 Environment* env = self->env_;
 Isolate* isolate = env->isolate();
 auto recv = Undefined(isolate);
Expand DownExpand Up@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
 argc = js_len.As<Int32>()->Value();
 }

 UserDefinedFunction* user_data =
new UserDefinedFunction(env, fn, db, use_bigint_args);
 UserDefinedFunction* user_data = new UserDefinedFunction(
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
 int text_rep = SQLITE_UTF8;

 if (deterministic) {
Expand DownExpand Up@@ -2057,22 +2047,23 @@ void DatabaseSync::AggregateFunction(const FunctionCallbackInfo<Value>& args) {

 auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
 auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
 int r = sqlite3_create_window_function(db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 db,
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 int r = sqlite3_create_window_function(
 db->connection_,
 *name,
 argc,
 text_rep,
 new CustomAggregate(env,
 BaseObjectWeakPtr<DatabaseSync>(db),
 use_bigint_args,
 start_v,
 stepFunction,
 inverseFunc,
 resultFunction),
 CustomAggregate::xStep,
 CustomAggregate::xFinal,
 xValue,
 xInverse,
 CustomAggregate::xDestroy);
 CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
}

Expand Down

4 changes: 2 additions & 2 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -426,7 +426,7 @@ class UserDefinedFunction {
 public:
 UserDefinedFunction(Environment* env,
 v8::Local<v8::Function> fn,
 DatabaseSync* db,
BaseObjectWeakPtr<DatabaseSync> db,
 bool use_bigint_args);
 ~UserDefinedFunction();
 static void xFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
Expand All@@ -435,7 +435,7 @@ class UserDefinedFunction {
 private:
 Environment* env_;
 v8::Global<v8::Function> fn_;
 DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
 bool use_bigint_args_;
};

Expand Down
Loading