Skip to content

Commit 125a7ef

Browse files
committed
done
1 parent 5aefc71 commit 125a7ef

File tree

1 file changed

+7
-47
lines changed

1 file changed

+7
-47
lines changed

src/node_sqlite.cc

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ using v8::Value;
105105
}
106106

107107
MaybeLocal<Value> SQLiteValueToJS(Isolate* isolate,
108-
sqlite3_value* sqlite_value,
109-
bool use_big_int_args) {
108+
bool use_big_int_args,
109+
sqlite3_value* sqlite_value) {
110110
SQLITE_VALUE_TO_JS(value, isolate, use_big_int_args, sqlite_value);
111111
}
112112

113113
MaybeLocal<Value> SQLiteValueToJS(Isolate* isolate,
114+
bool use_big_int_args,
114115
sqlite3_stmt* stmt,
115-
int column,
116-
bool use_big_int_args) {
116+
int column) {
117117
SQLITE_VALUE_TO_JS(column, isolate, use_big_int_args, stmt, column);
118118
}
119119

@@ -407,7 +407,7 @@ void UserDefinedFunction::xFunc(sqlite3_context* ctx,
407407
for (int i = 0; i < argc; ++i) {
408408
sqlite3_value* value = argv[i];
409409
MaybeLocal<Value> js_val =
410-
SQLiteValueToJS(isolate, value, self->use_bigint_args_);
410+
SQLiteValueToJS(isolate, self->use_bigint_args_, value);
411411

412412
if (js_val.IsEmpty()) {
413413
// Ignore the SQLite error because a JavaScript exception is pending.
@@ -1530,56 +1530,16 @@ bool StatementSync::BindValue(const Local<Value>& value, const int index) {
15301530
MaybeLocal<Value> StatementSync::ColumnToValue(const int column) {
15311531
Isolate* isolate = env()->isolate();
15321532
MaybeLocal<Value> js_val =
1533-
SQLiteValueToJS(isolate, statement_, column, use_big_ints_);
1533+
SQLiteValueToJS(isolate, use_big_ints_, statement_, column);
15341534

15351535
if (js_val.IsEmpty()) {
1536-
THROW_ERR_OUT_OF_RANGE(env()->isolate(),
1536+
THROW_ERR_OUT_OF_RANGE(isolate,
15371537
"The value of column %d is too large to be "
15381538
"represented as a JavaScript number: %" PRId64,
15391539
column,
15401540
sqlite3_column_int64(statement_, column));
15411541
return MaybeLocal<Value>();
15421542
}
1543-
1544-
/* switch (sqlite3_column_type(statement_, column)) { */
1545-
/* case SQLITE_INTEGER: { */
1546-
/* sqlite3_int64 value = sqlite3_column_int64(statement_, column); */
1547-
/* if (use_big_ints_) { */
1548-
/* return BigInt::New(env()->isolate(), value); */
1549-
/* } else if (std::abs(value) <= kMaxSafeJsInteger) { */
1550-
/* return Number::New(env()->isolate(), value); */
1551-
/* } else { */
1552-
/* THROW_ERR_OUT_OF_RANGE(env()->isolate(), */
1553-
/* "The value of column %d is too large to be " */
1554-
/* "represented as a JavaScript number: %" PRId64, */
1555-
/* column, */
1556-
/* value); */
1557-
/* return MaybeLocal<Value>(); */
1558-
/* } */
1559-
/* } */
1560-
/* case SQLITE_FLOAT: */
1561-
/* return Number::New(env()->isolate(), */
1562-
/* sqlite3_column_double(statement_, column)); */
1563-
/* case SQLITE_TEXT: { */
1564-
/* const char* value = reinterpret_cast<const char*>( */
1565-
/* sqlite3_column_text(statement_, column)); */
1566-
/* return String::NewFromUtf8(env()->isolate(), value).As<Value>(); */
1567-
/* } */
1568-
/* case SQLITE_NULL: */
1569-
/* return Null(env()->isolate()); */
1570-
/* case SQLITE_BLOB: { */
1571-
/* size_t size = */
1572-
/* static_cast<size_t>(sqlite3_column_bytes(statement_, column)); */
1573-
/* auto data = reinterpret_cast<const uint8_t*>( */
1574-
/* sqlite3_column_blob(statement_, column)); */
1575-
/* auto store = ArrayBuffer::NewBackingStore(env()->isolate(), size); */
1576-
/* memcpy(store->Data(), data, size); */
1577-
/* auto ab = ArrayBuffer::New(env()->isolate(), std::move(store)); */
1578-
/* return Uint8Array::New(ab, 0, size); */
1579-
/* } */
1580-
/* default: */
1581-
/* UNREACHABLE("Bad SQLite column type"); */
1582-
/* } */
15831543
}
15841544

15851545
MaybeLocal<Name> StatementSync::ColumnNameToName(const int column) {

0 commit comments

Comments
 (0)