Commit ca88587

Browse files
thisalihassanaduh95
thisalihassan
authored and
aduh95
committed
sqlite: refactor error helpers and user function pointers
Signed-off-by: Ali Hassan <ali-hassan27@outlook.com> PR-URL: #62794 Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ee7bf09 commit ca88587

2 files changed

Lines changed: 57 additions & 66 deletions

File tree

‎src/node_sqlite.cc‎

Lines changed: 55 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
170170
returnnullptr;
171171
}
172172

173-
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
174-
constchar* message) {
173+
namespace {
174+
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
175+
constchar* message,
176+
constchar* errstr,
177+
int errcode) {
178+
Environment* env = Environment::GetCurrent(isolate);
179+
Local<Context> context = isolate->GetCurrentContext();
175180
Local<String> js_msg;
176181
Local<Object> e;
177-
Environment* env = Environment::GetCurrent(isolate);
178182
if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
179-
!Exception::Error(js_msg)
180-
->ToObject(isolate->GetCurrentContext())
181-
.ToLocal(&e) ||
182-
e->Set(isolate->GetCurrentContext(),
183-
env->code_string(),
184-
env->err_sqlite_error_string())
183+
!Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
184+
e->Set(context, env->code_string(), env->err_sqlite_error_string())
185185
.IsNothing()) {
186186
return MaybeLocal<Object>();
187187
}
188+
189+
if (errstr != nullptr) {
190+
Local<String> js_errstr;
191+
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
192+
e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
193+
.IsNothing() ||
194+
e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
195+
return MaybeLocal<Object>();
196+
}
197+
}
188198
return e;
189199
}
200+
} // namespace
201+
202+
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
203+
constchar* message) {
204+
returnCreateSQLiteErrorImpl(isolate, message, nullptr, 0);
205+
}
190206

191207
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
192208
constchar* errstr = sqlite3_errstr(errcode);
193-
Local<String> js_errmsg;
194-
Local<Object> e;
195-
Environment* env = Environment::GetCurrent(isolate);
196-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
197-
!CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
198-
e->Set(env->context(),
199-
env->errcode_string(),
200-
Integer::New(isolate, errcode))
201-
.IsNothing() ||
202-
e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
203-
return MaybeLocal<Object>();
204-
}
205-
return e;
209+
returnCreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
206210
}
207211

208212
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
209213
int errcode = sqlite3_extended_errcode(db);
210-
constchar* errstr = sqlite3_errstr(errcode);
211-
constchar* errmsg = sqlite3_errmsg(db);
212-
Local<String> js_errmsg;
213-
Local<Object> e;
214-
Environment* env = Environment::GetCurrent(isolate);
215-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
216-
!CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
217-
e->Set(isolate->GetCurrentContext(),
218-
env->errcode_string(),
219-
Integer::New(isolate, errcode))
220-
.IsNothing() ||
221-
e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
222-
.IsNothing()) {
223-
return MaybeLocal<Object>();
224-
}
225-
return e;
214+
returnCreateSQLiteErrorImpl(
215+
isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
226216
}
227217

228218
voidJSValueToSQLiteResult(Isolate* isolate,
@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
307297
classCustomAggregate {
308298
public:
309299
explicitCustomAggregate(Environment* env,
310-
DatabaseSync* db,
300+
BaseObjectWeakPtr<DatabaseSync> db,
311301
bool use_bigint_args,
312302
Local<Value> start,
313303
Local<Function> step_fn,
314304
Local<Function> inverse_fn,
315305
Local<Function> result_fn)
316306
: env_(env),
317-
db_(db),
307+
db_(std::move(db)),
318308
use_bigint_args_(use_bigint_args),
319309
start_(env->isolate(), start),
320310
step_fn_(env->isolate(), step_fn),
@@ -350,7 +340,7 @@ class CustomAggregate {
350340
Global<Function> CustomAggregate::*mptr) {
351341
CustomAggregate* self =
352342
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
353-
CallbackDepthGuard guard(self->db_);
343+
CallbackDepthGuard guard(self->db_.get());
354344
Environment* env = self->env_;
355345
Isolate* isolate = env->isolate();
356346
auto agg = self->GetAggregate(ctx);
@@ -408,7 +398,7 @@ class CustomAggregate {
408398
staticinlinevoidxValueBase(sqlite3_context* ctx, bool is_final) {
409399
CustomAggregate* self =
410400
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
411-
CallbackDepthGuard guard(self->db_);
401+
CallbackDepthGuard guard(self->db_.get());
412402
Environment* env = self->env_;
413403
Isolate* isolate = env->isolate();
414404
auto agg = self->GetAggregate(ctx);
@@ -487,7 +477,7 @@ class CustomAggregate {
487477
}
488478

489479
Environment* env_;
490-
DatabaseSync* db_;
480+
BaseObjectWeakPtr<DatabaseSync> db_;
491481
bool use_bigint_args_;
492482
Global<Value> start_;
493483
Global<Function> step_fn_;
@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {
670660

671661
UserDefinedFunction::UserDefinedFunction(Environment* env,
672662
Local<Function> fn,
673-
DatabaseSync* db,
663+
BaseObjectWeakPtr<DatabaseSync> db,
674664
bool use_bigint_args)
675665
: env_(env),
676666
fn_(env->isolate(), fn),
677-
db_(db),
667+
db_(std::move(db)),
678668
use_bigint_args_(use_bigint_args) {}
679669

680670
UserDefinedFunction::~UserDefinedFunction() {}
@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
684674
sqlite3_value** argv) {
685675
UserDefinedFunction* self =
686676
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
687-
CallbackDepthGuard guard(self->db_);
677+
CallbackDepthGuard guard(self->db_.get());
688678
Environment* env = self->env_;
689679
Isolate* isolate = env->isolate();
690680
auto recv = Undefined(isolate);
@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
17351725
argc = js_len.As<Int32>()->Value();
17361726
}
17371727

1738-
UserDefinedFunction* user_data =
1739-
newUserDefinedFunction(env, fn, db, use_bigint_args);
1728+
UserDefinedFunction* user_data =newUserDefinedFunction(
1729+
env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
17401730
int text_rep = SQLITE_UTF8;
17411731

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

20582048
auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
20592049
auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
2060-
int r = sqlite3_create_window_function(db->connection_,
2061-
*name,
2062-
argc,
2063-
text_rep,
2064-
newCustomAggregate(env,
2065-
db,
2066-
use_bigint_args,
2067-
start_v,
2068-
stepFunction,
2069-
inverseFunc,
2070-
resultFunction),
2071-
CustomAggregate::xStep,
2072-
CustomAggregate::xFinal,
2073-
xValue,
2074-
xInverse,
2075-
CustomAggregate::xDestroy);
2050+
int r = sqlite3_create_window_function(
2051+
db->connection_,
2052+
*name,
2053+
argc,
2054+
text_rep,
2055+
newCustomAggregate(env,
2056+
BaseObjectWeakPtr<DatabaseSync>(db),
2057+
use_bigint_args,
2058+
start_v,
2059+
stepFunction,
2060+
inverseFunc,
2061+
resultFunction),
2062+
CustomAggregate::xStep,
2063+
CustomAggregate::xFinal,
2064+
xValue,
2065+
xInverse,
2066+
CustomAggregate::xDestroy);
20762067
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
20772068
}
20782069

‎src/node_sqlite.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ class UserDefinedFunction {
430430
public:
431431
UserDefinedFunction(Environment* env,
432432
v8::Local<v8::Function> fn,
433-
DatabaseSync* db,
433+
BaseObjectWeakPtr<DatabaseSync> db,
434434
bool use_bigint_args);
435435
~UserDefinedFunction();
436436
staticvoidxFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
@@ -439,7 +439,7 @@ class UserDefinedFunction {
439439
private:
440440
Environment* env_;
441441
v8::Global<v8::Function> fn_;
442-
DatabaseSync* db_;
442+
BaseObjectWeakPtr<DatabaseSync> db_;
443443
bool use_bigint_args_;
444444
};
445445

0 commit comments

Comments
 (0)
, '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
Commit ca88587
Browse files
thisalihassanaduh95
thisalihassan
authored and
aduh95
committed
sqlite: refactor error helpers and user function pointers
Signed-off-by: Ali Hassan <ali-hassan27@outlook.com>
PR-URL: #62794
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ee7bf09 commit ca88587
2 files changed
Lines changed: 57 additions & 66 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 55 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
170170
returnnullptr;
171171
}
172172

173-
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
174-
constchar* message) {
173+
namespace {
174+
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
175+
constchar* message,
176+
constchar* errstr,
177+
int errcode) {
178+
 Environment* env = Environment::GetCurrent(isolate);
179+
 Local<Context> context = isolate->GetCurrentContext();
175180
 Local<String> js_msg;
176181
 Local<Object> e;
177-
 Environment* env = Environment::GetCurrent(isolate);
178182
if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
179-
 !Exception::Error(js_msg)
180-
 ->ToObject(isolate->GetCurrentContext())
181-
 .ToLocal(&e) ||
182-
 e->Set(isolate->GetCurrentContext(),
183-
 env->code_string(),
184-
 env->err_sqlite_error_string())
183+
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
184+
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
185185
 .IsNothing()) {
186186
return MaybeLocal<Object>();
187187
 }
188+
189+
if (errstr != nullptr) {
190+
 Local<String> js_errstr;
191+
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
192+
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
193+
 .IsNothing() ||
194+
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
195+
return MaybeLocal<Object>();
196+
 }
197+
 }
188198
return e;
189199
}
200+
} // namespace
201+
202+
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
203+
constchar* message) {
204+
returnCreateSQLiteErrorImpl(isolate, message, nullptr, 0);
205+
}
190206

191207
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
192208
constchar* errstr = sqlite3_errstr(errcode);
193-
 Local<String> js_errmsg;
194-
 Local<Object> e;
195-
 Environment* env = Environment::GetCurrent(isolate);
196-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
197-
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
198-
 e->Set(env->context(),
199-
 env->errcode_string(),
200-
Integer::New(isolate, errcode))
201-
 .IsNothing() ||
202-
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
203-
return MaybeLocal<Object>();
204-
 }
