Skip to content

Commit da1856b

Browse files
committed
sqlite: simplify StatementSync dispose
Signed-off-by: Guilherme Araújo <arauujogui@gmail.com>
1 parent 3f967fc commit da1856b

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

src/node_sqlite.cc

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2599,14 +2599,10 @@ inline bool StatementSync::IsFinalized() {
25992599
return statement_ == nullptr;
26002600
}
26012601

2602-
void StatementSync::Dispose(const FunctionCallbackInfo<Value>& args) {
2602+
void StatementSync::Close(const FunctionCallbackInfo<Value>& args) {
26032603
StatementSync* stmt;
26042604
ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
2605-
v8::TryCatch try_catch(args.GetIsolate());
26062605
stmt->Close();
2607-
if (try_catch.HasCaught()) {
2608-
CHECK(try_catch.CanContinue());
2609-
}
26102606
}
26112607

26122608
inline int StatementSync::ResetStatement() {
@@ -3636,7 +3632,7 @@ Local<FunctionTemplate> StatementSync::GetConstructorTemplate(
36363632
isolate, tmpl, "setReadBigInts", StatementSync::SetReadBigInts);
36373633
SetProtoMethod(
36383634
isolate, tmpl, "setReturnArrays", StatementSync::SetReturnArrays);
3639-
SetProtoDispose(isolate, tmpl, StatementSync::Dispose);
3635+
SetProtoDispose(isolate, tmpl, StatementSync::Close);
36403636
env->set_sqlite_statement_sync_constructor_template(tmpl);
36413637
}
36423638
return tmpl;

src/node_sqlite.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ class StatementSync : public BaseObject {
278278
const v8::FunctionCallbackInfo<v8::Value>& args);
279279
static void SetReadBigInts(const v8::FunctionCallbackInfo<v8::Value>& args);
280280
static void SetReturnArrays(const v8::FunctionCallbackInfo<v8::Value>& args);
281-
static void Dispose(const v8::FunctionCallbackInfo<v8::Value>& args);
281+
static void Close(const v8::FunctionCallbackInfo<v8::Value>& args);
282282
v8::MaybeLocal<v8::Value> ColumnToValue(const int column);
283283
v8::MaybeLocal<v8::Name> ColumnNameToName(const int column);
284284
bool GetCachedColumnNames(v8::LocalVector<v8::Name>* keys);

0 commit comments

Comments
 (0)