@cubejs-backend/duckdb-driver 0.33.42 → 0.33.43
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.
|
@@ -5,11 +5,15 @@ export type DuckDBDriverConfiguration = {
|
|
|
5
5
|
dataSource?: string;
|
|
6
6
|
initSql?: string;
|
|
7
7
|
};
|
|
8
|
+
type InitPromise = {
|
|
9
|
+
connection: Connection;
|
|
10
|
+
db: Database;
|
|
11
|
+
};
|
|
8
12
|
export declare class DuckDBDriver extends BaseDriver implements DriverInterface {
|
|
9
13
|
protected readonly config: DuckDBDriverConfiguration;
|
|
10
|
-
protected initPromise: Promise<
|
|
14
|
+
protected initPromise: Promise<InitPromise> | null;
|
|
11
15
|
constructor(config?: DuckDBDriverConfiguration);
|
|
12
|
-
protected
|
|
16
|
+
protected init(): Promise<InitPromise>;
|
|
13
17
|
protected getConnection(): Promise<Connection>;
|
|
14
18
|
static dialectClass(): typeof DuckDBQuery;
|
|
15
19
|
protected handleQuery<R>(connection: Connection, query: string, values?: unknown[], _options?: QueryOptions): Promise<R[]>;
|
|
@@ -19,4 +23,5 @@ export declare class DuckDBDriver extends BaseDriver implements DriverInterface
|
|
|
19
23
|
readOnly(): boolean;
|
|
20
24
|
release(): Promise<void>;
|
|
21
25
|
}
|
|
26
|
+
export {};
|
|
22
27
|
//# sourceMappingURL=DuckDBDriver.d.ts.map
|
|
@@ -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,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,
|
|
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,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,EAAE,EAAE,QAAQ,CAAC;CACd,CAAC;AAEF,qBAAa,YAAa,SAAQ,UAAW,YAAW,eAAe;IAInE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,yBAAyB;IAHtD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAQ;gBAGrC,MAAM,GAAE,yBAA8B;cAK3C,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC;cAuF5B,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC;WAetC,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
|
@@ -38,11 +38,35 @@ class DuckDBDriver extends base_driver_1.BaseDriver {
|
|
|
38
38
|
this.config = config;
|
|
39
39
|
this.initPromise = null;
|
|
40
40
|
}
|
|
41
|
-
async
|
|
41
|
+
async init() {
|
|
42
42
|
const token = (0, shared_1.getEnv)('duckdbMotherDuckToken', this.config);
|
|
43
43
|
const db = new duckdb_1.Database(token ? `md:?motherduck_token=${token}` : ':memory:');
|
|
44
|
-
const
|
|
45
|
-
|
|
44
|
+
const connection = db.connect();
|
|
45
|
+
try {
|
|
46
|
+
await this.handleQuery(connection, 'INSTALL httpfs', []);
|
|
47
|
+
}
|
|
48
|
+
catch (e) {
|
|
49
|
+
if (this.logger) {
|
|
50
|
+
console.error('DuckDB - error on httpfs installation', {
|
|
51
|
+
e
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
// DuckDB will lose connection_ref on connection on error, this will lead to broken connection object
|
|
55
|
+
throw e;
|
|
56
|
+
}
|
|
57
|
+
try {
|
|
58
|
+
await this.handleQuery(connection, 'LOAD httpfs', []);
|
|
59
|
+
}
|
|
60
|
+
catch (e) {
|
|
61
|
+
if (this.logger) {
|
|
62
|
+
console.error('DuckDB - error on loading httpfs', {
|
|
63
|
+
e
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
// DuckDB will lose connection_ref on connection on error, this will lead to broken connection object
|
|
67
|
+
throw e;
|
|
68
|
+
}
|
|
69
|
+
const configuration = [
|
|
46
70
|
{
|
|
47
71
|
key: 's3_region',
|
|
48
72
|
value: (0, shared_1.getEnv)('duckdbS3Region', this.config),
|
|
@@ -59,35 +83,28 @@ class DuckDBDriver extends base_driver_1.BaseDriver {
|
|
|
59
83
|
key: 's3_secret_access_key',
|
|
60
84
|
value: (0, shared_1.getEnv)('duckdbS3SecretAccessKeyId', this.config),
|
|
61
85
|
},
|
|
86
|
+
{
|
|
87
|
+
key: 'memory_limit',
|
|
88
|
+
value: (0, shared_1.getEnv)('duckdbMemoryLimit', this.config),
|
|
89
|
+
},
|
|
62
90
|
];
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
try {
|
|
75
|
-
for (const { key, value } of s3InitQuries) {
|
|
76
|
-
if (value) {
|
|
77
|
-
await this.handleQuery(conn, `SET ${key}='${value}'`, []);
|
|
91
|
+
for (const { key, value } of configuration) {
|
|
92
|
+
if (value) {
|
|
93
|
+
try {
|
|
94
|
+
await this.handleQuery(connection, `SET ${key}='${value}'`, []);
|
|
95
|
+
}
|
|
96
|
+
catch (e) {
|
|
97
|
+
if (this.logger) {
|
|
98
|
+
console.error(`DuckDB - error on configuration, key: ${key}`, {
|
|
99
|
+
e
|
|
100
|
+
});
|
|
101
|
+
}
|
|
78
102
|
}
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
catch (e) {
|
|
82
|
-
if (this.logger) {
|
|
83
|
-
console.error('DuckDB - error on s3 configuration', {
|
|
84
|
-
e
|
|
85
|
-
});
|
|
86
103
|
}
|
|
87
104
|
}
|
|
88
105
|
if (this.config.initSql) {
|
|
89
106
|
try {
|
|
90
|
-
await this.handleQuery(
|
|
107
|
+
await this.handleQuery(connection, this.config.initSql, []);
|
|
91
108
|
}
|
|
92
109
|
catch (e) {
|
|
93
110
|
if (this.logger) {
|
|
@@ -97,15 +114,18 @@ class DuckDBDriver extends base_driver_1.BaseDriver {
|
|
|
97
114
|
}
|
|
98
115
|
}
|
|
99
116
|
}
|
|
100
|
-
return
|
|
117
|
+
return {
|
|
118
|
+
connection,
|
|
119
|
+
db
|
|
120
|
+
};
|
|
101
121
|
}
|
|
102
122
|
async getConnection() {
|
|
103
123
|
if (!this.initPromise) {
|
|
104
|
-
this.initPromise = this.
|
|
124
|
+
this.initPromise = this.init();
|
|
105
125
|
}
|
|
106
126
|
try {
|
|
107
|
-
const
|
|
108
|
-
return
|
|
127
|
+
const { connection } = await this.initPromise;
|
|
128
|
+
return connection;
|
|
109
129
|
}
|
|
110
130
|
catch (e) {
|
|
111
131
|
this.initPromise = null;
|
|
@@ -142,7 +162,7 @@ class DuckDBDriver extends base_driver_1.BaseDriver {
|
|
|
142
162
|
}
|
|
143
163
|
async release() {
|
|
144
164
|
if (this.initPromise) {
|
|
145
|
-
const db = await this.initPromise;
|
|
165
|
+
const { db } = await this.initPromise;
|
|
146
166
|
const close = (0, util_1.promisify)(db.close).bind(db);
|
|
147
167
|
this.initPromise = null;
|
|
148
168
|
await close();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DuckDBDriver.js","sourceRoot":"","sources":["../../src/DuckDBDriver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAKqC;AACrC,mDAAgD;AAChD,+BAAiC;AACjC,+CAAiC;AACjC,6DAA6D;AAC7D,mCAA8C;AAE9C,+CAA4C;AAC5C,uDAAkE;
|
|
1
|
+
{"version":3,"file":"DuckDBDriver.js","sourceRoot":"","sources":["../../src/DuckDBDriver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAKqC;AACrC,mDAAgD;AAChD,+BAAiC;AACjC,+CAAiC;AACjC,6DAA6D;AAC7D,mCAA8C;AAE9C,+CAA4C;AAC5C,uDAAkE;AAYlE,MAAa,YAAa,SAAQ,wBAAU;IAG1C,YACqB,SAAoC,EAAE;QAEzD,KAAK,EAAE,CAAC;QAFW,WAAM,GAAN,MAAM,CAAgC;QAHjD,gBAAW,GAAgC,IAAI,CAAC;IAM1D,CAAC;IAES,KAAK,CAAC,IAAI;QAClB,MAAM,KAAK,GAAG,IAAA,eAAM,EAAC,uBAAuB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAE3D,MAAM,EAAE,GAAG,IAAI,iBAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,wBAAwB,KAAK,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC9E,MAAM,UAAU,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAEhC,IAAI;YACF,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;SAC1D;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE;oBACrD,CAAC;iBACF,CAAC,CAAC;aACJ;YAED,qGAAqG;YACrG,MAAM,CAAC,CAAC;SACT;QAED,IAAI;YACF,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;SACvD;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE;oBAChD,CAAC;iBACF,CAAC,CAAC;aACJ;YAED,qGAAqG;YACrG,MAAM,CAAC,CAAC;SACT;QAED,MAAM,aAAa,GAAG;YACpB;gBACE,GAAG,EAAE,WAAW;gBAChB,KAAK,EAAE,IAAA,eAAM,EAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC;aAC7C;YACD;gBACE,GAAG,EAAE,aAAa;gBAClB,KAAK,EAAE,IAAA,eAAM,EAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC;aAC/C;YACD;gBACE,GAAG,EAAE,kBAAkB;gBACvB,KAAK,EAAE,IAAA,eAAM,EAAC,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC;aAClD;YACD;gBACE,GAAG,EAAE,sBAAsB;gBAC3B,KAAK,EAAE,IAAA,eAAM,EAAC,2BAA2B,EAAE,IAAI,CAAC,MAAM,CAAC;aACxD;YACD;gBACE,GAAG,EAAE,cAAc;gBACnB,KAAK,EAAE,IAAA,eAAM,EAAC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC;aAChD;SACF,CAAC;QAEF,KAAK,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,aAAa,EAAE;YAC1C,IAAI,KAAK,EAAE;gBACT,IAAI;oBACF,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,GAAG,KAAK,KAAK,GAAG,EAAE,EAAE,CAAC,CAAC;iBACjE;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,IAAI,CAAC,MAAM,EAAE;wBACf,OAAO,CAAC,KAAK,CAAC,yCAAyC,GAAG,EAAE,EAAE;4BAC5D,CAAC;yBACF,CAAC,CAAC;qBACJ;iBACF;aACF;SACF;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACvB,IAAI;gBACF,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;aAC7D;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,IAAI,CAAC,MAAM,EAAE;oBACf,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE;wBACrD,CAAC;qBACF,CAAC,CAAC;iBACJ;aACF;SACF;QAED,OAAO;YACL,UAAU;YACV,EAAE;SACH,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,aAAa;QAC3B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;SAChC;QAED,IAAI;YACF,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;YAC9C,OAAO,UAAU,CAAC;SACnB;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YAExB,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAEM,MAAM,CAAC,YAAY;QACxB,OAAO,yBAAW,CAAC;IACrB,CAAC;IAES,WAAW,CAAI,UAAsB,EAAE,KAAa,EAAE,SAAoB,EAAE,EAAE,QAAuB;QAC7G,MAAM,YAAY,GAAkD,IAAA,gBAAS,EAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAQ,CAAC;QAEtH,OAAO,YAAY,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC;IACxC,CAAC;IAEM,KAAK,CAAC,KAAK,CAAc,KAAa,EAAE,SAAoB,EAAE,EAAE,QAAuB;QAC5F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAI,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE9F,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,IAAA,8BAAY,EAAC,IAAI,CAAC,CAAC;YAEnB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,MAAM,CACjB,KAAa,EACb,MAAiB,EACjB,EAAE,aAAa,EAAiB;QAEhC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE9C,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC;QAClE,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,iCAAe,EAAE,CAAC,CAAC;QAErG,OAAO;YACL,SAAS;SACV,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,cAAc;QACzB,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACnC,CAAC;IAEM,QAAQ;QACb,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;YACtC,MAAM,KAAK,GAAG,IAAA,gBAAS,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC3C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YAExB,MAAM,KAAK,EAAE,CAAC;SACf;IACH,CAAC;CACF;AAnKD,oCAmKC"}
|
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.43",
|
|
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.43",
|
|
31
|
+
"@cubejs-backend/schema-compiler": "^0.33.43",
|
|
32
|
+
"@cubejs-backend/shared": "^0.33.43"
|
|
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.43",
|
|
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": "60e05a0e84418e47d4fb826cc211c84dc86f2629"
|
|
53
53
|
}
|