@cubejs-backend/duckdb-driver 0.33.40 → 0.33.41
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.
|
@@ -3,7 +3,6 @@ import { Connection, Database } from 'duckdb';
|
|
|
3
3
|
import { DuckDBQuery } from './DuckDBQuery';
|
|
4
4
|
export type DuckDBDriverConfiguration = {
|
|
5
5
|
dataSource?: string;
|
|
6
|
-
enableHttpFs?: boolean;
|
|
7
6
|
initSql?: string;
|
|
8
7
|
};
|
|
9
8
|
export declare class DuckDBDriver extends BaseDriver implements DriverInterface {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DuckDBDriver.d.ts","sourceRoot":"","sources":["../../src/DuckDBDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EACf,aAAa,EACb,YAAY,EAAE,eAAe,EAC9B,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,MAAM,MAAM,yBAAyB,GAAG;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,
|
|
1
|
+
{"version":3,"file":"DuckDBDriver.d.ts","sourceRoot":"","sources":["../../src/DuckDBDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EACf,aAAa,EACb,YAAY,EAAE,eAAe,EAC9B,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,MAAM,MAAM,yBAAyB,GAAG;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,qBAAa,YAAa,SAAQ,UAAW,YAAW,eAAe;IAInE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,yBAAyB;IAHtD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAQ;gBAGlC,MAAM,GAAE,yBAA8B;cAK3C,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC;cAgEjC,aAAa;WAef,YAAY;IAI1B,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAMjH,KAAK,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAUhG,MAAM,CACjB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,OAAO,EAAE,EACjB,EAAE,aAAa,EAAE,EAAE,aAAa,GAC/B,OAAO,CAAC,eAAe,CAAC;IAWd,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,QAAQ;IAIF,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAStC"}
|
package/dist/src/DuckDBDriver.js
CHANGED
|
@@ -35,30 +35,55 @@ const HydrationStream_1 = require("./HydrationStream");
|
|
|
35
35
|
class DuckDBDriver extends base_driver_1.BaseDriver {
|
|
36
36
|
constructor(config = {}) {
|
|
37
37
|
super();
|
|
38
|
+
this.config = config;
|
|
38
39
|
this.initPromise = null;
|
|
39
|
-
const dataSource = config.dataSource ||
|
|
40
|
-
(0, shared_1.assertDataSource)('default');
|
|
41
|
-
this.config = {
|
|
42
|
-
enableHttpFs: (0, shared_1.getEnv)('duckdbHttpFs', { dataSource }) || true,
|
|
43
|
-
...config,
|
|
44
|
-
};
|
|
45
40
|
}
|
|
46
41
|
async initDatabase() {
|
|
47
42
|
const token = (0, shared_1.getEnv)('duckdbMotherDuckToken', this.config);
|
|
48
43
|
const db = new duckdb_1.Database(token ? `md:?motherduck_token=${token}` : ':memory:');
|
|
49
44
|
const conn = db.connect();
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
45
|
+
const s3InitQuries = [
|
|
46
|
+
{
|
|
47
|
+
key: 's3_region',
|
|
48
|
+
value: (0, shared_1.getEnv)('duckdbS3Region', this.config),
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
key: 's3_endpoint',
|
|
52
|
+
value: (0, shared_1.getEnv)('duckdbS3Endpoint', this.config),
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
key: 's3_access_key_id',
|
|
56
|
+
value: (0, shared_1.getEnv)('duckdbS3AccessKeyId', this.config),
|
|
57
|
+
},
|
|
58
|
+
{
|
|
59
|
+
key: 's3_secret_access_key',
|
|
60
|
+
value: (0, shared_1.getEnv)('duckdbS3SecretAccessKeyId', this.config),
|
|
61
|
+
},
|
|
62
|
+
];
|
|
63
|
+
try {
|
|
64
|
+
await this.handleQuery(conn, 'INSTALL httpfs', []);
|
|
65
|
+
}
|
|
66
|
+
catch (e) {
|
|
67
|
+
if (this.logger) {
|
|
68
|
+
console.error('DuckDB - error on httpfs installation', {
|
|
69
|
+
e
|
|
70
|
+
});
|
|
53
71
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
});
|
|
72
|
+
}
|
|
73
|
+
try {
|
|
74
|
+
for (const { key, value } of s3InitQuries) {
|
|
75
|
+
if (value) {
|
|
76
|
+
await this.handleQuery(conn, `SET ${key}='${value}'`, []);
|
|
59
77
|
}
|
|
60
78
|
}
|
|
61
79
|
}
|
|
80
|
+
catch (e) {
|
|
81
|
+
if (this.logger) {
|
|
82
|
+
console.error('DuckDB - error on s3 configuration', {
|
|
83
|
+
e
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
}
|
|
62
87
|
if (this.config.initSql) {
|
|
63
88
|
try {
|
|
64
89
|
await this.handleQuery(conn, this.config.initSql, []);
|
|
@@ -116,7 +141,8 @@ class DuckDBDriver extends base_driver_1.BaseDriver {
|
|
|
116
141
|
}
|
|
117
142
|
async release() {
|
|
118
143
|
if (this.initPromise) {
|
|
119
|
-
const
|
|
144
|
+
const db = await this.initPromise;
|
|
145
|
+
const close = (0, util_1.promisify)(db.close).bind(db);
|
|
120
146
|
this.initPromise = null;
|
|
121
147
|
await close();
|
|
122
148
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DuckDBDriver.js","sourceRoot":"","sources":["../../src/DuckDBDriver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAKqC;AACrC,
|
|
1
|
+
{"version":3,"file":"DuckDBDriver.js","sourceRoot":"","sources":["../../src/DuckDBDriver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/duckdb-driver",
|
|
3
3
|
"description": "Cube DuckDB database driver",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "0.33.
|
|
5
|
+
"version": "0.33.41",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
"lint:fix": "eslint --fix src/* --ext .ts"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@cubejs-backend/base-driver": "^0.33.
|
|
31
|
-
"@cubejs-backend/schema-compiler": "^0.33.
|
|
32
|
-
"@cubejs-backend/shared": "^0.33.
|
|
30
|
+
"@cubejs-backend/base-driver": "^0.33.41",
|
|
31
|
+
"@cubejs-backend/schema-compiler": "^0.33.41",
|
|
32
|
+
"@cubejs-backend/shared": "^0.33.41"
|
|
33
33
|
},
|
|
34
34
|
"optionalDependencies": {
|
|
35
35
|
"duckdb": "^0.8.1"
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"license": "Apache-2.0",
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@cubejs-backend/linter": "^0.33.0",
|
|
40
|
-
"@cubejs-backend/testing-shared": "^0.33.
|
|
40
|
+
"@cubejs-backend/testing-shared": "^0.33.41",
|
|
41
41
|
"@types/jest": "^26.0.14",
|
|
42
42
|
"@types/node": "^14",
|
|
43
43
|
"jest": "^26.6.3",
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"eslintConfig": {
|
|
50
50
|
"extends": "../cubejs-linter"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "744741f22fb034b2295f6753bbdaf2ecdf9dbc24"
|
|
53
53
|
}
|