@loaders.gl/sql 5.0.0-beta.1 → 5.0.0-beta.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -3
- package/dist/arrow-table-source.d.ts +5 -5
- package/dist/arrow-table-source.d.ts.map +1 -1
- package/dist/arrow-table-source.js +9 -5
- package/dist/arrow-table-source.js.map +1 -1
- package/dist/duckdb-sql-source.d.ts +21 -26
- package/dist/duckdb-sql-source.d.ts.map +1 -1
- package/dist/duckdb-sql-source.js +24 -4
- package/dist/duckdb-sql-source.js.map +1 -1
- package/dist/duckdb-table-query.d.ts +9 -0
- package/dist/duckdb-table-query.d.ts.map +1 -0
- package/dist/duckdb-table-query.js +242 -0
- package/dist/duckdb-table-query.js.map +1 -0
- package/dist/index.cjs +1640 -1319
- package/dist/index.cjs.map +3 -3
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/snowflake-sql-source.d.ts +6 -23
- package/dist/snowflake-sql-source.d.ts.map +1 -1
- package/dist/snowflake-sql-source.js +2 -2
- package/dist/snowflake-sql-source.js.map +1 -1
- package/dist/sql-source.d.ts +17 -4
- package/dist/sql-source.d.ts.map +1 -1
- package/dist/sql-source.js +33 -1
- package/dist/sql-source.js.map +1 -1
- package/dist/sql-types.d.ts +3 -2
- package/dist/sql-types.d.ts.map +1 -1
- package/package.json +5 -4
- package/src/arrow-table-source.ts +11 -10
- package/src/duckdb-sql-source.ts +40 -7
- package/src/duckdb-table-query.ts +277 -0
- package/src/index.ts +3 -0
- package/src/snowflake-sql-source.ts +1 -1
- package/src/sql-source.ts +43 -4
- package/src/sql-types.ts +3 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snowflake-sql-source.js","sourceRoot":"","sources":["../src/snowflake-sql-source.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAKpC,OAAO,EAAC,aAAa,EAAE,0BAA0B,EAAC,wBAAqB;AAQvE,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,EACtB,uBAAoB;AAErB,yDAAyD;AACzD,qDAAqD;AACrD,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"snowflake-sql-source.js","sourceRoot":"","sources":["../src/snowflake-sql-source.ts"],"names":[],"mappings":"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"}
|
package/dist/sql-source.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Table } from 'apache-arrow';
|
|
2
|
+
import type { Schema } from '@loaders.gl/core/schema';
|
|
2
3
|
import { DataSource } from '@loaders.gl/core/loader-utils';
|
|
3
|
-
import type { CoreAPI, RequiredOptions } from '@loaders.gl/core/loader-utils';
|
|
4
|
+
import type { CoreAPI, RequiredOptions, TableMetadata } from '@loaders.gl/core/loader-utils';
|
|
4
5
|
import type { SQLAdapter, SQLAdapterFactory, SQLCatalogInfo, SQLMetadata, SQLQuery, SQLQueryOptions, SQLSchemaInfo, SQLSourceOptions, SQLTableInfo } from "./sql-types.js";
|
|
5
6
|
/** Registers a runtime adapter for a SQL source type. */
|
|
6
7
|
export declare function registerSQLAdapter(type: string, factory: SQLAdapterFactory): void;
|
|
@@ -15,6 +16,8 @@ export declare class SQLDataSource extends DataSource<string, SQLSourceOptions>
|
|
|
15
16
|
projection: import("@loaders.gl/core/loader-utils").TableQueryOperatorSupport;
|
|
16
17
|
predicate: import("@loaders.gl/core/loader-utils").TableQueryOperatorSupport;
|
|
17
18
|
limit: import("@loaders.gl/core/loader-utils").TableQueryOperatorSupport;
|
|
19
|
+
cast?: import("@loaders.gl/core/loader-utils").TableQueryOperatorSupport;
|
|
20
|
+
offset?: import("@loaders.gl/core/loader-utils").TableQueryOperatorSupport;
|
|
18
21
|
streaming: boolean;
|
|
19
22
|
cancellation: boolean;
|
|
20
23
|
expressions?: import("@loaders.gl/core/loader-utils").TableQueryOperatorSupport;
|
|
@@ -37,6 +40,16 @@ export declare class SQLDataSource extends DataSource<string, SQLSourceOptions>
|
|
|
37
40
|
catalogName?: string;
|
|
38
41
|
schemaName?: string;
|
|
39
42
|
}): Promise<SQLTableInfo[]>;
|
|
43
|
+
/** Lists stable native table identifiers without fetching any column schemas or data rows. */
|
|
44
|
+
getTablesMetadata(options?: {
|
|
45
|
+
signal?: AbortSignal;
|
|
46
|
+
}): Promise<readonly TableMetadata[]>;
|
|
47
|
+
/** Discovers one native table schema; ambiguous unqualified names are rejected. */
|
|
48
|
+
getTableMetadata(name: string, options?: {
|
|
49
|
+
signal?: AbortSignal;
|
|
50
|
+
}): Promise<TableMetadata>;
|
|
51
|
+
/** Resolves a qualified or unique unqualified table name. */
|
|
52
|
+
protected resolveTable(name: string, signal?: AbortSignal): Promise<SQLTableInfo>;
|
|
40
53
|
/** Returns the schema for a specific SQL table. */
|
|
41
54
|
getTableSchema(options: {
|
|
42
55
|
catalogName?: string;
|
|
@@ -45,8 +58,8 @@ export declare class SQLDataSource extends DataSource<string, SQLSourceOptions>
|
|
|
45
58
|
}): Promise<Schema>;
|
|
46
59
|
/** Executes a SQL query and returns object rows. */
|
|
47
60
|
queryRows(query: SQLQuery, options?: SQLQueryOptions): Promise<Record<string, unknown>[]>;
|
|
48
|
-
/** Executes a SQL query and returns a
|
|
49
|
-
queryArrow(query: SQLQuery, options?: SQLQueryOptions): Promise<
|
|
61
|
+
/** Executes a SQL query and returns a native Arrow table. */
|
|
62
|
+
queryArrow(query: SQLQuery, options?: SQLQueryOptions): Promise<Table>;
|
|
50
63
|
/** Closes any underlying adapter connection. */
|
|
51
64
|
close(): Promise<void>;
|
|
52
65
|
protected getAdapter(): Promise<SQLAdapter>;
|
package/dist/sql-source.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-source.d.ts","sourceRoot":"","sources":["../src/sql-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"sql-source.d.ts","sourceRoot":"","sources":["../src/sql-source.ts"],"names":[],"mappings":"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"}
|
package/dist/sql-source.js
CHANGED
|
@@ -74,6 +74,31 @@ export class SQLDataSource extends DataSource {
|
|
|
74
74
|
const adapter = await this.getAdapter();
|
|
75
75
|
return await adapter.listTables(options);
|
|
76
76
|
}
|
|
77
|
+
/** Lists stable native table identifiers without fetching any column schemas or data rows. */
|
|
78
|
+
async getTablesMetadata(options = {}) {
|
|
79
|
+
options.signal?.throwIfAborted();
|
|
80
|
+
const tables = await this.listTables();
|
|
81
|
+
options.signal?.throwIfAborted();
|
|
82
|
+
return tables.map(table => ({ name: getTableMetadataName(table), queryable: false }));
|
|
83
|
+
}
|
|
84
|
+
/** Discovers one native table schema; ambiguous unqualified names are rejected. */
|
|
85
|
+
async getTableMetadata(name, options = {}) {
|
|
86
|
+
const table = await this.resolveTable(name, options.signal);
|
|
87
|
+
const schema = await this.getTableSchema(table);
|
|
88
|
+
options.signal?.throwIfAborted();
|
|
89
|
+
return { name: getTableMetadataName(table), schema, queryable: false };
|
|
90
|
+
}
|
|
91
|
+
/** Resolves a qualified or unique unqualified table name. */
|
|
92
|
+
async resolveTable(name, signal) {
|
|
93
|
+
signal?.throwIfAborted();
|
|
94
|
+
const tables = await this.listTables();
|
|
95
|
+
signal?.throwIfAborted();
|
|
96
|
+
const exact = tables.filter(table => getTableMetadataName(table) === name);
|
|
97
|
+
const matches = exact.length ? exact : tables.filter(table => table.tableName === name);
|
|
98
|
+
if (matches.length !== 1)
|
|
99
|
+
throw new Error(`Unknown or ambiguous SQL table: ${name}`);
|
|
100
|
+
return matches[0];
|
|
101
|
+
}
|
|
77
102
|
/** Returns the schema for a specific SQL table. */
|
|
78
103
|
async getTableSchema(options) {
|
|
79
104
|
const adapter = await this.getAdapter();
|
|
@@ -85,7 +110,7 @@ export class SQLDataSource extends DataSource {
|
|
|
85
110
|
const compiledQuery = this.compileQuery(query, options);
|
|
86
111
|
return await adapter.executeRows(compiledQuery.sql, compiledQuery.options);
|
|
87
112
|
}
|
|
88
|
-
/** Executes a SQL query and returns a
|
|
113
|
+
/** Executes a SQL query and returns a native Arrow table. */
|
|
89
114
|
async queryArrow(query, options = {}) {
|
|
90
115
|
const adapter = await this.getAdapter();
|
|
91
116
|
const compiledQuery = this.compileQuery(query, options);
|
|
@@ -172,4 +197,11 @@ function getSQLTableQueryDialect(sourceType) {
|
|
|
172
197
|
return 'snowflake';
|
|
173
198
|
throw new Error(`Portable table queries are not supported for SQL source type "${sourceType}".`);
|
|
174
199
|
}
|
|
200
|
+
/** Preserves native namespace components as one unambiguous provider-defined loaded name. */
|
|
201
|
+
function getTableMetadataName(table) {
|
|
202
|
+
return [table.catalogName, table.schemaName, table.tableName]
|
|
203
|
+
.filter((name) => typeof name === 'string' && name.length > 0)
|
|
204
|
+
.map(name => `"${name.replaceAll('"', '""')}"`)
|
|
205
|
+
.join('.');
|
|
206
|
+
}
|
|
175
207
|
//# sourceMappingURL=sql-source.js.map
|
package/dist/sql-source.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-source.js","sourceRoot":"","sources":["../src/sql-source.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;
|
|
1
|
+
{"version":3,"file":"sql-source.js","sourceRoot":"","sources":["../src/sql-source.ts"],"names":[],"mappings":"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"}
|
package/dist/sql-types.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Table } from 'apache-arrow';
|
|
2
|
+
import type { Schema } from '@loaders.gl/core/schema';
|
|
2
3
|
import type { CoreAPI, DataSourceOptions } from '@loaders.gl/core/loader-utils';
|
|
3
4
|
import type { SQLTableQuery } from "./compile-table-query.js";
|
|
4
5
|
export type SQLParameterValues = unknown[] | Record<string, unknown>;
|
|
@@ -78,7 +79,7 @@ export interface SQLAdapter {
|
|
|
78
79
|
executeRows(sql: string, options?: SQLQueryOptions): Promise<Record<string, unknown>[]>;
|
|
79
80
|
/** Uploads an Arrow IPC stream without passing Arrow runtime objects. */
|
|
80
81
|
insertArrowIPC?(bytes: Uint8Array, options: SQLArrowInsertOptions): Promise<void>;
|
|
81
|
-
executeArrow?(sql: string, options?: SQLQueryOptions): Promise<
|
|
82
|
+
executeArrow?(sql: string, options?: SQLQueryOptions): Promise<Table>;
|
|
82
83
|
}
|
|
83
84
|
/** Context passed to SQL adapter factories during source initialization. */
|
|
84
85
|
export type SQLAdapterFactoryContext = {
|
package/dist/sql-types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-types.d.ts","sourceRoot":"","sources":["../src/sql-types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"sql-types.d.ts","sourceRoot":"","sources":["../src/sql-types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/sql",
|
|
3
|
-
"description": "
|
|
4
|
-
"version": "5.0.0-beta.
|
|
3
|
+
"description": "DuckDB and Snowflake SQL data sources and portable SQL predicate parsing",
|
|
4
|
+
"version": "5.0.0-beta.10",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"publishConfig": {
|
|
@@ -15,7 +15,8 @@
|
|
|
15
15
|
"sql",
|
|
16
16
|
"duckdb",
|
|
17
17
|
"snowflake",
|
|
18
|
-
"arrow"
|
|
18
|
+
"arrow",
|
|
19
|
+
"loaders.gl"
|
|
19
20
|
],
|
|
20
21
|
"types": "dist/index.d.ts",
|
|
21
22
|
"main": "dist/index.cjs",
|
|
@@ -69,5 +70,5 @@
|
|
|
69
70
|
"@duckdb/node-api": "^1.5.2-r.1",
|
|
70
71
|
"zod": "^4.1.12"
|
|
71
72
|
},
|
|
72
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "efdd84034c25e2e5dbb41bc88b75af56cb2176da"
|
|
73
74
|
}
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
+
import type {RecordBatch, Table} from 'apache-arrow';
|
|
6
|
+
import {makeArrowMetadataBatch} from '@loaders.gl/core/schema-utils';
|
|
5
7
|
import type {
|
|
6
8
|
DataSourceOptions,
|
|
7
9
|
ScanQueryMetadata,
|
|
@@ -10,11 +12,9 @@ import type {
|
|
|
10
12
|
import {
|
|
11
13
|
createScanQueryMetadata,
|
|
12
14
|
DataSource,
|
|
13
|
-
makeTableScanBatch,
|
|
14
15
|
type ScanColumnRole
|
|
15
16
|
} from '@loaders.gl/core/loader-utils';
|
|
16
17
|
import {convertArrowToSchema} from '@loaders.gl/core/schema-utils';
|
|
17
|
-
import type {ArrowTable, ArrowTableBatch} from '@loaders.gl/core/schema';
|
|
18
18
|
import {
|
|
19
19
|
ARROW_TABLE_QUERY_CAPABILITIES,
|
|
20
20
|
explainArrowTableQuery,
|
|
@@ -33,16 +33,16 @@ export type ArrowTableSourceOptions = DataSourceOptions;
|
|
|
33
33
|
* practice, and query execution delegates to the existing Arrow executor without ingesting data
|
|
34
34
|
* into DuckDB or another intermediate representation.
|
|
35
35
|
*/
|
|
36
|
-
export class ArrowTableSource extends DataSource<
|
|
36
|
+
export class ArrowTableSource extends DataSource<Table, ArrowTableSourceOptions> {
|
|
37
37
|
/** Creates a source over an existing Arrow table without copying its vectors. */
|
|
38
|
-
constructor(data:
|
|
38
|
+
constructor(data: Table, options: ArrowTableSourceOptions = {}) {
|
|
39
39
|
super(data, options);
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
/** Discovers query-visible fields and capabilities without evaluating any rows. */
|
|
43
43
|
async getQueryMetadata(options: ScanQueryMetadataOptions = {}): Promise<ScanQueryMetadata> {
|
|
44
44
|
throwIfAborted(options.signal);
|
|
45
|
-
const schema = convertArrowToSchema(this.data.
|
|
45
|
+
const schema = convertArrowToSchema(this.data.schema);
|
|
46
46
|
return createScanQueryMetadata({
|
|
47
47
|
sourceType: 'arrow-table',
|
|
48
48
|
queryType: 'table',
|
|
@@ -50,12 +50,12 @@ export class ArrowTableSource extends DataSource<ArrowTable, ArrowTableSourceOpt
|
|
|
50
50
|
schema,
|
|
51
51
|
capabilities: {table: ARROW_TABLE_QUERY_CAPABILITIES},
|
|
52
52
|
columnRoles: getArrowColumnRoles(schema.fields.map(field => field.name)),
|
|
53
|
-
statistics: {rowCount: this.data.
|
|
53
|
+
statistics: {rowCount: this.data.numRows}
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
56
|
|
|
57
57
|
/** Executes a portable query and returns an Arrow table result. */
|
|
58
|
-
query(options: ArrowQueryOptions = {}):
|
|
58
|
+
query(options: ArrowQueryOptions = {}): Table {
|
|
59
59
|
return queryArrowTable(this.data, options);
|
|
60
60
|
}
|
|
61
61
|
|
|
@@ -65,9 +65,10 @@ export class ArrowTableSource extends DataSource<ArrowTable, ArrowTableSourceOpt
|
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
/** Executes a query as one bounded Arrow batch. */
|
|
68
|
-
async *read(options: ArrowQueryOptions = {}): AsyncIterableIterator<
|
|
69
|
-
const
|
|
70
|
-
|
|
68
|
+
async *read(options: ArrowQueryOptions = {}): AsyncIterableIterator<RecordBatch> {
|
|
69
|
+
const data = this.query(options);
|
|
70
|
+
if (data.batches.length) yield* data.batches;
|
|
71
|
+
else yield makeArrowMetadataBatch(data.schema);
|
|
71
72
|
}
|
|
72
73
|
}
|
|
73
74
|
|
package/src/duckdb-sql-source.ts
CHANGED
|
@@ -2,12 +2,18 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
-
import {tableFromIPC, tableToIPC} from 'apache-arrow';
|
|
5
|
+
import {tableFromIPC, tableToIPC, type Table} from 'apache-arrow';
|
|
6
6
|
import type {AsyncDuckDBConnection} from '@duckdb/duckdb-wasm';
|
|
7
|
-
import type {
|
|
8
|
-
import type {
|
|
7
|
+
import type {Schema} from '@loaders.gl/core/schema';
|
|
8
|
+
import type {
|
|
9
|
+
SourceLoader,
|
|
10
|
+
CoreAPI,
|
|
11
|
+
TableQuerySource,
|
|
12
|
+
TableMetadata
|
|
13
|
+
} from '@loaders.gl/core/loader-utils';
|
|
9
14
|
import {convertArrowToTable} from '@loaders.gl/core/schema-utils';
|
|
10
15
|
|
|
16
|
+
import {makeDuckDBTableQuerySource, isDuckDBQuerySchema} from './duckdb-table-query';
|
|
11
17
|
import {SQLDataSource, SQL_SOURCE_DEFAULT_OPTIONS} from './sql-source';
|
|
12
18
|
import type {
|
|
13
19
|
SQLAdapter,
|
|
@@ -69,7 +75,7 @@ export const DuckDBSQLSource = {
|
|
|
69
75
|
},
|
|
70
76
|
defaultOptions: SQL_SOURCE_DEFAULT_OPTIONS,
|
|
71
77
|
testURL: (url: string): boolean => /^duckdb:\/\//i.test(url),
|
|
72
|
-
|
|
78
|
+
createDataSourceSync: (
|
|
73
79
|
data: string,
|
|
74
80
|
options: SQLSourceOptions,
|
|
75
81
|
coreApi?: CoreAPI
|
|
@@ -78,9 +84,36 @@ export const DuckDBSQLSource = {
|
|
|
78
84
|
|
|
79
85
|
/** SQLDataSource specialization for DuckDB. */
|
|
80
86
|
export class DuckDBSQLDataSource extends SQLDataSource {
|
|
87
|
+
/** Resolves a reusable common query handle for a named DuckDB table. */
|
|
88
|
+
async getTable(name: string, options: {signal?: AbortSignal} = {}): Promise<TableQuerySource> {
|
|
89
|
+
const table = await this.resolveTable(name, options.signal);
|
|
90
|
+
const schema = await this.getTableSchema(table);
|
|
91
|
+
options.signal?.throwIfAborted();
|
|
92
|
+
return makeDuckDBTableQuerySource(this, table, schema);
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
/** Reports whether the table's schema can be represented exactly by the common reader. */
|
|
96
|
+
override async getTableMetadata(
|
|
97
|
+
name: string,
|
|
98
|
+
options: {signal?: AbortSignal} = {}
|
|
99
|
+
): Promise<TableMetadata> {
|
|
100
|
+
const metadata = await super.getTableMetadata(name, options);
|
|
101
|
+
return {
|
|
102
|
+
...metadata,
|
|
103
|
+
queryable: Boolean(metadata.schema && isDuckDBQuerySchema(metadata.schema))
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
/** Lists table names without claiming compatibility before schema discovery. */
|
|
108
|
+
override async getTablesMetadata(
|
|
109
|
+
options: {signal?: AbortSignal} = {}
|
|
110
|
+
): Promise<readonly TableMetadata[]> {
|
|
111
|
+
return (await super.getTablesMetadata(options)).map(({name}) => ({name}));
|
|
112
|
+
}
|
|
113
|
+
|
|
81
114
|
/** Uploads an Arrow table through IPC. Supported by the browser DuckDB-Wasm adapter. */
|
|
82
|
-
async insertArrowTable(table:
|
|
83
|
-
await this.insertArrowIPC(tableToIPC(table
|
|
115
|
+
async insertArrowTable(table: Table, options: SQLArrowInsertOptions): Promise<void> {
|
|
116
|
+
await this.insertArrowIPC(tableToIPC(table, 'stream'), options);
|
|
84
117
|
}
|
|
85
118
|
|
|
86
119
|
/** Uploads a complete Arrow IPC stream to a browser DuckDB-Wasm table. */
|
|
@@ -380,7 +413,7 @@ async function createDuckDBBrowserAdapter(context: SQLAdapterFactoryContext): Pr
|
|
|
380
413
|
},
|
|
381
414
|
async executeArrow(sqlText: string, options: SQLQueryOptions = {}) {
|
|
382
415
|
const result = await executeDuckDBBrowserQuery(connection, sqlText, options.parameters);
|
|
383
|
-
return
|
|
416
|
+
return tableFromIPC(result);
|
|
384
417
|
}
|
|
385
418
|
};
|
|
386
419
|
}
|