205-
return e;
209+
returnCreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
206210
}
207211

208212
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
209213
int errcode = sqlite3_extended_errcode(db);
210-
constchar* errstr = sqlite3_errstr(errcode);
211-
constchar* errmsg = sqlite3_errmsg(db);
212-
 Local<String> js_errmsg;
213-
 Local<Object> e;
214-
 Environment* env = Environment::GetCurrent(isolate);
215-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
216-
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
217-
 e->Set(isolate->GetCurrentContext(),
218-
 env->errcode_string(),
219-
Integer::New(isolate, errcode))
220-
 .IsNothing() ||
221-
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
222-
 .IsNothing()) {
223-
return MaybeLocal<Object>();
224-
 }
225-
return e;
214+
returnCreateSQLiteErrorImpl(
215+
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
226216
}
227217

228218
voidJSValueToSQLiteResult(Isolate* isolate,
@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
307297
classCustomAggregate {
308298
public:
309299
explicitCustomAggregate(Environment* env,
310-
 DatabaseSync* db,
300+
BaseObjectWeakPtr<DatabaseSync> db,
311301
bool use_bigint_args,
312302
 Local<Value> start,
313303
 Local<Function> step_fn,
314304
 Local<Function> inverse_fn,
315305
 Local<Function> result_fn)
316306
 : env_(env),
317-
 db_(db),
307+
 db_(std::move(db)),
318308
 use_bigint_args_(use_bigint_args),
319309
 start_(env->isolate(), start),
320310
 step_fn_(env->isolate(), step_fn),
@@ -350,7 +340,7 @@ class CustomAggregate {
350340
 Global<Function> CustomAggregate::*mptr) {
351341
 CustomAggregate* self =
352342
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
353-
 CallbackDepthGuard guard(self->db_);
343+
 CallbackDepthGuard guard(self->db_.get());
354344
 Environment* env = self->env_;
355345
 Isolate* isolate = env->isolate();
356346
auto agg = self->GetAggregate(ctx);
@@ -408,7 +398,7 @@ class CustomAggregate {
408398
staticinlinevoidxValueBase(sqlite3_context* ctx, bool is_final) {
409399
 CustomAggregate* self =
410400
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
411-
 CallbackDepthGuard guard(self->db_);
401+
 CallbackDepthGuard guard(self->db_.get());
412402
 Environment* env = self->env_;
413403
 Isolate* isolate = env->isolate();
414404
auto agg = self->GetAggregate(ctx);
@@ -487,7 +477,7 @@ class CustomAggregate {
487477
 }
488478

489479
 Environment* env_;
490-
 DatabaseSync* db_;
480+
BaseObjectWeakPtr<DatabaseSync> db_;
491481
bool use_bigint_args_;
492482
 Global<Value> start_;
493483
 Global<Function> step_fn_;
@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {
670660

671661
UserDefinedFunction::UserDefinedFunction(Environment* env,
672662
 Local<Function> fn,
673-
 DatabaseSync* db,
663+
BaseObjectWeakPtr<DatabaseSync> db,
674664
bool use_bigint_args)
675665
 : env_(env),
676666
 fn_(env->isolate(), fn),
677-
 db_(db),
667+
 db_(std::move(db)),
678668
 use_bigint_args_(use_bigint_args) {}
679669

680670
UserDefinedFunction::~UserDefinedFunction() {}
@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
684674
 sqlite3_value** argv) {
685675
 UserDefinedFunction* self =
686676
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
687-
 CallbackDepthGuard guard(self->db_);
677+
 CallbackDepthGuard guard(self->db_.get());
688678
 Environment* env = self->env_;
689679
 Isolate* isolate = env->isolate();
690680
auto recv = Undefined(isolate);
@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
17351725
 argc = js_len.As<Int32>()->Value();
17361726
 }
17371727

1738-
 UserDefinedFunction* user_data =
1739-
newUserDefinedFunction(env, fn, db, use_bigint_args);
1728+
 UserDefinedFunction* user_data =newUserDefinedFunction(
1729+
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
17401730
int text_rep = SQLITE_UTF8;
17411731

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

20582048
auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
20592049
auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
2060-
int r = sqlite3_create_window_function(db->connection_,
2061-
 *name,
2062-
 argc,
2063-
 text_rep,
2064-
newCustomAggregate(env,
2065-
 db,
2066-
 use_bigint_args,
2067-
 start_v,
2068-
 stepFunction,
2069-
 inverseFunc,
2070-
 resultFunction),
2071-
 CustomAggregate::xStep,
2072-
 CustomAggregate::xFinal,
2073-
 xValue,
2074-
 xInverse,
2075-
 CustomAggregate::xDestroy);
2050+
int r = sqlite3_create_window_function(
2051+
 db->connection_,
2052+
 *name,
2053+
 argc,
2054+
 text_rep,
2055+
newCustomAggregate(env,
2056+
 BaseObjectWeakPtr<DatabaseSync>(db),
2057+
 use_bigint_args,
2058+
 start_v,
2059+
 stepFunction,
2060+
 inverseFunc,
2061+
 resultFunction),
2062+
 CustomAggregate::xStep,
2063+
 CustomAggregate::xFinal,
2064+
 xValue,
2065+
 xInverse,
2066+
 CustomAggregate::xDestroy);
20762067
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
20772068
}
20782069

‎src/node_sqlite.h‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ class UserDefinedFunction {
430430
public:
431431
UserDefinedFunction(Environment* env,
432432
 v8::Local<v8::Function> fn,
433-
 DatabaseSync* db,
433+
BaseObjectWeakPtr<DatabaseSync> db,
434434
bool use_bigint_args);
435435
~UserDefinedFunction();
436436
staticvoidxFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
@@ -439,7 +439,7 @@ class UserDefinedFunction {
439439
private:
440440
 Environment* env_;
441441
 v8::Global<v8::Function> fn_;
442-
 DatabaseSync* db_;
442+
BaseObjectWeakPtr<DatabaseSync> db_;
443443
bool use_bigint_args_;
444444
};
445445

0 commit comments
Comments
 (0)

, '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
Commit ca88587
Browse files
thisalihassanaduh95
thisalihassan
authored and
aduh95
committed
sqlite: refactor error helpers and user function pointers
Signed-off-by: Ali Hassan <ali-hassan27@outlook.com>
PR-URL: #62794
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ee7bf09 commit ca88587
2 files changed
Lines changed: 57 additions & 66 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 55 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
170170
returnnullptr;
171171
}
172172

173-
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
174-
constchar* message) {
173+
namespace {
174+
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
175+
constchar* message,
176+
constchar* errstr,
177+
int errcode) {
178+
 Environment* env = Environment::GetCurrent(isolate);
179+
 Local<Context> context = isolate->GetCurrentContext();
175180
 Local<String> js_msg;
176181
 Local<Object> e;
177-
 Environment* env = Environment::GetCurrent(isolate);
178182
if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
179-
 !Exception::Error(js_msg)
180-
 ->ToObject(isolate->GetCurrentContext())
181-
 .ToLocal(&e) ||
182-
 e->Set(isolate->GetCurrentContext(),
183-
 env->code_string(),
184-
 env->err_sqlite_error_string())
183+
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
184+
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
185185
 .IsNothing()) {
186186
return MaybeLocal<Object>();
187187
 }
188+
189+
if (errstr != nullptr) {
190+
 Local<String> js_errstr;
191+
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
192+
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
193+
 .IsNothing() ||
194+
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
195+
return MaybeLocal<Object>();
196+
 }
197+
 }
188198
return e;
189199
}
200+
} // namespace
201+
202+
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
203+
constchar* message) {
204+
returnCreateSQLiteErrorImpl(isolate, message, nullptr, 0);
205+
}
190206

191207
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
192208
constchar* errstr = sqlite3_errstr(errcode);
193-
 Local<String> js_errmsg;
194-
 Local<Object> e;
195-
 Environment* env = Environment::GetCurrent(isolate);
196-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
197-
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
198-
 e->Set(env->context(),
199-
 env->errcode_string(),
200-
Integer::New(isolate, errcode))
201-
 .IsNothing() ||
202-
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
203-
return MaybeLocal<Object>();
204-
 }
