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
22 changes: 16 additions & 6 deletions src/node_sqlite.cc
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,12 @@ void JSValueToSQLiteResult(Isolate* isolate,
} else if (value->IsArrayBufferView() || value->IsArrayBuffer() ||
value->IsSharedArrayBuffer()) {
ArrayBufferViewContents<uint8_t> buf(value);
sqlite3_result_blob64(ctx, buf.data(), buf.length(), SQLITE_TRANSIENT);
if (buf.length() == 0) {
// Empty buffers may lack a data pointer, which SQLite treats as NULL.
sqlite3_result_zeroblob(ctx, 0);
} else {
sqlite3_result_blob64(ctx, buf.data(), buf.length(), SQLITE_TRANSIENT);
}
} else if (value->IsBigInt()) {
bool lossless;
int64_t as_int = value.As<BigInt>()->Int64Value(&lossless);
Expand Down Expand Up @@ -3632,11 +3637,16 @@ bool Statement::BindValue(const Local<Value>& value, const int index) {
} else if (value->IsArrayBufferView() || value->IsArrayBuffer() ||
value->IsSharedArrayBuffer()) {
ArrayBufferViewContents<uint8_t> buf(value);
r = sqlite3_bind_blob64(statement_.get(),
index,
buf.data(),
static_cast<sqlite3_uint64>(buf.length()),
SQLITE_TRANSIENT);
if (buf.length() == 0) {
// Empty buffers may lack a data pointer, which SQLite treats as NULL.
r = sqlite3_bind_zeroblob(statement_.get(), index, 0);
} else {
r = sqlite3_bind_blob64(statement_.get(),
index,
buf.data(),
static_cast<sqlite3_uint64>(buf.length()),
SQLITE_TRANSIENT);
}
} else if (value->IsBoolean()) {
r = sqlite3_bind_int(statement_.get(), index, value->IsTrue() ? 1 : 0);
} else if (value->IsBigInt()) {
Expand Down
24 changes: 24 additions & 0 deletions test/parallel/test-sqlite-custom-functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,30 @@ suite('Database.prototype.function()', () => {
});
});

test('empty buffers are returned as empty blobs, not NULL', () => {
using db = new Database(':memory:');
db.function('retEmptyArrayBuffer', () => new ArrayBuffer(0));
db.function('retEmptySharedArrayBuffer', () => new SharedArrayBuffer(0));
db.function('retEmptyUint8Array', () => {
return new Uint8Array(new ArrayBuffer(0));
});
using stmt = db.prepare(`SELECT
typeof(retEmptyArrayBuffer()) AS arrayBufferType,
typeof(retEmptySharedArrayBuffer()) AS sharedArrayBufferType,
typeof(retEmptyUint8Array()) AS uint8ArrayType,
retEmptyArrayBuffer() AS arrayBuffer,
retEmptySharedArrayBuffer() AS sharedArrayBuffer
`);
assert.deepStrictEqual(stmt.get(), {
__proto__: null,
arrayBufferType: 'blob',
sharedArrayBufferType: 'blob',
uint8ArrayType: 'blob',
arrayBuffer: new Uint8Array(),
sharedArrayBuffer: new Uint8Array(),
});
});

test('throws if returned BigInt is too large for SQLite', () => {
const db = new Database(':memory:');
db.function('retBigInt', () => {
Expand Down
35 changes: 35 additions & 0 deletions test/parallel/test-sqlite-typed-array-and-data-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,38 @@ suite('Statement with ArrayBuffer and SharedArrayBuffer', () => {
});
}
});

suite('Statement with empty buffers', () => {
const emptyBuffers = [
['ArrayBuffer', () => new ArrayBuffer(0)],
['SharedArrayBuffer', () => new SharedArrayBuffer(0)],
['Uint8Array', () => new Uint8Array()],
['Uint8Array on empty ArrayBuffer', () => new Uint8Array(new ArrayBuffer(0))],
['DataView on empty ArrayBuffer', () => new DataView(new ArrayBuffer(0))],
];

for (const [displayName, createBuffer] of emptyBuffers) {
test(`${displayName} binds as an empty blob, not NULL`, (t) => {
using db = new Database(':memory:');
db.exec('CREATE TABLE test (data BLOB NOT NULL)');
const buffer = createBuffer();
// Anonymous binding
{
using stmt = db.prepare('SELECT typeof(?) AS type');
t.assert.strictEqual(stmt.get(buffer).type, 'blob');
}
// Named binding (object)
{
using stmt = db.prepare('SELECT typeof($data) AS type');
t.assert.strictEqual(stmt.get({ '$data': buffer }).type, 'blob');
}
// Insert into a NOT NULL column and read it back
{
using insert = db.prepare('INSERT INTO test VALUES (?)');
insert.run(buffer);
using select = db.prepare('SELECT data FROM test');
t.assert.deepStrictEqual(select.get().data, new Uint8Array());
}
});
}
});
Loading