duckdb 0.6.2-dev503.0 → 0.6.2-dev551.0

package/.mocharc.json

@@ -1,5 +1,5 @@
 {
-  "extension": ["js", "ts"],
-  "spec": ["test/*.js", "test/*.ts"],
+  "extension": ["ts"],
+  "spec": ["test/*.ts"],
   "require": "ts-node/register"
 }

package/lib/duckdb.d.ts

@@ -49,15 +49,16 @@ export class QueryResult {
 }
 
 export class Database {
-  constructor(path: string, accessMode?: number, callback?: Callback<any>);
+  constructor(path: string, accessMode?: number | Record<string,string>, callback?: Callback<any>);
+  constructor(path: string, callback?: Callback<any>);
 
-  close(callback: Callback<void>): void;
+  close(callback?: Callback<void>): void;
 
   connect(): Connection;
 
-  all(sql: string, ...args: [...any, Callback<TableData>] | []): void;
-  arrowIPCAll(sql: string, ...args: [...any, Callback<TableData>] | []): void;
-  each(sql: string, ...args: [...any, Callback<RowData>] | []): void;
+  all(sql: string, ...args: [...any, Callback<TableData>] | []): this;
+  arrowIPCAll(sql: string, ...args: [...any, Callback<QueryResult>] | []): void;
+  each(sql: string, ...args: [...any, Callback<RowData>] | []): this;
   exec(sql: string, ...args: [...any, Callback<void>] | []): void;
 
   prepare(sql: string, ...args: [...any, Callback<Statement>] | []): Statement;
@@ -71,21 +72,36 @@ export class Database {
   unregister_udf(name: string, callback: Callback<any>): void;
 
   stream(sql: any, ...args: any[]): QueryResult;
-  arrowIPCStream(sql: any, ...args: any[]): QueryResult;
+  arrowIPCStream(sql: any, ...args: any[]): Promise<QueryResult>;
+
+  serialize(done?: Callback<void>): void;
+  parallelize(done?: Callback<void>): void;
+  wait(done: Callback<void>): void;
+
+  get(columnName: string, cb: Callback<RowData>): void;
+  get(columnName: string, num: number, cb: Callback<RowData>): void;
+
+  interrupt(): void;
+
+  register_buffer(name: string, array: ArrayLike<any>, force: boolean, callback?: Callback<void>): void;
+
+  unregister_buffer(name: string, callback?: Callback<void>): void;
 }
 
 export class Statement {
-  constructor();
+  sql: string;
 
-  all(...args: [...any, Callback<TableData>] | []): void;
+  constructor(connection: Connection, sql: string);
 
-  arrowIPCAll(...args: [...any, Callback<TableData>] | []): void;
+  all(...args: [...any, Callback<TableData>] | any[]): this;
 
-  each(...args: [...any, Callback<RowData>] | []): void;
+  arrowIPCAll(...args: [...any, Callback<TableData>] | any[]): void;
+
+  each(...args: [...any, Callback<RowData>] | any[]): this;
 
   finalize(callback?: Callback<void>): void;
 
-  run(...args: [...any, Callback<void>] | []): Statement;
+  run(...args: [...any, Callback<void>] | any[]): Statement;
 }
 
 export const ERROR: number;
@@ -101,3 +117,5 @@ export const OPEN_READONLY: number;
 export const OPEN_READWRITE: number;
 
 export const OPEN_SHAREDCACHE: number;
+
+export const INTERRUPT: number;

package/lib/duckdb.js

@@ -670,3 +670,9 @@ Statement.prototype.finalize
  * @yield callback
  */
 Statement.prototype.stream;
+
+/**
+ * @field
+ * @returns sql contained in statement
+ */
+Statement.prototype.sql;

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.6.2-dev503.0",
+  "version": "0.6.2-dev551.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -152514,6 +152514,15 @@ unique_ptr<QueryResult> Relation::Execute() {
 	return context.GetContext()->Execute(shared_from_this());
 }
 
+unique_ptr<QueryResult> Relation::ExecuteOrThrow() {
+	auto res = Execute();
+	D_ASSERT(res);
+	if (res->HasError()) {
+		res->ThrowError();
+	}
+	return res;
+}
+
 BoundStatement Relation::Bind(Binder &binder) {
 	SelectStatement stmt;
 	stmt.node = GetQueryNode();

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "31c20820e9"
-#define DUCKDB_VERSION "v0.6.2-dev503"
+#define DUCKDB_SOURCE_ID "1db385e6e9"
+#define DUCKDB_VERSION "v0.6.2-dev551"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -18814,6 +18814,7 @@ public:
 	DUCKDB_API virtual BoundStatement Bind(Binder &binder);
 	DUCKDB_API virtual string GetAlias();
 
+	DUCKDB_API unique_ptr<QueryResult> ExecuteOrThrow();
 	DUCKDB_API unique_ptr<QueryResult> Execute();
 	DUCKDB_API string ToString();
 	DUCKDB_API virtual string ToString(idx_t depth) = 0;