205-
return e;
209+
returnCreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
206210
}
207211

208212
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
209213
int errcode = sqlite3_extended_errcode(db);
210-
constchar* errstr = sqlite3_errstr(errcode);
211-
constchar* errmsg = sqlite3_errmsg(db);
212-
 Local<String> js_errmsg;
213-
 Local<Object> e;
214-
 Environment* env = Environment::GetCurrent(isolate);
215-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
216-
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
217-
 e->Set(isolate->GetCurrentContext(),
218-
 env->errcode_string(),
219-
Integer::New(isolate, errcode))
220-
 .IsNothing() ||
221-
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
222-
 .IsNothing()) {
223-
return MaybeLocal<Object>();
224-
 }
225-
return e;
214+
returnCreateSQLiteErrorImpl(
215+
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
226216
}
227217

228218
voidJSValueToSQLiteResult(Isolate* isolate,
@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
307297
classCustomAggregate {
308298
public:
309299
explicitCustomAggregate(Environment* env,
310-
 DatabaseSync* db,
300+
BaseObjectWeakPtr<DatabaseSync> db,
311301
bool use_bigint_args,
312302
 Local<Value> start,
313303
 Local<Function> step_fn,
314304
 Local<Function> inverse_fn,
315305
 Local<Function> result_fn)
316306
 : env_(env),
317-
 db_(db),
307+
 db_(std::move(db)),
318308
 use_bigint_args_(use_bigint_args),
319309
 start_(env->isolate(), start),
320310
 step_fn_(env->isolate(), step_fn),
@@ -350,7 +340,7 @@ class CustomAggregate {
350340
 Global<Function> CustomAggregate::*mptr) {
351341
 CustomAggregate* self =
352342
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
353-
 CallbackDepthGuard guard(self->db_);
343+
 CallbackDepthGuard guard(self->db_.get());
354344
 Environment* env = self->env_;
355345
 Isolate* isolate = env->isolate();
356346
auto agg = self->GetAggregate(ctx);
@@ -408,7 +398,7 @@ class CustomAggregate {
408398
staticinlinevoidxValueBase(sqlite3_context* ctx, bool is_final) {
409399
 CustomAggregate* self =
410400
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
411-
 CallbackDepthGuard guard(self->db_);
401+
 CallbackDepthGuard guard(self->db_.get());
412402
 Environment* env = self->env_;
413403
 Isolate* isolate = env->isolate();
414404
auto agg = self->GetAggregate(ctx);
@@ -487,7 +477,7 @@ class CustomAggregate {
487477
 }
488478

489479
 Environment* env_;
490-
 DatabaseSync* db_;
480+
BaseObjectWeakPtr<DatabaseSync> db_;
491481
bool use_bigint_args_;
492482
 Global<Value> start_;
493483
 Global<Function> step_fn_;
@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {
670660

671661
UserDefinedFunction::UserDefinedFunction(Environment* env,
672662
 Local<Function> fn,
673-
 DatabaseSync* db,
663+
BaseObjectWeakPtr<DatabaseSync> db,
674664
bool use_bigint_args)
675665
 : env_(env),
676666
 fn_(env->isolate(), fn),
677-
 db_(db),
667+
 db_(std::move(db)),
678668
 use_bigint_args_(use_bigint_args) {}
679669

680670
UserDefinedFunction::~UserDefinedFunction() {}
@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
684674
 sqlite3_value** argv) {
685675
 UserDefinedFunction* self =
686676
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
687-
 CallbackDepthGuard guard(self->db_);
677+
 CallbackDepthGuard guard(self->db_.get());
688678
 Environment* env = self->env_;
689679
 Isolate* isolate = env->isolate();
690680
auto recv = Undefined(isolate);
@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
17351725
 argc = js_len.As<Int32>()->Value();
17361726
 }
17371727

1738-
 UserDefinedFunction* user_data =
1739-
newUserDefinedFunction(env, fn, db, use_bigint_args);
1728+
 UserDefinedFunction* user_data =newUserDefinedFunction(
1729+
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
17401730
int text_rep = SQLITE_UTF8;
17411731

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

20582048
auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
20592049
auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
2060-
int r = sqlite3_create_window_function(db->connection_,
2061-
 *name,
2062-
 argc,
2063-
 text_rep,
2064-
newCustomAggregate(env,
2065-
 db,
2066-
 use_bigint_args,
2067-
 start_v,
2068-
 stepFunction,
2069-
 inverseFunc,
2070-
 resultFunction),
2071-
 CustomAggregate::xStep,
2072-
 CustomAggregate::xFinal,
2073-
 xValue,
2074-
 xInverse,
2075-
 CustomAggregate::xDestroy);
2050+
int r = sqlite3_create_window_function(
2051+
 db->connection_,
2052+
 *name,
2053+
 argc,
2054+
 text_rep,
2055+
newCustomAggregate(env,
2056+
 BaseObjectWeakPtr<DatabaseSync>(db),
2057+
 use_bigint_args,
2058+
 start_v,
2059+
 stepFunction,
2060+
 inverseFunc,
2061+
 resultFunction),
2062+
 CustomAggregate::xStep,
2063+
 CustomAggregate::xFinal,
2064+
 xValue,
2065+
 xInverse,
2066+
 CustomAggregate::xDestroy);
20762067
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
20772068
}
20782069

‎src/node_sqlite.h‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ class UserDefinedFunction {
430430
public:
431431
UserDefinedFunction(Environment* env,
432432
 v8::Local<v8::Function> fn,
433-
 DatabaseSync* db,
433+
BaseObjectWeakPtr<DatabaseSync> db,
434434
bool use_bigint_args);
435435
~UserDefinedFunction();
436436
staticvoidxFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
@@ -439,7 +439,7 @@ class UserDefinedFunction {
439439
private:
440440
 Environment* env_;
441441
 v8::Global<v8::Function> fn_;
442-
 DatabaseSync* db_;
442+
BaseObjectWeakPtr<DatabaseSync> db_;
443443
bool use_bigint_args_;
444444
};
445445

0 commit comments
Comments
 (0)

, '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
Commit ca88587
Browse files
thisalihassanaduh95
thisalihassan
authored and
aduh95
committed
sqlite: refactor error helpers and user function pointers
Signed-off-by: Ali Hassan <ali-hassan27@outlook.com>
PR-URL: #62794
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ee7bf09 commit ca88587
2 files changed
Lines changed: 57 additions & 66 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 55 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
170170
returnnullptr;
171171
}
172172

173-
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
174-
constchar* message) {
173+
namespace {
174+
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
175+
constchar* message,
176+
constchar* errstr,
177+
int errcode) {
178+
 Environment* env = Environment::GetCurrent(isolate);
179+
 Local<Context> context = isolate->GetCurrentContext();
175180
 Local<String> js_msg;
176181
 Local<Object> e;
177-
 Environment* env = Environment::GetCurrent(isolate);
178182
if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
179-
 !Exception::Error(js_msg)
180-
 ->ToObject(isolate->GetCurrentContext())
181-
 .ToLocal(&e) ||
182-
 e->Set(isolate->GetCurrentContext(),
183-
 env->code_string(),
184-
 env->err_sqlite_error_string())
183+
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
184+
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
185185
 .IsNothing()) {
186186
return MaybeLocal<Object>();
187187
 }
188+
189+
if (errstr != nullptr) {
190+
 Local<String> js_errstr;
191+
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
192+
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
193+
 .IsNothing() ||
194+
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
195+
return MaybeLocal<Object>();
196+
 }
197+
 }
188198
return e;
189199
}
200+
} // namespace
201+
202+
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
203+
constchar* message) {
204+
returnCreateSQLiteErrorImpl(isolate, message, nullptr, 0);
205+
}
190206

191207
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
192208
constchar* errstr = sqlite3_errstr(errcode);
193-
 Local<String> js_errmsg;
194-
 Local<Object> e;
195-
 Environment* env = Environment::GetCurrent(isolate);
196-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
197-
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
198-
 e->Set(env->context(),
199-
 env->errcode_string(),
200-
Integer::New(isolate, errcode))
201-
 .IsNothing() ||
202-
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
203-
return MaybeLocal<Object>();
204-
 }
