@cubejs-backend/duckdb-driver 0.34.11 → 0.34.13
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.
|
@@ -4,6 +4,7 @@ import { DuckDBQuery } from './DuckDBQuery';
|
|
|
4
4
|
export type DuckDBDriverConfiguration = {
|
|
5
5
|
dataSource?: string;
|
|
6
6
|
initSql?: string;
|
|
7
|
+
schema?: string;
|
|
7
8
|
};
|
|
8
9
|
type InitPromise = {
|
|
9
10
|
connection: Connection;
|
|
@@ -12,8 +13,11 @@ type InitPromise = {
|
|
|
12
13
|
export declare class DuckDBDriver extends BaseDriver implements DriverInterface {
|
|
13
14
|
protected readonly config: DuckDBDriverConfiguration;
|
|
14
15
|
protected initPromise: Promise<InitPromise> | null;
|
|
16
|
+
private schema;
|
|
15
17
|
constructor(config?: DuckDBDriverConfiguration);
|
|
16
18
|
protected init(): Promise<InitPromise>;
|
|
19
|
+
informationSchemaQuery(): string;
|
|
20
|
+
getSchemasQuery(): string;
|
|
17
21
|
protected getConnection(): Promise<Connection>;
|
|
18
22
|
static dialectClass(): typeof DuckDBQuery;
|
|
19
23
|
protected handleQuery<R>(connection: Connection, query: string, values?: unknown[], _options?: QueryOptions): Promise<R[]>;
|
|
@@ -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;
|
|
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;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,EAAE,EAAE,QAAQ,CAAC;CACd,CAAC;AAEF,qBAAa,YAAa,SAAQ,UAAW,YAAW,eAAe;IAMnE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,yBAAyB;IALtD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAQ;IAE1D,OAAO,CAAC,MAAM,CAAS;gBAGF,MAAM,GAAE,yBAA8B;cAO3C,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC;IA2F5B,sBAAsB,IAAI,MAAM;IAQhC,eAAe,IAAI,MAAM;cAYzB,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
|
@@ -37,6 +37,7 @@ class DuckDBDriver extends base_driver_1.BaseDriver {
|
|
|
37
37
|
super();
|
|
38
38
|
this.config = config;
|
|
39
39
|
this.initPromise = null;
|
|
40
|
+
this.schema = this.config.schema || (0, shared_1.getEnv)('duckdbSchema', this.config);
|
|
40
41
|
}
|
|
41
42
|
async init() {
|
|
42
43
|
const token = (0, shared_1.getEnv)('duckdbMotherDuckToken', this.config);
|
|
@@ -123,6 +124,23 @@ class DuckDBDriver extends base_driver_1.BaseDriver {
|
|
|
123
124
|
db
|
|
124
125
|
};
|
|
125
126
|
}
|
|
127
|
+
informationSchemaQuery() {
|
|
128
|
+
if (this.schema) {
|
|
129
|
+
return `${super.informationSchemaQuery()} AND table_catalog = '${this.schema}'`;
|
|
130
|
+
}
|
|
131
|
+
return super.informationSchemaQuery();
|
|
132
|
+
}
|
|
133
|
+
getSchemasQuery() {
|
|
134
|
+
if (this.schema) {
|
|
135
|
+
return `
|
|
136
|
+
SELECT table_schema as ${super.quoteIdentifier('schema_name')}
|
|
137
|
+
FROM information_schema.tables
|
|
138
|
+
WHERE table_catalog = '${this.schema}'
|
|
139
|
+
GROUP BY table_schema
|
|
140
|
+
`;
|
|
141
|
+
}
|
|
142
|
+
return super.getSchemasQuery();
|
|
143
|
+
}
|
|
126
144
|
async getConnection() {
|
|
127
145
|
if (!this.initPromise) {
|
|
128
146
|
this.initPromise = this.init();
|
|
@@ -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":"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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.34.
|
|
5
|
+
"version": "0.34.13",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
8
|
"url": "https://github.com/cube-js/cube.git",
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
"lint:fix": "eslint --fix src/* --ext .ts"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@cubejs-backend/base-driver": "^0.34.
|
|
31
|
-
"@cubejs-backend/schema-compiler": "^0.34.
|
|
30
|
+
"@cubejs-backend/base-driver": "^0.34.12",
|
|
31
|
+
"@cubejs-backend/schema-compiler": "^0.34.13",
|
|
32
32
|
"@cubejs-backend/shared": "^0.34.1"
|
|
33
33
|
},
|
|
34
34
|
"optionalDependencies": {
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"license": "Apache-2.0",
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@cubejs-backend/linter": "^0.34.0",
|
|
40
|
-
"@cubejs-backend/testing-shared": "^0.34.
|
|
40
|
+
"@cubejs-backend/testing-shared": "^0.34.13",
|
|
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": "774e3aea2295e309c58af41fb812fd3a79afffe0"
|
|
53
53
|
}
|