Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions src/node_sqlite.cc
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,24 @@ inline MaybeLocal<String> Utf8StringMaybeOneByte(Isolate* isolate,
isolate, input.data(), NewStringType::kNormal, len);
}

inline MaybeLocal<Value> IntegerToValue(Isolate* isolate,
sqlite3_int64 value,
bool use_big_ints) {
if (use_big_ints) {
return BigInt::New(isolate, value);
}

if (value >= -kMaxSafeJsInteger && value <= kMaxSafeJsInteger) {
return Number::New(isolate, value);
}

THROW_ERR_OUT_OF_RANGE(
isolate,
"Value is too large to be represented as a JavaScript number: %" PRId64,
value);
return MaybeLocal<Value>();
}

#define CHECK_ERROR_OR_THROW(isolate, db, expr, expected, ret) \
do { \
int r_ = (expr); \
Expand All @@ -101,16 +119,7 @@ inline MaybeLocal<String> Utf8StringMaybeOneByte(Isolate* isolate,
switch (sqlite3_##from##_type(__VA_ARGS__)) { \
case SQLITE_INTEGER: { \
sqlite3_int64 val = sqlite3_##from##_int64(__VA_ARGS__); \
if ((use_big_int_args)) { \
(result) = BigInt::New((isolate), val); \
} else if (std::abs(val) <= kMaxSafeJsInteger) { \
(result) = Number::New((isolate), val); \
} else { \
THROW_ERR_OUT_OF_RANGE((isolate), \
"Value is too large to be represented as a " \
"JavaScript number: %" PRId64, \
val); \
} \
(result) = IntegerToValue((isolate), val, (use_big_int_args)); \
break; \
} \
case SQLITE_FLOAT: { \
Expand Down Expand Up @@ -3018,12 +3027,10 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
Local<Value> last_insert_rowid_val;
Local<Value> changes_val;

if (use_big_ints) {
last_insert_rowid_val = BigInt::New(isolate, last_insert_rowid);
changes_val = BigInt::New(isolate, changes);
} else {
last_insert_rowid_val = Number::New(isolate, last_insert_rowid);
changes_val = Number::New(isolate, changes);
if (!IntegerToValue(isolate, last_insert_rowid, use_big_ints)
.ToLocal(&last_insert_rowid_val) ||
!IntegerToValue(isolate, changes, use_big_ints).ToLocal(&changes_val)) {
return MaybeLocal<Object>();
}

auto run_result_template = env->sqlite_run_result_template();
Expand Down
19 changes: 19 additions & 0 deletions test/parallel/test-sqlite-statement-sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,25 @@ suite('StatementSync.prototype.setReadBigInts()', () => {
});
});

test('BigInt is required for reading large last insert row IDs', (t) => {
using db = new DatabaseSync(':memory:');
db.exec('CREATE TABLE data(key INTEGER PRIMARY KEY) STRICT');
const insert = db.prepare('INSERT INTO data VALUES (?)');

t.assert.throws(() => {
insert.run(9007199254740993n);
}, {
code: 'ERR_OUT_OF_RANGE',
message: /^Value is too large to be represented as a JavaScript number: 9007199254740993$/,
});

insert.setReadBigInts(true);
t.assert.deepStrictEqual(insert.run(9007199254740995n), {
changes: 1n,
lastInsertRowid: 9007199254740995n,
});
});

test('throws if the statement is already finalized', (t) => {
using db = new DatabaseSync(':memory:');
const stmt = db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
Expand Down
Loading