205-
return e;
209+
returnCreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
206210
}
207211

208212
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
209213
int errcode = sqlite3_extended_errcode(db);
210-
constchar* errstr = sqlite3_errstr(errcode);
211-
constchar* errmsg = sqlite3_errmsg(db);
212-
 Local<String> js_errmsg;
213-
 Local<Object> e;
214-
 Environment* env = Environment::GetCurrent(isolate);
215-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
216-
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
217-
 e->Set(isolate->GetCurrentContext(),
218-
 env->errcode_string(),
219-
Integer::New(isolate, errcode))
220-
 .IsNothing() ||
221-
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
222-
 .IsNothing()) {
223-
return MaybeLocal<Object>();
224-
 }
225-
return e;
214+
returnCreateSQLiteErrorImpl(
215+
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
226216
}
227217

228218
voidJSValueToSQLiteResult(Isolate* isolate,
@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
307297
classCustomAggregate {
308298
public:
309299
explicitCustomAggregate(Environment* env,
310-
 DatabaseSync* db,
300+
BaseObjectWeakPtr<DatabaseSync> db,
311301
bool use_bigint_args,
312302
 Local<Value> start,
313303
 Local<Function> step_fn,
314304
 Local<Function> inverse_fn,
315305
 Local<Function> result_fn)
316306
 : env_(env),
317-
 db_(db),
307+
 db_(std::move(db)),
318308
 use_bigint_args_(use_bigint_args),
319309
 start_(env->isolate(), start),
320310
 step_fn_(env->isolate(), step_fn),
@@ -350,7 +340,7 @@ class CustomAggregate {
350340
 Global<Function> CustomAggregate::*mptr) {
351341
 CustomAggregate* self =
352342
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
353-
 CallbackDepthGuard guard(self->db_);
343+
 CallbackDepthGuard guard(self->db_.get());
354344
 Environment* env = self->env_;
355345
 Isolate* isolate = env->isolate();
356346
auto agg = self->GetAggregate(ctx);
@@ -408,7 +398,7 @@ class CustomAggregate {
408398
staticinlinevoidxValueBase(sqlite3_context* ctx, bool is_final) {
409399
 CustomAggregate* self =
410400
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
411-
 CallbackDepthGuard guard(self->db_);
401+
 CallbackDepthGuard guard(self->db_.get());
412402
 Environment* env = self->env_;
413403
 Isolate* isolate = env->isolate();
414404
auto agg = self->GetAggregate(ctx);
@@ -487,7 +477,7 @@ class CustomAggregate {
487477
 }
488478

489479
 Environment* env_;
490-
 DatabaseSync* db_;
480+
BaseObjectWeakPtr<DatabaseSync> db_;
491481
bool use_bigint_args_;
492482
 Global<Value> start_;
493483
 Global<Function> step_fn_;
@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {
670660

671661
UserDefinedFunction::UserDefinedFunction(Environment* env,
672662
 Local<Function> fn,
673-
 DatabaseSync* db,
663+
BaseObjectWeakPtr<DatabaseSync> db,
674664
bool use_bigint_args)
675665
 : env_(env),
676666
 fn_(env->isolate(), fn),
677-
 db_(db),
667+
 db_(std::move(db)),
678668
 use_bigint_args_(use_bigint_args) {}
679669

680670
UserDefinedFunction::~UserDefinedFunction() {}
@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
684674
 sqlite3_value** argv) {
685675
 UserDefinedFunction* self =
686676
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
687-
 CallbackDepthGuard guard(self->db_);
677+
 CallbackDepthGuard guard(self->db_.get());
688678
 Environment* env = self->env_;
689679
 Isolate* isolate = env->isolate();
690680
auto recv = Undefined(isolate);
@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
17351725
 argc = js_len.As<Int32>()->Value();
17361726
 }
17371727

1738-
 UserDefinedFunction* user_data =
1739-
newUserDefinedFunction(env, fn, db, use_bigint_args);
1728+
 UserDefinedFunction* user_data =newUserDefinedFunction(
1729+
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
17401730
int text_rep = SQLITE_UTF8;
17411731

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

20582048
auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
20592049
auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
2060-
int r = sqlite3_create_window_function(db->connection_,
2061-
 *name,
2062-
 argc,
2063-
 text_rep,
2064-
newCustomAggregate(env,
2065-
 db,
2066-
 use_bigint_args,
2067-
 start_v,
2068-
 stepFunction,
2069-
 inverseFunc,
2070-
 resultFunction),
2071-
 CustomAggregate::xStep,
2072-
 CustomAggregate::xFinal,
2073-
 xValue,
2074-
 xInverse,
2075-
 CustomAggregate::xDestroy);
2050+
int r = sqlite3_create_window_function(
2051+
 db->connection_,
2052+
 *name,
2053+
 argc,
2054+
 text_rep,
2055+
newCustomAggregate(env,
2056+
 BaseObjectWeakPtr<DatabaseSync>(db),
2057+
 use_bigint_args,
2058+
 start_v,
2059+
 stepFunction,
2060+
 inverseFunc,
2061+
 resultFunction),
2062+
 CustomAggregate::xStep,
2063+
 CustomAggregate::xFinal,
2064+
 xValue,
2065+
 xInverse,
2066+
 CustomAggregate::xDestroy);
20762067
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
20772068
}
20782069

‎src/node_sqlite.h‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ class UserDefinedFunction {
430430
public:
431431
UserDefinedFunction(Environment* env,
432432
 v8::Local<v8::Function> fn,
433-
 DatabaseSync* db,
433+
BaseObjectWeakPtr<DatabaseSync> db,
434434
bool use_bigint_args);
435435
~UserDefinedFunction();
436436
staticvoidxFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
@@ -439,7 +439,7 @@ class UserDefinedFunction {
439439
private:
440440
 Environment* env_;
441441
 v8::Global<v8::Function> fn_;
442-
 DatabaseSync* db_;
442+
BaseObjectWeakPtr<DatabaseSync> db_;
443443
bool use_bigint_args_;
444444
};
445445

0 commit comments
Comments
 (0)

, '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
Commit ca88587
Browse files
thisalihassanaduh95
thisalihassan
authored and
aduh95
committed
sqlite: refactor error helpers and user function pointers
Signed-off-by: Ali Hassan <ali-hassan27@outlook.com>
PR-URL: #62794
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ee7bf09 commit ca88587
2 files changed
Lines changed: 57 additions & 66 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 55 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
170170
returnnullptr;
171171
}
172172

173-
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
174-
constchar* message) {
173+
namespace {
174+
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
175+
constchar* message,
176+
constchar* errstr,
177+
int errcode) {
178+
 Environment* env = Environment::GetCurrent(isolate);
179+
 Local<Context> context = isolate->GetCurrentContext();
175180
 Local<String> js_msg;
176181
 Local<Object> e;
177-
 Environment* env = Environment::GetCurrent(isolate);
178182
if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
179-
 !Exception::Error(js_msg)
180-
 ->ToObject(isolate->GetCurrentContext())
181-
 .ToLocal(&e) ||
182-
 e->Set(isolate->GetCurrentContext(),
183-
 env->code_string(),
184-
 env->err_sqlite_error_string())
183+
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
184+
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
185185
 .IsNothing()) {
186186
return MaybeLocal<Object>();
187187
 }
188+
189+
if (errstr != nullptr) {
190+
 Local<String> js_errstr;
191+
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
192+
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
193+
 .IsNothing() ||
194+
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
195+
return MaybeLocal<Object>();
196+
 }
197+
 }
188198
return e;
189199
}
200+
} // namespace
201+
202+
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
203+
constchar* message) {
204+
returnCreateSQLiteErrorImpl(isolate, message, nullptr, 0);
205+
}
190206

191207
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
192208
constchar* errstr = sqlite3_errstr(errcode);
193-
 Local<String> js_errmsg;
194-
 Local<Object> e;
195-
 Environment* env = Environment::GetCurrent(isolate);
196-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
197-
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
198-
 e->Set(env->context(),
199-
 env->errcode_string(),
200-
Integer::New(isolate, errcode))
201-
 .IsNothing() ||
202-
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
203-
return MaybeLocal<Object>();
204-
 }
