Skip to content
Merged
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
1 change: 1 addition & 0 deletions lib/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ declare namespace BetterSqlite3 {
scanStatusV2(idx: number, opcode: ScanStatOpcode.SQLITE_SCANSTAT_NCYCLE, resetFlag: number): number | undefined;
scanStatusV2(idx: number, opcode: ScanStatOpcode, resetFlag: number): number | string | undefined;
scanStatusReset(): this;
explainQueryPlan(...params: BindParameters | []): Result[];
}

interface ColumnDefinition {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rocicorp/zero-sqlite3",
"version": "1.0.12",
"version": "1.0.13",
"description": "better-sqlite3 on bedrock",
"homepage": "https://github.com/rocicorp/zero-sqlite3",
"author": "Rocicorp",
Expand Down
85 changes: 85 additions & 0 deletions src/objects/statement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ INIT(Statement::Init) {
SetPrototypeMethod(isolate, data, t, "columns", JS_columns);
SetPrototypeMethod(isolate, data, t, "scanStatusV2", JS_scanStatusV2);
SetPrototypeMethod(isolate, data, t, "scanStatusReset", JS_scanStatusReset);
SetPrototypeMethod(isolate, data, t, "explainQueryPlan", JS_explainQueryPlan);
SetPrototypeGetter(isolate, data, t, "busy", JS_busy);
return t->GetFunction(OnlyContext).ToLocalChecked();
}
Expand Down Expand Up @@ -227,6 +228,90 @@ NODE_METHOD(Statement::JS_all) {
#endif
}

NODE_METHOD(Statement::JS_explainQueryPlan) {
Statement* stmt = Unwrap<Statement>(info.This());
REQUIRE_STATEMENT_RETURNS_DATA();
sqlite3_stmt* handle = stmt->handle;
Database* db = stmt->db;
REQUIRE_DATABASE_OPEN(db->GetState());
REQUIRE_DATABASE_NOT_BUSY(db->GetState());
REQUIRE_STATEMENT_NOT_LOCKED(stmt);

// Binding is OPTIONAL: bind if params provided, skip if not
const bool pre_bound = stmt->bound;
bool did_bind = false;
if (!pre_bound && info.Length() > 0) {
STATEMENT_BIND(handle);
did_bind = true;
} else if (pre_bound && info.Length() > 0) {
return ThrowTypeError("This statement already has bound parameters");
}

db->GetState()->busy = true;
UseIsolate;
if (db->Log(isolate, handle)) {
db->GetState()->busy = false;
if (did_bind) { sqlite3_clear_bindings(handle); }
db->ThrowDatabaseError();
return;
}

UseContext;
const bool safe_ints = stmt->safe_ints;
const char mode = stmt->mode;

#if !defined(NODE_MODULE_VERSION) || NODE_MODULE_VERSION < 127
bool js_error = false;
uint32_t row_count = 0;
v8::Local<v8::Array> result = v8::Array::New(isolate, 0);

while (sqlite3_step(handle) == SQLITE_ROW) {
if (row_count == 0xffffffff) { ThrowRangeError("Array overflow (too many rows returned)"); js_error = true; break; }
result->Set(ctx, row_count++, Data::GetRowJS(isolate, ctx, handle, safe_ints, mode)).FromJust();
}

if (sqlite3_reset(handle) == SQLITE_OK && !js_error) {
db->GetState()->busy = false;
if (did_bind) { sqlite3_clear_bindings(handle); }
info.GetReturnValue().Set(result);
return;
}
if (js_error) db->GetState()->was_js_error = true;
db->GetState()->busy = false;
if (did_bind) { sqlite3_clear_bindings(handle); }
db->ThrowDatabaseError();
#else
v8::LocalVector<v8::Value> rows(isolate);
rows.reserve(8);

if (mode == Data::FLAT) {
RowBuilder rowBuilder(isolate, handle, safe_ints);
while (sqlite3_step(handle) == SQLITE_ROW) {
rows.emplace_back(rowBuilder.GetRowJS());
}
} else {
while (sqlite3_step(handle) == SQLITE_ROW) {
rows.emplace_back(Data::GetRowJS(isolate, ctx, handle, safe_ints, mode));
}
}

if (sqlite3_reset(handle) == SQLITE_OK) {
if (rows.size() > 0xffffffff) {
ThrowRangeError("Array overflow (too many rows returned)");
db->GetState()->was_js_error = true;
} else {
db->GetState()->busy = false;
if (did_bind) { sqlite3_clear_bindings(handle); }
info.GetReturnValue().Set(v8::Array::New(isolate, rows.data(), rows.size()));
return;
}
}
db->GetState()->busy = false;
if (did_bind) { sqlite3_clear_bindings(handle); }
db->ThrowDatabaseError();
#endif
}

NODE_METHOD(Statement::JS_iterate) {
UseAddon;
UseIsolate;
Expand Down
1 change: 1 addition & 0 deletions src/objects/statement.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class Statement : public node::ObjectWrap { friend class StatementIterator;
static NODE_METHOD(JS_columns);
static NODE_METHOD(JS_scanStatusV2);
static NODE_METHOD(JS_scanStatusReset);
static NODE_METHOD(JS_explainQueryPlan);
static NODE_GETTER(JS_busy);

Database* const db;
Expand Down
Loading