Skip to content

Commit 839c680

Browse files
louwerslouwers
committed
src: run format-cpp
1 parent f1cada1 commit 839c680

File tree

3 files changed

+63
-85
lines changed

3 files changed

+63
-85
lines changed

‎src/env_properties.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@
403403
V(shutdown_wrap_template, v8::ObjectTemplate) \
404404
V(socketaddress_constructor_template, v8::FunctionTemplate) \
405405
V(sqlite_statement_sync_constructor_template, v8::FunctionTemplate) \
406-
V(sqlite_session_constructor_template, v8::FunctionTemplate) \
406+
V(sqlite_session_constructor_template, v8::FunctionTemplate) \
407407
V(streambaseentry_ctor_template, v8::FunctionTemplate) \
408408
V(streambaseoutputstream_constructor_template, v8::ObjectTemplate) \
409409
V(streamentry_ctor_template, v8::FunctionTemplate) \

‎src/node_sqlite.cc‎

Lines changed: 59 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,12 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
236236

237237
Local<Object> options = args[0].As<Object>();
238238

239-
Local<String> table_key = String::NewFromUtf8(
240-
env->isolate(),
241-
"table",
242-
v8::NewStringType::kNormal).ToLocalChecked();
239+
Local<String> table_key =
240+
String::NewFromUtf8(env->isolate(), "table", v8::NewStringType::kNormal)
241+
.ToLocalChecked();
243242
if (options->HasOwnProperty(env->context(), table_key).FromJust()) {
244-
Local<Value> table_value = options->Get(
245-
env->context(),
246-
table_key).ToLocalChecked();
243+
Local<Value> table_value =
244+
options->Get(env->context(), table_key).ToLocalChecked();
247245

248246
if (table_value->IsString()) {
249247
String::Utf8Value str(env->isolate(), table_value);
@@ -255,14 +253,12 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
255253
}
256254
}
257255