205-
return e;
209+
returnCreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
206210
}
207211

208212
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
209213
int errcode = sqlite3_extended_errcode(db);
210-
constchar* errstr = sqlite3_errstr(errcode);
211-
constchar* errmsg = sqlite3_errmsg(db);
212-
 Local<String> js_errmsg;
213-
 Local<Object> e;
214-
 Environment* env = Environment::GetCurrent(isolate);
215-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
216-
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
217-
 e->Set(isolate->GetCurrentContext(),
218-
 env->errcode_string(),
219-
Integer::New(isolate, errcode))
220-
 .IsNothing() ||
221-
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
222-
 .IsNothing()) {
223-
return MaybeLocal<Object>();
224-
 }
225-
return e;
214+
returnCreateSQLiteErrorImpl(
215+
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
226216
}
227217

228218
voidJSValueToSQLiteResult(Isolate* isolate,
@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
307297
classCustomAggregate {
308298
public:
309299
explicitCustomAggregate(Environment* env,
310-
 DatabaseSync* db,
300+
BaseObjectWeakPtr<DatabaseSync> db,
311301
bool use_bigint_args,
312302
 Local<Value> start,
313303
 Local<Function> step_fn,
314304
 Local<Function> inverse_fn,
315305
 Local<Function> result_fn)
316306
 : env_(env),
317-
 db_(db),
307+
 db_(std::move(db)),
318308
 use_bigint_args_(use_bigint_args),
319309
 start_(env->isolate(), start),
320310
 step_fn_(env->isolate(), step_fn),
@@ -350,7 +340,7 @@ class CustomAggregate {
350340
 Global<Function> CustomAggregate::*mptr) {
351341
 CustomAggregate* self =
352342
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
353-
 CallbackDepthGuard guard(self->db_);
343+
 CallbackDepthGuard guard(self->db_.get());
354344
 Environment* env = self->env_;
355345
 Isolate* isolate = env->isolate();
356346
auto agg = self->GetAggregate(ctx);
@@ -408,7 +398,7 @@ class CustomAggregate {
408398
staticinlinevoidxValueBase(sqlite3_context* ctx, bool is_final) {
409399
 CustomAggregate* self =
410400
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
411-
 CallbackDepthGuard guard(self->db_);
401+
 CallbackDepthGuard guard(self->db_.get());
412402
 Environment* env = self->env_;
413403
 Isolate* isolate = env->isolate();
414404
auto agg = self->GetAggregate(ctx);
@@ -487,7 +477,7 @@ class CustomAggregate {
487477
 }
488478

489479
 Environment* env_;
490-
 DatabaseSync* db_;
480+
BaseObjectWeakPtr<DatabaseSync> db_;
491481
bool use_bigint_args_;
492482
 Global<Value> start_;
493483
 Global<Function> step_fn_;
@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {
670660

671661
UserDefinedFunction::UserDefinedFunction(Environment* env,
672662
 Local<Function> fn,
673-
 DatabaseSync* db,
663+
BaseObjectWeakPtr<DatabaseSync> db,
674664
bool use_bigint_args)
675665
 : env_(env),
676666
 fn_(env->isolate(), fn),
677-
 db_(db),
667+
 db_(std::move(db)),
678668
 use_bigint_args_(use_bigint_args) {}
679669

680670
UserDefinedFunction::~UserDefinedFunction() {}
@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
684674
 sqlite3_value** argv) {
685675
 UserDefinedFunction* self =
686676
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
687-
 CallbackDepthGuard guard(self->db_);
677+
 CallbackDepthGuard guard(self->db_.get());
688678
 Environment* env = self->env_;
689679
 Isolate* isolate = env->isolate();
690680
auto recv = Undefined(isolate);
@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
17351725
 argc = js_len.As<Int32>()->Value();
17361726
 }
17371727

1738-
 UserDefinedFunction* user_data =
1739-
newUserDefinedFunction(env, fn, db, use_bigint_args);
1728+
 UserDefinedFunction* user_data =newUserDefinedFunction(
1729+
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
17401730
int text_rep = SQLITE_UTF8;
17411731

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

20582048
auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
20592049
auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
2060-
int r = sqlite3_create_window_function(db->connection_,
2061-
 *name,
2062-
 argc,
2063-
 text_rep,
2064-
newCustomAggregate(env,
2065-
 db,
2066-
 use_bigint_args,
2067-
 start_v,
2068-
 stepFunction,
2069-
 inverseFunc,
2070-
 resultFunction),
2071-
 CustomAggregate::xStep,
2072-
 CustomAggregate::xFinal,
2073-
 xValue,
2074-
 xInverse,
2075-
 CustomAggregate::xDestroy);
2050+
int r = sqlite3_create_window_function(
2051+
 db->connection_,
2052+
 *name,
2053+
 argc,
2054+
 text_rep,
2055+
newCustomAggregate(env,
2056+
 BaseObjectWeakPtr<DatabaseSync>(db),
2057+
 use_bigint_args,
2058+
 start_v,
2059+
 stepFunction,
2060+
 inverseFunc,
2061+
 resultFunction),
2062+
 CustomAggregate::xStep,
2063+
 CustomAggregate::xFinal,
2064+
 xValue,
2065+
 xInverse,
2066+
 CustomAggregate::xDestroy);
20762067
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
20772068
}
20782069

‎src/node_sqlite.h‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ class UserDefinedFunction {
430430
public:
431431
UserDefinedFunction(Environment* env,
432432
 v8::Local<v8::Function> fn,
433-
 DatabaseSync* db,
433+
BaseObjectWeakPtr<DatabaseSync> db,
434434
bool use_bigint_args);
435435
~UserDefinedFunction();
436436
staticvoidxFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
@@ -439,7 +439,7 @@ class UserDefinedFunction {
439439
private:
440440
 Environment* env_;
441441
 v8::Global<v8::Function> fn_;
442-
 DatabaseSync* db_;
442+
BaseObjectWeakPtr<DatabaseSync> db_;
443443
bool use_bigint_args_;
444444
};
445445

0 commit comments
Comments
 (0)

, '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
Commit ca88587
Browse files
thisalihassanaduh95
thisalihassan
authored and
aduh95
committed
sqlite: refactor error helpers and user function pointers
Signed-off-by: Ali Hassan <ali-hassan27@outlook.com>
PR-URL: #62794
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ee7bf09 commit ca88587
2 files changed
Lines changed: 57 additions & 66 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 55 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
170170
returnnullptr;
171171
}
172172

173-
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
174-
constchar* message) {
173+
namespace {
174+
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
175+
constchar* message,
176+
constchar* errstr,
177+
int errcode) {
178+
 Environment* env = Environment::GetCurrent(isolate);
179+
 Local<Context> context = isolate->GetCurrentContext();
175180
 Local<String> js_msg;
176181
 Local<Object> e;
177-
 Environment* env = Environment::GetCurrent(isolate);
178182
if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
179-
 !Exception::Error(js_msg)
180-
 ->ToObject(isolate->GetCurrentContext())
181-
 .ToLocal(&e) ||
182-
 e->Set(isolate->GetCurrentContext(),
183-
 env->code_string(),
184-
 env->err_sqlite_error_string())
183+
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
184+
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
185185
 .IsNothing()) {
186186
return MaybeLocal<Object>();
187187
 }
188+
189+
if (errstr != nullptr) {
190+
 Local<String> js_errstr;
191+
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
192+
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
193+
 .IsNothing() ||
194+
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
195+
return MaybeLocal<Object>();
196+
 }
197+
 }
188198
return e;
189199
}
200+
} // namespace
201+
202+
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
203+
constchar* message) {
204+
returnCreateSQLiteErrorImpl(isolate, message, nullptr, 0);
205+
}
190206

191207
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
192208
constchar* errstr = sqlite3_errstr(errcode);
193-
 Local<String> js_errmsg;
194-
 Local<Object> e;
195-
 Environment* env = Environment::GetCurrent(isolate);
196-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
197-
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
198-
 e->Set(env->context(),
199-
 env->errcode_string(),
200-
Integer::New(isolate, errcode))
201-
 .IsNothing() ||
202-
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
203-
return MaybeLocal<Object>();
204-
 }
