Skip to content

Commit 8bda876

Browse files
committed
Refactored Database to use macros for method definitions
- this cleans up similar definitions and makes further refactors easier
1 parent 5809f62 commit 8bda876

File tree

2 files changed

+6
-24
lines changed

2 files changed

+6
-24
lines changed

src/database.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Napi::Object Database::Init(Napi::Env env, Napi::Object exports) {
2525
InstanceMethod("parallelize", &Database::Parallelize, napi_default_method),
2626
InstanceMethod("configure", &Database::Configure, napi_default_method),
2727
InstanceMethod("interrupt", &Database::Interrupt, napi_default_method),
28-
InstanceAccessor("open", &Database::OpenGetter, nullptr)
28+
InstanceAccessor("open", &Database::Open, nullptr)
2929
});
3030

3131
#if NAPI_VERSION < 6
@@ -212,7 +212,7 @@ void Database::Work_AfterOpen(napi_env e, napi_status status, void* data) {
212212
}
213213
}
214214

215-
Napi::Value Database::OpenGetter(const Napi::CallbackInfo& info) {
215+
Napi::Value Database::Open(const Napi::CallbackInfo& info) {
216216
auto env = this->Env();
217217
auto* db = this;
218218
return Napi::Boolean::New(env, db->open);

src/database.h

+4-22
Original file line numberDiff line numberDiff line change
@@ -145,38 +145,20 @@ class Database : public Napi::ObjectWrap<Database> {
145145
}
146146

147147
protected:
148-
static void Work_BeginOpen(Baton* baton);
149-
static void Work_Open(napi_env env, void* data);
150-
static void Work_AfterOpen(napi_env env, napi_status status, void* data);
151-
152-
Napi::Value OpenGetter(const Napi::CallbackInfo& info);
148+
WORK_DEFINITION(Open);
149+
WORK_DEFINITION(Exec);
150+
WORK_DEFINITION(Close);
151+
WORK_DEFINITION(LoadExtension);
153152

154153
void Schedule(Work_Callback callback, Baton* baton, bool exclusive = false);
155154
void Process();
156155

157-
Napi::Value Exec(const Napi::CallbackInfo& info);
158-
static void Work_BeginExec(Baton* baton);
159-
static void Work_Exec(napi_env env, void* data);
160-
static void Work_AfterExec(napi_env env, napi_status status, void* data);
161-
162156
Napi::Value Wait(const Napi::CallbackInfo& info);
163157
static void Work_Wait(Baton* baton);
164158

165-
Napi::Value Close(const Napi::CallbackInfo& info);
166-
static void Work_BeginClose(Baton* baton);
167-
static void Work_Close(napi_env env, void* data);
168-
static void Work_AfterClose(napi_env env, napi_status status, void* data);
169-
170-
Napi::Value LoadExtension(const Napi::CallbackInfo& info);
171-
static void Work_BeginLoadExtension(Baton* baton);
172-
static void Work_LoadExtension(napi_env env, void* data);
173-
static void Work_AfterLoadExtension(napi_env env, napi_status status, void* data);
174-
175159
Napi::Value Serialize(const Napi::CallbackInfo& info);
176160
Napi::Value Parallelize(const Napi::CallbackInfo& info);
177-
178161
Napi::Value Configure(const Napi::CallbackInfo& info);
179-
180162
Napi::Value Interrupt(const Napi::CallbackInfo& info);
181163

182164
static void SetBusyTimeout(Baton* baton);

0 commit comments

Comments
 (0)