Skip to content

Commit 01e69d5

Browse files
committed
Create prepared to pass strings via malloc
1 parent 932a6cb commit 01e69d5

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

lib/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ if(EMSCRIPTEN)
327327
_duckdb_web_pending_query_start_buffer, \
328328
_duckdb_web_prepared_close, \
329329
_duckdb_web_prepared_create, \
330+
_duckdb_web_prepared_create_buffer, \
330331
_duckdb_web_prepared_run, \
331332
_duckdb_web_prepared_send, \
332333
_duckdb_web_query_fetch_results, \

lib/src/webdb_api.cc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,13 @@ void duckdb_web_prepared_create(WASMResponse* packed, ConnectionHdl connHdl, con
170170
auto r = c->CreatePreparedStatement(script);
171171
WASMResponseBuffer::Get().Store(*packed, std::move(r));
172172
}
173+
/// Prepare a query statement
174+
void duckdb_web_prepared_create_buffer(WASMResponse* packed, ConnectionHdl connHdl, const uint8_t* buffer, size_t buffer_length) {
175+
auto c = reinterpret_cast<WebDB::Connection*>(connHdl);
176+
std::string_view script(reinterpret_cast<const char*>(buffer), buffer_length);
177+
auto r = c->CreatePreparedStatement(script);
178+
WASMResponseBuffer::Get().Store(*packed, std::move(r));
179+
}
173180
/// Close a prepared statement
174181
void duckdb_web_prepared_close(WASMResponse* packed, ConnectionHdl connHdl, size_t statement_id) {
175182
auto c = reinterpret_cast<WebDB::Connection*>(connHdl);

packages/duckdb-wasm/src/bindings/bindings_base.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,12 @@ export abstract class DuckDBBindingsBase implements DuckDBBindings {
288288

289289
/** Prepare a statement and return its identifier */
290290
public createPrepared(conn: number, text: string): number {
291-
const [s, d, n] = callSRet(this.mod, 'duckdb_web_prepared_create', ['number', 'string'], [conn, text]);
291+
const BUF = TEXT_ENCODER.encode(text);
292+
const bufferPtr = this.mod._malloc(BUF.length);
293+
const bufferOfs = this.mod.HEAPU8.subarray(bufferPtr, bufferPtr + BUF.length);
294+
bufferOfs.set(BUF);
295+
const [s, d, n] = callSRet(this.mod, 'duckdb_web_prepared_create_buffer', ['number', 'number', 'number'], [conn, bufferPtr, BUF.length]);
296+
this.mod._free(bufferPtr);
292297
if (s !== StatusCode.SUCCESS) {
293298
throw new Error(readString(this.mod, d, n));
294299
}

0 commit comments

Comments
 (0)