205-
return e;
209+
returnCreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
206210
}
207211

208212
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
209213
int errcode = sqlite3_extended_errcode(db);
210-
constchar* errstr = sqlite3_errstr(errcode);
211-
constchar* errmsg = sqlite3_errmsg(db);
212-
 Local<String> js_errmsg;
213-
 Local<Object> e;
214-
 Environment* env = Environment::GetCurrent(isolate);
215-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
216-
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
217-
 e->Set(isolate->GetCurrentContext(),
218-
 env->errcode_string(),
219-
Integer::New(isolate, errcode))
220-
 .IsNothing() ||
221-
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
222-
 .IsNothing()) {
223-
return MaybeLocal<Object>();
224-
 }
225-
return e;
214+
returnCreateSQLiteErrorImpl(
215+
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
226216
}
227217

228218
voidJSValueToSQLiteResult(Isolate* isolate,
@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
307297
classCustomAggregate {
308298
public:
309299
explicitCustomAggregate(Environment* env,
310-
 DatabaseSync* db,
300+
BaseObjectWeakPtr<DatabaseSync> db,
311301
bool use_bigint_args,
312302
 Local<Value> start,
313303
 Local<Function> step_fn,
314304
 Local<Function> inverse_fn,
315305
 Local<Function> result_fn)
316306
 : env_(env),
317-
 db_(db),
307+
 db_(std::move(db)),
318308
 use_bigint_args_(use_bigint_args),
319309
 start_(env->isolate(), start),
320310
 step_fn_(env->isolate(), step_fn),
@@ -350,7 +340,7 @@ class CustomAggregate {
350340
 Global<Function> CustomAggregate::*mptr) {
351341
 CustomAggregate* self =
352342
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
353-
 CallbackDepthGuard guard(self->db_);
343+
 CallbackDepthGuard guard(self->db_.get());
354344
 Environment* env = self->env_;
355345
 Isolate* isolate = env->isolate();
356346
auto agg = self->GetAggregate(ctx);
@@ -408,7 +398,7 @@ class CustomAggregate {
408398
staticinlinevoidxValueBase(sqlite3_context* ctx, bool is_final) {
409399
 CustomAggregate* self =
410400
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
411-
 CallbackDepthGuard guard(self->db_);
401+
 CallbackDepthGuard guard(self->db_.get());
412402
 Environment* env = self->env_;
413403
 Isolate* isolate = env->isolate();
414404
auto agg = self->GetAggregate(ctx);
@@ -487,7 +477,7 @@ class CustomAggregate {
487477
 }
488478

489479
 Environment* env_;
490-
 DatabaseSync* db_;
480+
BaseObjectWeakPtr<DatabaseSync> db_;
491481
bool use_bigint_args_;
492482
 Global<Value> start_;
493483
 Global<Function> step_fn_;
@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {
670660

671661
UserDefinedFunction::UserDefinedFunction(Environment* env,
672662
 Local<Function> fn,
673-
 DatabaseSync* db,
663+
BaseObjectWeakPtr<DatabaseSync> db,
674664
bool use_bigint_args)
675665
 : env_(env),
676666
 fn_(env->isolate(), fn),
677-
 db_(db),
667+
 db_(std::move(db)),
678668
 use_bigint_args_(use_bigint_args) {}
679669

680670
UserDefinedFunction::~UserDefinedFunction() {}
@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
684674
 sqlite3_value** argv) {
685675
 UserDefinedFunction* self =
686676
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
687-
 CallbackDepthGuard guard(self->db_);
677+
 CallbackDepthGuard guard(self->db_.get());
688678
 Environment* env = self->env_;
689679
 Isolate* isolate = env->isolate();
690680
auto recv = Undefined(isolate);
@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
17351725
 argc = js_len.As<Int32>()->Value();
17361726
 }
17371727

1738-
 UserDefinedFunction* user_data =
1739-
newUserDefinedFunction(env, fn, db, use_bigint_args);
1728+
 UserDefinedFunction* user_data =newUserDefinedFunction(
1729+
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
17401730
int text_rep = SQLITE_UTF8;
17411731

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

20582048
auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
20592049
auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
2060-
int r = sqlite3_create_window_function(db->connection_,
2061-
 *name,
2062-
 argc,
2063-
 text_rep,
2064-
newCustomAggregate(env,
2065-
 db,
2066-
 use_bigint_args,
2067-
 start_v,
2068-
 stepFunction,
2069-
 inverseFunc,
2070-
 resultFunction),
2071-
 CustomAggregate::xStep,
2072-
 CustomAggregate::xFinal,
2073-
 xValue,
2074-
 xInverse,
2075-
 CustomAggregate::xDestroy);
2050+
int r = sqlite3_create_window_function(
2051+
 db->connection_,
2052+
 *name,
2053+
 argc,
2054+
 text_rep,
2055+
newCustomAggregate(env,
2056+
 BaseObjectWeakPtr<DatabaseSync>(db),
2057+
 use_bigint_args,
2058+
 start_v,
2059+
 stepFunction,
2060+
 inverseFunc,
2061+
 resultFunction),
2062+
 CustomAggregate::xStep,
2063+
 CustomAggregate::xFinal,
2064+
 xValue,
2065+
 xInverse,
2066+
 CustomAggregate::xDestroy);
20762067
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
20772068
}
20782069

‎src/node_sqlite.h‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ class UserDefinedFunction {
430430
public:
431431
UserDefinedFunction(Environment* env,
432432
 v8::Local<v8::Function> fn,
433-
 DatabaseSync* db,
433+
BaseObjectWeakPtr<DatabaseSync> db,
434434
bool use_bigint_args);
435435
~UserDefinedFunction();
436436
staticvoidxFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
@@ -439,7 +439,7 @@ class UserDefinedFunction {
439439
private:
440440
 Environment* env_;
441441
 v8::Global<v8::Function> fn_;
442-
 DatabaseSync* db_;
442+
BaseObjectWeakPtr<DatabaseSync> db_;
443443
bool use_bigint_args_;
444444
};
445445

0 commit comments
Comments
 (0)

, '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
Commit ca88587
Browse files
thisalihassanaduh95
thisalihassan
authored and
aduh95
committed
sqlite: refactor error helpers and user function pointers
Signed-off-by: Ali Hassan <ali-hassan27@outlook.com>
PR-URL: #62794
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ee7bf09 commit ca88587
2 files changed
Lines changed: 57 additions & 66 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 55 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
170170
returnnullptr;
171171
}
172172

173-
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
174-
constchar* message) {
173+
namespace {
174+
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
175+
constchar* message,
176+
constchar* errstr,
177+
int errcode) {
178+
 Environment* env = Environment::GetCurrent(isolate);
179+
 Local<Context> context = isolate->GetCurrentContext();
175180
 Local<String> js_msg;
176181
 Local<Object> e;
177-
 Environment* env = Environment::GetCurrent(isolate);
178182
if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
179-
 !Exception::Error(js_msg)
180-
 ->ToObject(isolate->GetCurrentContext())
181-
 .ToLocal(&e) ||
182-
 e->Set(isolate->GetCurrentContext(),
183-
 env->code_string(),
184-
 env->err_sqlite_error_string())
183+
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
184+
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
185185
 .IsNothing()) {
186186
return MaybeLocal<Object>();
187187
 }
188+
189+
if (errstr != nullptr) {
190+
 Local<String> js_errstr;
191+
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
192+
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
193+
 .IsNothing() ||
194+
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
195+
return MaybeLocal<Object>();
196+
 }
197+
 }
188198
return e;
189199
}
200+
} // namespace
201+
202+
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
203+
constchar* message) {
204+
returnCreateSQLiteErrorImpl(isolate, message, nullptr, 0);
205+
}
190206

191207
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
192208
constchar* errstr = sqlite3_errstr(errcode);
193-
 Local<String> js_errmsg;
194-
 Local<Object> e;
195-
 Environment* env = Environment::GetCurrent(isolate);
196-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
197-
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
198-
 e->Set(env->context(),
199-
 env->errcode_string(),
200-
Integer::New(isolate, errcode))
201-
 .IsNothing() ||
202-
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
203-
return MaybeLocal<Object>();
204-
 }