258-
Local<String> db_key = String::NewFromUtf8(
259-
env->isolate(),
260-
"db",
261-
v8::NewStringType::kNormal).ToLocalChecked();
256+
Local<String> db_key =
257+
String::NewFromUtf8(env->isolate(), "db", v8::NewStringType::kNormal)
258+
.ToLocalChecked();
262259
if (options->HasOwnProperty(env->context(), db_key).FromJust()) {
263-
Local<Value> db_value = options->Get(
264-
env->context(),
265-
db_key).ToLocalChecked();
260+
Local<Value> db_value =
261+
options->Get(env->context(), db_key).ToLocalChecked();
266262
if (db_value->IsString()) {
267263
String::Utf8Value str(env->isolate(), db_value);
268264
dbName = std::string(*str);
@@ -287,7 +283,6 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
287283
r = sqlite3session_attach(pSession, table == "" ? nullptr : table.c_str());
288284
CHECK_ERROR_OR_THROW(env->isolate(), db->connection_, r, SQLITE_OK, void());
289285

290-
291286
BaseObjectPtr<Session> session =
292287
Session::Create(env, BaseObjectWeakPtr<DatabaseSync>(db), pSession);
293288
args.GetReturnValue().Set(session->object());
@@ -315,35 +310,31 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
315310
DatabaseSync* db;
316311
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
317312
Environment* env = Environment::GetCurrent(args);
318-
THROW_AND_RETURN_ON_BAD_STATE(env,
319-
db->connection_ == nullptr,
320-
"database is not open");
313+
THROW_AND_RETURN_ON_BAD_STATE(
314+
env, db->connection_ == nullptr, "database is not open");
321315

322316
if (!args[0]->IsUint8Array()) {
323317
node::THROW_ERR_INVALID_ARG_TYPE(
324-
env->isolate(),
325-
"The \"changeset\" argument must be a Uint8Array.");
318+
env->isolate(), "The \"changeset\" argument must be a Uint8Array.");
326319
return;
327320
}
328321

329322
if (args.Length() > 1 && !args[1]->IsUndefined()) {
330323
if (!args[1]->IsObject()) {
331324
node::THROW_ERR_INVALID_ARG_TYPE(
332-
env->isolate(),
333-
"The \"options\" argument must be an object.");
325+
env->isolate(), "The \"options\" argument must be an object.");
334326
return;
335327
}
336328

337329
Local<Object> options = args[1].As<Object>();
338330

339-
Local<String> conflictKey = String::NewFromUtf8(
340-
env->isolate(),
341-
"onConflict",
342-
v8::NewStringType::kNormal).ToLocalChecked();
331+
Local<String> conflictKey =
332+
String::NewFromUtf8(
333+
env->isolate(), "onConflict", v8::NewStringType::kNormal)
334+
.ToLocalChecked();
343335
if (options->HasOwnProperty(env->context(), conflictKey).FromJust()) {
344-
Local<Value> conflictValue = options->Get(
345-
env->context(),
346-
conflictKey).ToLocalChecked();
336+
Local<Value> conflictValue =
337+
options->Get(env->context(), conflictKey).ToLocalChecked();
347338

348339
if (!conflictValue->IsNumber()) {
349340
node::THROW_ERR_INVALID_ARG_TYPE(
@@ -353,20 +344,17 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
353344
}
354345

355346
int conflictInt = conflictValue->Int32Value(env->context()).FromJust();
356-
conflictCallback = [conflictInt]() -> int {
357-
return conflictInt;
358-
};
347+
conflictCallback = [conflictInt]() -> int { return conflictInt; };
359348
}
360349

361-
Local<String> filterKey = String::NewFromUtf8(
362-
env->isolate(),
363-
"filter",
364-
v8::NewStringType::kNormal).ToLocalChecked();
350+
Local<String> filterKey =
351+
String::NewFromUtf8(
352+
env->isolate(), "filter", v8::NewStringType::kNormal)
353+
.ToLocalChecked();
365354

366-
if (options->HasOwnProperty(env->context(),
367-
filterKey).FromJust()) {
368-
Local<Value> filterValue = options->Get(env->context(),
369-
filterKey).ToLocalChecked();
355+
if (options->HasOwnProperty(env->context(), filterKey).FromJust()) {
356+
Local<Value> filterValue =
357+
options->Get(env->context(), filterKey).ToLocalChecked();
370358

371359
if (!filterValue->IsFunction()) {
372360
node::THROW_ERR_INVALID_ARG_TYPE(
@@ -378,28 +366,26 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) {
378366
Local<v8::Function> filterFunc = filterValue.As<v8::Function>();
379367

380368
filterCallback = [env, filterFunc](std::string item) -> bool {
381-
Local<Value> argv[] = {
382-
String::NewFromUtf8(env->isolate(),
383-
item.c_str(),
384-
v8::NewStringType::kNormal).ToLocalChecked()
385-
};
386-
Local<Value> result = filterFunc->Call(env->context(),
387-
Null(env->isolate()),
388-
1,
389-
argv).ToLocalChecked();
369+
Local<Value> argv[] = {String::NewFromUtf8(env->isolate(),
370+
item.c_str(),
371+
v8::NewStringType::kNormal)
372+
.ToLocalChecked()};
373+
Local<Value> result =
374+
filterFunc->Call(env->context(), Null(env->isolate()), 1, argv)
375+
.ToLocalChecked();
390376
return result->BooleanValue(env->isolate());
391377
};
392378
}
393379
}
394380

395381
ArrayBufferViewContents<uint8_t> buf(args[0]);
396382
int r = sqlite3changeset_apply(
397-
db->connection_,
398-
buf.length(),
399-
const_cast<void *>(static_cast<const void *>(buf.data())),
400-
xFilter,
401-
xConflict,
402-
nullptr);
383+
db->connection_,
384+
buf.length(),
385+
const_cast<void*>(static_cast<const void*>(buf.data())),
386+
xFilter,
387+
xConflict,
388+
nullptr);
403389
if (r == SQLITE_ABORT) {
404390
args.GetReturnValue().Set(false);
405391
return;
@@ -853,8 +839,10 @@ BaseObjectPtr<StatementSync> StatementSync::Create(Environment* env,
853839
Session::Session(Environment* env,
854840
v8::Local<v8::Object> object,
855841
BaseObjectWeakPtr<DatabaseSync> database,
856-
sqlite3_session* session):
857-
BaseObject(env, object), session_(session), database_(std::move(database)) {
842+
sqlite3_session* session)
843+
: BaseObject(env, object),
844+
session_(session),
845+
database_(std::move(database)) {
858846
MakeWeak();
859847
}
860848

@@ -878,10 +866,8 @@ BaseObjectPtr<Session> Session::Create(Environment* env,
878866
return MakeBaseObject<Session>(env, obj, std::move(database), session);
879867
}
880868

881-
Local<FunctionTemplate> Session::GetConstructorTemplate(
882-
Environment* env) {
883-
Local<FunctionTemplate> tmpl =
884-
env->sqlite_session_constructor_template();
869+
Local<FunctionTemplate> Session::GetConstructorTemplate(Environment* env) {
870+
Local<FunctionTemplate> tmpl = env->sqlite_session_constructor_template();
885871
if (tmpl.IsEmpty()) {
886872
Isolate* isolate = env->isolate();
887873
tmpl = NewFunctionTemplate(isolate, IllegalConstructor);
@@ -892,18 +878,16 @@ Local<FunctionTemplate> Session::GetConstructorTemplate(
892878
tmpl,
893879
"changeset",
894880
Session::Changeset<sqlite3session_changeset>);
895-
SetProtoMethod(isolate,
896-
tmpl,
897-
"patchset",
898-
Session::Changeset<sqlite3session_patchset>);
881+
SetProtoMethod(
882+
isolate, tmpl, "patchset", Session::Changeset<sqlite3session_patchset>);
899883
env->set_sqlite_session_constructor_template(tmpl);
900884
}
901885
return tmpl;
902886
}
903887

904888
void Session::MemoryInfo(MemoryTracker* tracker) const {}
905889

906-
template<Sqlite3ChangesetGenFunc sqliteChangesetFunc>
890+
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
907891
void Session::Changeset(const v8::FunctionCallbackInfo<v8::Value>& args) {
908892
Session* session;
909893
ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
@@ -916,15 +900,13 @@ void Session::Changeset(const v8::FunctionCallbackInfo<v8::Value>& args) {
916900
int r = sqliteChangesetFunc(session->session_, &nChangeset, &pChangeset);
917901
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
918902

919-
auto freeChangeset = OnScopeLeave([&] {
920-
sqlite3_free(pChangeset);
921-
});
903+
auto freeChangeset = OnScopeLeave([&] { sqlite3_free(pChangeset); });
922904

923-
v8::Local<v8::ArrayBuffer> buffer = v8::ArrayBuffer::New(
924-
env->isolate(), nChangeset);
905+
v8::Local<v8::ArrayBuffer> buffer =
906+
v8::ArrayBuffer::New(env->isolate(), nChangeset);
925907
std::memcpy(buffer->GetBackingStore()->Data(), pChangeset, nChangeset);
926-
v8::Local<v8::Uint8Array> uint8Array = v8::Uint8Array::New(
927-
buffer, 0, nChangeset);
908+
v8::Local<v8::Uint8Array> uint8Array =
909+
v8::Uint8Array::New(buffer, 0, nChangeset);
928910

929911
args.GetReturnValue().Set(uint8Array);
930912
}
@@ -944,14 +926,10 @@ static void Initialize(Local<Object> target,
944926
SetProtoMethod(isolate, db_tmpl, "close", DatabaseSync::Close);
945927
SetProtoMethod(isolate, db_tmpl, "prepare", DatabaseSync::Prepare);
946928
SetProtoMethod(isolate, db_tmpl, "exec", DatabaseSync::Exec);
947-
SetProtoMethod(isolate,
948-
db_tmpl,
949-
"createSession",
950-
DatabaseSync::CreateSession);
951-
SetProtoMethod(isolate,
952-
db_tmpl,
953-
"applyChangeset",
954-
DatabaseSync::ApplyChangeset);
929+
SetProtoMethod(
930+
isolate, db_tmpl, "createSession", DatabaseSync::CreateSession);
931+
SetProtoMethod(
932+
isolate, db_tmpl, "applyChangeset", DatabaseSync::ApplyChangeset);
955933
SetConstructorFunction(context, target, "DatabaseSync", db_tmpl);
956934
SetConstructorFunction(context,
957935
target,

‎src/node_sqlite.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ class Session : public BaseObject {
9292
BaseObjectWeakPtr<DatabaseSync> database,
9393
sqlite3_session* session);
9494
~Session() override;
95-
template<Sqlite3ChangesetGenFunc sqliteChangesetFunc>
95+
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
9696
static void Changeset(const v8::FunctionCallbackInfo<v8::Value>& args);
9797
void MemoryInfo(MemoryTracker* tracker) const override;
9898
static v8::Local<v8::FunctionTemplate> GetConstructorTemplate(
99-
Environment* env);
99+
Environment* env);
100100
static BaseObjectPtr<Session> Create(Environment* env,
101101
BaseObjectWeakPtr<DatabaseSync> database,
102102
sqlite3_session* session);
@@ -106,7 +106,7 @@ class Session : public BaseObject {
106106

107107
private:
108108
sqlite3_session* session_;
109-
BaseObjectWeakPtr<DatabaseSync> database_; // The Parent Database
109+
BaseObjectWeakPtr<DatabaseSync> database_; // The Parent Database
110110
};
111111

112112
} // namespace sqlite

0 commit comments

Comments
 (0)