Skip to content

Commit 25271b2

Browse files
JonasBaJonasBa
committed
src: remove node namespace from sqlite.cc
src: remove unnecessary node namespace src: remove string view changes
1 parent e4f61de commit 25271b2

1 file changed

Lines changed: 29 additions & 30 deletions

File tree

‎src/node_sqlite.cc‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "node.h"
77
#include "node_errors.h"
88
#include "node_mem-inl.h"
9+
#include "path.h"
910
#include "sqlite3.h"
1011
#include "util-inl.h"
1112

@@ -43,7 +44,7 @@ using v8::Value;
4344
#define THROW_AND_RETURN_ON_BAD_STATE(env, condition, msg) \
4445
do { \
4546
if ((condition)) { \
46-
node::THROW_ERR_INVALID_STATE((env), (msg)); \
47+
THROW_ERR_INVALID_STATE((env), (msg)); \
4748
return; \
4849
} \
4950
} while (0)
@@ -81,7 +82,7 @@ DatabaseSync::DatabaseSync(Environment* env,
8182
bool open)
8283
: BaseObject(env, object) {
8384
MakeWeak();
84-
node::Utf8Value utf8_location(env->isolate(), location);
85+
Utf8Value utf8_location(env->isolate(), location);
8586
location_ = utf8_location.ToString();
8687
connection_ = nullptr;
8788

@@ -104,7 +105,7 @@ void DatabaseSync::MemoryInfo(MemoryTracker* tracker) const {
104105

105106
bool DatabaseSync::Open() {
106107
if (IsOpen()) {
107-
node::THROW_ERR_INVALID_STATE(env(), "database is already open");
108+
THROW_ERR_INVALID_STATE(env(), "database is already open");
108109
return false;
109110
}
110111

@@ -147,17 +148,17 @@ void DatabaseSync::New(const FunctionCallbackInfo<Value>& args) {
147148
}
148149

149150
if (!args[0]->IsString()) {
150-
node::THROW_ERR_INVALID_ARG_TYPE(env->isolate(),
151-
"The \"path\" argument must be a string.");
151+
THROW_ERR_INVALID_ARG_TYPE(env->isolate(),
152+
"The \"path\" argument must be a string.");
152153
return;
153154
}
154155

155156
bool open = true;
156157

157158
if (args.Length() > 1) {
158159
if (!args[1]->IsObject()) {
159-
node::THROW_ERR_INVALID_ARG_TYPE(
160-
env->isolate(), "The \"options\" argument must be an object.");
160+
THROW_ERR_INVALID_ARG_TYPE(env->isolate(),
161+
"The \"options\" argument must be an object.");
161162
return;
162163
}
163164

@@ -169,7 +170,7 @@ void DatabaseSync::New(const FunctionCallbackInfo<Value>& args) {
169170
}
170171
if (!open_v->IsUndefined()) {
171172
if (!open_v->IsBoolean()) {
172-
node::THROW_ERR_INVALID_ARG_TYPE(
173+
THROW_ERR_INVALID_ARG_TYPE(
173174
env->isolate(), "The \"options.open\" argument must be a boolean.");
174175
return;
175176
}
@@ -204,12 +205,12 @@ void DatabaseSync::Prepare(const FunctionCallbackInfo<Value>& args) {
204205
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");
205206

206207
if (!args[0]->IsString()) {
207-
node::THROW_ERR_INVALID_ARG_TYPE(env->isolate(),
208-
"The \"sql\" argument must be a string.");
208+
THROW_ERR_INVALID_ARG_TYPE(env->isolate(),
209+
"The \"sql\" argument must be a string.");
209210
return;
210211
}
211212

212-
auto sql = node::Utf8Value(env->isolate(), args[0].As<String>());
213+
auto sql = Utf8Value(env->isolate(), args[0].As<String>());
213214
sqlite3_stmt* s = nullptr;
214215
int r = sqlite3_prepare_v2(db->connection_, *sql, -1, &s, 0);
215216
CHECK_ERROR_OR_THROW(env->isolate(), db->connection_, r, SQLITE_OK, void());
@@ -225,12 +226,12 @@ void DatabaseSync::Exec(const FunctionCallbackInfo<Value>& args) {
225226
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");
226227

227228
if (!args[0]->IsString()) {
228-
node::THROW_ERR_INVALID_ARG_TYPE(env->isolate(),
229-
"The \"sql\" argument must be a string.");
229+
THROW_ERR_INVALID_ARG_TYPE(env->isolate(),
230+
"The \"sql\" argument must be a string.");
230231
return;
231232
}
232233

233-
auto sql = node::Utf8Value(env->isolate(), args[0].As<String>());
234+
auto sql = Utf8Value(env->isolate(), args[0].As<String>());
234235
int r = sqlite3_exec(db->connection_, *sql, nullptr, nullptr, nullptr);
235236
CHECK_ERROR_OR_THROW(env->isolate(), db->connection_, r, SQLITE_OK, void());
236237
}
@@ -298,7 +299,7 @@ bool StatementSync::BindParams(const FunctionCallbackInfo<Value>& args) {
298299
if (insertion.second == false) {
299300
auto existing_full_name = (*insertion.first).second;
300301
if (full_name != existing_full_name) {
301-
node::THROW_ERR_INVALID_STATE(
302+
THROW_ERR_INVALID_STATE(
302303
env(),
303304
"Cannot create bare named parameter '%s' because of "
304305
"conflicting names '%s' and '%s'.",
@@ -318,7 +319,7 @@ bool StatementSync::BindParams(const FunctionCallbackInfo<Value>& args) {
318319
return false;
319320
}
320321

321-
auto utf8_key = node::Utf8Value(env()->isolate(), key);
322+
auto utf8_key = Utf8Value(env()->isolate(), key);
322323
int r = sqlite3_bind_parameter_index(statement_, *utf8_key);
323324
if (r == 0) {
324325
if (allow_bare_named_params_) {
@@ -330,7 +331,7 @@ bool StatementSync::BindParams(const FunctionCallbackInfo<Value>& args) {
330331
}
331332

332333
if (r == 0) {
333-
node::THROW_ERR_INVALID_STATE(
334+
THROW_ERR_INVALID_STATE(
334335
env(), "Unknown named parameter '%s'", *utf8_key);
335336
return false;
336337
}
@@ -374,7 +375,7 @@ bool StatementSync::BindValue(const Local<Value>& value, const int index) {
374375
double val = value.As<Number>()->Value();
375376
r = sqlite3_bind_double(statement_, index, val);
376377
} else if (value->IsString()) {
377-
auto val = node::Utf8Value(env()->isolate(), value.As<String>());
378+
auto val = Utf8Value(env()->isolate(), value.As<String>());
378379
r = sqlite3_bind_text(
379380
statement_, index, *val, val.length(), SQLITE_TRANSIENT);
380381
} else if (value->IsNull()) {
@@ -387,13 +388,12 @@ bool StatementSync::BindValue(const Local<Value>& value, const int index) {
387388
bool lossless;
388389
int64_t as_int = value.As<BigInt>()->Int64Value(&lossless);
389390
if (!lossless) {
390-
node::THROW_ERR_INVALID_ARG_VALUE(env(),
391-
"BigInt value is too large to bind.");
391+
THROW_ERR_INVALID_ARG_VALUE(env(), "BigInt value is too large to bind.");
392392
return false;
393393
}
394394
r = sqlite3_bind_int64(statement_, index, as_int);
395395
} else {
396-
node::THROW_ERR_INVALID_ARG_TYPE(
396+
THROW_ERR_INVALID_ARG_TYPE(
397397
env()->isolate(),
398398
"Provided value cannot be bound to SQLite parameter %d.",
399399
index);
@@ -419,7 +419,7 @@ Local<Value> StatementSync::ColumnToValue(const int column) {
419419
"represented as a JavaScript number: %" PRId64,
420420
column,
421421
value);
422-
return Local<Value>();
422+
return {};
423423
}
424424
}
425425
case SQLITE_FLOAT:
@@ -430,7 +430,7 @@ Local<Value> StatementSync::ColumnToValue(const int column) {
430430
sqlite3_column_text(statement_, column));
431431
Local<Value> val;
432432
if (!String::NewFromUtf8(env()->isolate(), value).ToLocal(&val)) {
433-
return Local<Value>();
433+
return {};
434434
}
435435
return val;
436436
}
@@ -454,14 +454,13 @@ Local<Value> StatementSync::ColumnToValue(const int column) {
454454
Local<Value> StatementSync::ColumnNameToValue(const int column) {
455455
const char* col_name = sqlite3_column_name(statement_, column);
456456
if (col_name == nullptr) {
457-
node::THROW_ERR_INVALID_STATE(
458-
env(), "Cannot get name of column %d", column);
459-
return Local<Value>();
457+
THROW_ERR_INVALID_STATE(env(), "Cannot get name of column %d", column);
458+
return {};
460459
}
461460

462461
Local<String> key;
463462
if (!String::NewFromUtf8(env()->isolate(), col_name).ToLocal(&key)) {
464-
return Local<Value>();
463+
return {};
465464
}
466465
return key;
467466
}
@@ -640,7 +639,7 @@ void StatementSync::SetAllowBareNamedParameters(
640639
env, stmt->IsFinalized(), "statement has been finalized");
641640

642641
if (!args[0]->IsBoolean()) {
643-
node::THROW_ERR_INVALID_ARG_TYPE(
642+
THROW_ERR_INVALID_ARG_TYPE(
644643
env->isolate(),
645644
"The \"allowBareNamedParameters\" argument must be a boolean.");
646645
return;
@@ -657,7 +656,7 @@ void StatementSync::SetReadBigInts(const FunctionCallbackInfo<Value>& args) {
657656
env, stmt->IsFinalized(), "statement has been finalized");
658657

659658
if (!args[0]->IsBoolean()) {
660-
node::THROW_ERR_INVALID_ARG_TYPE(
659+
THROW_ERR_INVALID_ARG_TYPE(
661660
env->isolate(), "The \"readBigInts\" argument must be a boolean.");
662661
return;
663662
}
@@ -666,7 +665,7 @@ void StatementSync::SetReadBigInts(const FunctionCallbackInfo<Value>& args) {
666665
}
667666

668667
void IllegalConstructor(const FunctionCallbackInfo<Value>& args) {
669-
node::THROW_ERR_ILLEGAL_CONSTRUCTOR(Environment::GetCurrent(args));
668+
THROW_ERR_ILLEGAL_CONSTRUCTOR(Environment::GetCurrent(args));
670669
}
671670

672671
Local<FunctionTemplate> StatementSync::GetConstructorTemplate(

0 commit comments

Comments
 (0)