205-
return e;
209+
returnCreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
206210
}
207211

208212
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
209213
int errcode = sqlite3_extended_errcode(db);
210-
constchar* errstr = sqlite3_errstr(errcode);
211-
constchar* errmsg = sqlite3_errmsg(db);
212-
 Local<String> js_errmsg;
213-
 Local<Object> e;
214-
 Environment* env = Environment::GetCurrent(isolate);
215-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
216-
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
217-
 e->Set(isolate->GetCurrentContext(),
218-
 env->errcode_string(),
219-
Integer::New(isolate, errcode))
220-
 .IsNothing() ||
221-
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
222-
 .IsNothing()) {
223-
return MaybeLocal<Object>();
224-
 }
225-
return e;
214+
returnCreateSQLiteErrorImpl(
215+
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
226216
}
227217

228218
voidJSValueToSQLiteResult(Isolate* isolate,
@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
307297
classCustomAggregate {
308298
public:
309299
explicitCustomAggregate(Environment* env,
310-
 DatabaseSync* db,
300+
BaseObjectWeakPtr<DatabaseSync> db,
311301
bool use_bigint_args,
312302
 Local<Value> start,
313303
 Local<Function> step_fn,
314304
 Local<Function> inverse_fn,
315305
 Local<Function> result_fn)
316306
 : env_(env),
317-
 db_(db),
307+
 db_(std::move(db)),
318308
 use_bigint_args_(use_bigint_args),
319309
 start_(env->isolate(), start),
320310
 step_fn_(env->isolate(), step_fn),
@@ -350,7 +340,7 @@ class CustomAggregate {
350340
 Global<Function> CustomAggregate::*mptr) {
351341
 CustomAggregate* self =
352342
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
353-
 CallbackDepthGuard guard(self->db_);
343+
 CallbackDepthGuard guard(self->db_.get());
354344
 Environment* env = self->env_;
355345
 Isolate* isolate = env->isolate();
356346
auto agg = self->GetAggregate(ctx);
@@ -408,7 +398,7 @@ class CustomAggregate {
408398
staticinlinevoidxValueBase(sqlite3_context* ctx, bool is_final) {
409399
 CustomAggregate* self =
410400
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
411-
 CallbackDepthGuard guard(self->db_);
401+
 CallbackDepthGuard guard(self->db_.get());
412402
 Environment* env = self->env_;
413403
 Isolate* isolate = env->isolate();
414404
auto agg = self->GetAggregate(ctx);
@@ -487,7 +477,7 @@ class CustomAggregate {
487477
 }
488478

489479
 Environment* env_;
490-
 DatabaseSync* db_;
480+
BaseObjectWeakPtr<DatabaseSync> db_;
491481
bool use_bigint_args_;
492482
 Global<Value> start_;
493483
 Global<Function> step_fn_;
@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {
670660

671661
UserDefinedFunction::UserDefinedFunction(Environment* env,
672662
 Local<Function> fn,
673-
 DatabaseSync* db,
663+
BaseObjectWeakPtr<DatabaseSync> db,
674664
bool use_bigint_args)
675665
 : env_(env),
676666
 fn_(env->isolate(), fn),
677-
 db_(db),
667+
 db_(std::move(db)),
678668
 use_bigint_args_(use_bigint_args) {}
679669

680670
UserDefinedFunction::~UserDefinedFunction() {}
@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
684674
 sqlite3_value** argv) {
685675
 UserDefinedFunction* self =
686676
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
687-
 CallbackDepthGuard guard(self->db_);
677+
 CallbackDepthGuard guard(self->db_.get());
688678
 Environment* env = self->env_;
689679
 Isolate* isolate = env->isolate();
690680
auto recv = Undefined(isolate);
@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
17351725
 argc = js_len.As<Int32>()->Value();
17361726
 }
17371727

1738-
 UserDefinedFunction* user_data =
1739-
newUserDefinedFunction(env, fn, db, use_bigint_args);
1728+
 UserDefinedFunction* user_data =newUserDefinedFunction(
1729+
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
17401730
int text_rep = SQLITE_UTF8;
17411731

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

20582048
auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
20592049
auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
2060-
int r = sqlite3_create_window_function(db->connection_,
2061-
 *name,
2062-
 argc,
2063-
 text_rep,
2064-
newCustomAggregate(env,
2065-
 db,
2066-
 use_bigint_args,
2067-
 start_v,
2068-
 stepFunction,
2069-
 inverseFunc,
2070-
 resultFunction),
2071-
 CustomAggregate::xStep,
2072-
 CustomAggregate::xFinal,
2073-
 xValue,
2074-
 xInverse,
2075-
 CustomAggregate::xDestroy);
2050+
int r = sqlite3_create_window_function(
2051+
 db->connection_,
2052+
 *name,
2053+
 argc,
2054+
 text_rep,
2055+
newCustomAggregate(env,
2056+
 BaseObjectWeakPtr<DatabaseSync>(db),
2057+
 use_bigint_args,
2058+
 start_v,
2059+
 stepFunction,
2060+
 inverseFunc,
2061+
 resultFunction),
2062+
 CustomAggregate::xStep,
2063+
 CustomAggregate::xFinal,
2064+
 xValue,
2065+
 xInverse,
2066+
 CustomAggregate::xDestroy);
20762067
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
20772068
}
20782069

‎src/node_sqlite.h‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ class UserDefinedFunction {
430430
public:
431431
UserDefinedFunction(Environment* env,
432432
 v8::Local<v8::Function> fn,
433-
 DatabaseSync* db,
433+
BaseObjectWeakPtr<DatabaseSync> db,
434434
bool use_bigint_args);
435435
~UserDefinedFunction();
436436
staticvoidxFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
@@ -439,7 +439,7 @@ class UserDefinedFunction {
439439
private:
440440
 Environment* env_;
441441
 v8::Global<v8::Function> fn_;
442-
 DatabaseSync* db_;
442+
BaseObjectWeakPtr<DatabaseSync> db_;
443443
bool use_bigint_args_;
444444
};
445445

0 commit comments
Comments
 (0)

, '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
Commit ca88587
Browse files
thisalihassanaduh95
thisalihassan
authored and
aduh95
committed
sqlite: refactor error helpers and user function pointers
Signed-off-by: Ali Hassan <ali-hassan27@outlook.com>
PR-URL: #62794
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ee7bf09 commit ca88587
2 files changed
Lines changed: 57 additions & 66 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 55 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -170,59 +170,49 @@ static constexpr const LimitInfo* GetLimitInfoFromName(std::string_view name) {
170170
returnnullptr;
171171
}
172172

173-
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
174-
constchar* message) {
173+
namespace {
174+
MaybeLocal<Object> CreateSQLiteErrorImpl(Isolate* isolate,
175+
constchar* message,
176+
constchar* errstr,
177+
int errcode) {
178+
 Environment* env = Environment::GetCurrent(isolate);
179+
 Local<Context> context = isolate->GetCurrentContext();
175180
 Local<String> js_msg;
176181
 Local<Object> e;
177-
 Environment* env = Environment::GetCurrent(isolate);
178182
if (!String::NewFromUtf8(isolate, message).ToLocal(&js_msg) ||
179-
 !Exception::Error(js_msg)
180-
 ->ToObject(isolate->GetCurrentContext())
181-
 .ToLocal(&e) ||
182-
 e->Set(isolate->GetCurrentContext(),
183-
 env->code_string(),
184-
 env->err_sqlite_error_string())
183+
 !Exception::Error(js_msg)->ToObject(context).ToLocal(&e) ||
184+
 e->Set(context, env->code_string(), env->err_sqlite_error_string())
185185
 .IsNothing()) {
186186
return MaybeLocal<Object>();
187187
 }
188+
189+
if (errstr != nullptr) {
190+
 Local<String> js_errstr;
191+
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errstr) ||
192+
 e->Set(context, env->errcode_string(), Integer::New(isolate, errcode))
193+
 .IsNothing() ||
194+
 e->Set(context, env->errstr_string(), js_errstr).IsNothing()) {
195+
return MaybeLocal<Object>();
196+
 }
197+
 }
188198
return e;
189199
}
200+
} // namespace
201+
202+
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate,
203+
constchar* message) {
204+
returnCreateSQLiteErrorImpl(isolate, message, nullptr, 0);
205+
}
190206

191207
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, int errcode) {
192208
constchar* errstr = sqlite3_errstr(errcode);
193-
 Local<String> js_errmsg;
194-
 Local<Object> e;
195-
 Environment* env = Environment::GetCurrent(isolate);
196-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
197-
 !CreateSQLiteError(isolate, errstr).ToLocal(&e) ||
198-
 e->Set(env->context(),
199-
 env->errcode_string(),
200-
Integer::New(isolate, errcode))
201-
 .IsNothing() ||
202-
 e->Set(env->context(), env->errstr_string(), js_errmsg).IsNothing()) {
203-
return MaybeLocal<Object>();
204-
 }
205-
return e;
209+
returnCreateSQLiteErrorImpl(isolate, errstr, errstr, errcode);
206210
}
207211

208212
inline MaybeLocal<Object> CreateSQLiteError(Isolate* isolate, sqlite3* db) {
209213
int errcode = sqlite3_extended_errcode(db);
210-
constchar* errstr = sqlite3_errstr(errcode);
211-
constchar* errmsg = sqlite3_errmsg(db);
212-
 Local<String> js_errmsg;
213-
 Local<Object> e;
214-
 Environment* env = Environment::GetCurrent(isolate);
215-
if (!String::NewFromUtf8(isolate, errstr).ToLocal(&js_errmsg) ||
216-
 !CreateSQLiteError(isolate, errmsg).ToLocal(&e) ||
217-
 e->Set(isolate->GetCurrentContext(),
218-
 env->errcode_string(),
219-
Integer::New(isolate, errcode))
220-
 .IsNothing() ||
221-
 e->Set(isolate->GetCurrentContext(), env->errstr_string(), js_errmsg)
222-
 .IsNothing()) {
223-
return MaybeLocal<Object>();
224-
 }
225-
return e;
214+
returnCreateSQLiteErrorImpl(
215+
 isolate, sqlite3_errmsg(db), sqlite3_errstr(errcode), errcode);
226216
}
227217

228218
voidJSValueToSQLiteResult(Isolate* isolate,
@@ -307,14 +297,14 @@ inline MaybeLocal<Value> NullableSQLiteStringToValue(Isolate* isolate,
307297
classCustomAggregate {
308298
public:
309299
explicitCustomAggregate(Environment* env,
310-
 DatabaseSync* db,
300+
BaseObjectWeakPtr<DatabaseSync> db,
311301
bool use_bigint_args,
312302
 Local<Value> start,
313303
 Local<Function> step_fn,
314304
 Local<Function> inverse_fn,
315305
 Local<Function> result_fn)
316306
 : env_(env),
317-
 db_(db),
307+
 db_(std::move(db)),
318308
 use_bigint_args_(use_bigint_args),
319309
 start_(env->isolate(), start),
320310
 step_fn_(env->isolate(), step_fn),
@@ -350,7 +340,7 @@ class CustomAggregate {
350340
 Global<Function> CustomAggregate::*mptr) {
351341
 CustomAggregate* self =
352342
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
353-
 CallbackDepthGuard guard(self->db_);
343+
 CallbackDepthGuard guard(self->db_.get());
354344
 Environment* env = self->env_;
355345
 Isolate* isolate = env->isolate();
356346
auto agg = self->GetAggregate(ctx);
@@ -408,7 +398,7 @@ class CustomAggregate {
408398
staticinlinevoidxValueBase(sqlite3_context* ctx, bool is_final) {
409399
 CustomAggregate* self =
410400
static_cast<CustomAggregate*>(sqlite3_user_data(ctx));
411-
 CallbackDepthGuard guard(self->db_);
401+
 CallbackDepthGuard guard(self->db_.get());
412402
 Environment* env = self->env_;
413403
 Isolate* isolate = env->isolate();
414404
auto agg = self->GetAggregate(ctx);
@@ -487,7 +477,7 @@ class CustomAggregate {
487477
 }
488478

489479
 Environment* env_;
490-
 DatabaseSync* db_;
480+
BaseObjectWeakPtr<DatabaseSync> db_;
491481
bool use_bigint_args_;
492482
 Global<Value> start_;
493483
 Global<Function> step_fn_;
@@ -670,11 +660,11 @@ class BackupJob : public ThreadPoolWork {
670660

671661
UserDefinedFunction::UserDefinedFunction(Environment* env,
672662
 Local<Function> fn,
673-
 DatabaseSync* db,
663+
BaseObjectWeakPtr<DatabaseSync> db,
674664
bool use_bigint_args)
675665
 : env_(env),
676666
 fn_(env->isolate(), fn),
677-
 db_(db),
667+
 db_(std::move(db)),
678668
 use_bigint_args_(use_bigint_args) {}
679669

680670
UserDefinedFunction::~UserDefinedFunction() {}
@@ -684,7 +674,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
684674
 sqlite3_value** argv) {
685675
 UserDefinedFunction* self =
686676
static_cast<UserDefinedFunction*>(sqlite3_user_data(ctx));
687-
 CallbackDepthGuard guard(self->db_);
677+
 CallbackDepthGuard guard(self->db_.get());
688678
 Environment* env = self->env_;
689679
 Isolate* isolate = env->isolate();
690680
auto recv = Undefined(isolate);
@@ -1735,8 +1725,8 @@ void DatabaseSync::CustomFunction(const FunctionCallbackInfo<Value>& args) {
17351725
 argc = js_len.As<Int32>()->Value();
17361726
 }
17371727

1738-
 UserDefinedFunction* user_data =
1739-
newUserDefinedFunction(env, fn, db, use_bigint_args);
1728+
 UserDefinedFunction* user_data =newUserDefinedFunction(
1729+
 env, fn, BaseObjectWeakPtr<DatabaseSync>(db), use_bigint_args);
17401730
int text_rep = SQLITE_UTF8;
17411731

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

20582048
auto xInverse = !inverseFunc.IsEmpty() ? CustomAggregate::xInverse : nullptr;
20592049
auto xValue = xInverse ? CustomAggregate::xValue : nullptr;
2060-
int r = sqlite3_create_window_function(db->connection_,
2061-
 *name,
2062-
 argc,
2063-
 text_rep,
2064-
newCustomAggregate(env,
2065-
 db,
2066-
 use_bigint_args,
2067-
 start_v,
2068-
 stepFunction,
2069-
 inverseFunc,
2070-
 resultFunction),
2071-
 CustomAggregate::xStep,
2072-
 CustomAggregate::xFinal,
2073-
 xValue,
2074-
 xInverse,
2075-
 CustomAggregate::xDestroy);
2050+
int r = sqlite3_create_window_function(
2051+
 db->connection_,
2052+
 *name,
2053+
 argc,
2054+
 text_rep,
2055+
newCustomAggregate(env,
2056+
 BaseObjectWeakPtr<DatabaseSync>(db),
2057+
 use_bigint_args,
2058+
 start_v,
2059+
 stepFunction,
2060+
 inverseFunc,
2061+
 resultFunction),
2062+
 CustomAggregate::xStep,
2063+
 CustomAggregate::xFinal,
2064+
 xValue,
2065+
 xInverse,
2066+
 CustomAggregate::xDestroy);
20762067
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
20772068
}
20782069

‎src/node_sqlite.h‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ class UserDefinedFunction {
430430
public:
431431
UserDefinedFunction(Environment* env,
432432
 v8::Local<v8::Function> fn,
433-
 DatabaseSync* db,
433+
BaseObjectWeakPtr<DatabaseSync> db,
434434
bool use_bigint_args);
435435
~UserDefinedFunction();
436436
staticvoidxFunc(sqlite3_context* ctx, int argc, sqlite3_value** argv);
@@ -439,7 +439,7 @@ class UserDefinedFunction {
439439
private:
440440
 Environment* env_;
441441
 v8::Global<v8::Function> fn_;
442-
 DatabaseSync* db_;
442+
BaseObjectWeakPtr<DatabaseSync> db_;
443443
bool use_bigint_args_;
444444
};
445445

0 commit comments
Comments
 (0)