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

Open
thisalihassan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

sqlite: refactor error helpers and user function pointers #62794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 52 additions & 61 deletions src/node_sqlite.cc
View file
Open in desktop
Original file line number Diff line number Diff 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 Down Expand Up @@ -306,14 +296,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 Down Expand Up @@ -472,7 +462,7 @@ class CustomAggregate {
}

Environment* env_;
DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
bool use_bigint_args_;
Global<Value> start_;
Global<Function> step_fn_;
Expand Down Expand Up @@ -645,11 +635,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 Down Expand Up @@ -1684,8 +1674,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 Down Expand Up @@ -2006,22 +1996,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 number Diff line number Diff line change
Expand Up @@ -402,7 +402,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 @@ -411,7 +411,7 @@ class UserDefinedFunction {
private:
Environment* env_;
v8::Global<v8::Function> fn_;
DatabaseSync* db_;
BaseObjectWeakPtr<DatabaseSync> db_;
bool use_bigint_args_;
};

Expand Down
Loading