@lightdash/warehouses 2.32.0 → 2.33.1
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TrinoWarehouseClient.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/TrinoWarehouseClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,sBAAsB,EAEtB,MAAM,EAIN,mBAAmB,EACnB,gBAAgB,EAGhB,gBAAgB,EAChB,cAAc,EACd,KAAK,eAAe,EACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEH,iBAAiB,EAKpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAO5C,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"TrinoWarehouseClient.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/TrinoWarehouseClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ const sql_1 = require("../utils/sql");
|
|
|
12
12
|
const WarehouseBaseClient_1 = __importDefault(require("./WarehouseBaseClient"));
|
|
13
13
|
const WarehouseBaseSqlBuilder_1 = __importDefault(require("./WarehouseBaseSqlBuilder"));
|
|
14
14
|
const TRINO_CLIENT_TAGS_HEADER = 'X-Trino-Client-Tags';
|
|
15
|
+
const removeNumericTypeParameters = (type) => type.replace(/\(\s*\d+(?:\s*,\s*\d+)?\s*\)/, '');
|
|
15
16
|
// Trino splits the header on commas and Node rejects non-latin1 header values,
|
|
16
17
|
// so tag keys/values are restricted to a safe charset
|
|
17
18
|
const sanitizeClientTag = (tag) => (0, coerceTagToString_1.coerceTagToString)(tag, {
|
|
@@ -66,7 +67,7 @@ const queryTableSchema = ({ database, schema, table, }) => `SELECT table_catalog
|
|
|
66
67
|
AND table_name = '${table}'
|
|
67
68
|
ORDER BY 1, 2, 3, ordinal_position`;
|
|
68
69
|
const getTrinoTimestampDomain = (type) => {
|
|
69
|
-
switch (type
|
|
70
|
+
switch (removeNumericTypeParameters(type)) {
|
|
70
71
|
case TrinoTypes.TIMESTAMP:
|
|
71
72
|
return 'naive';
|
|
72
73
|
case TrinoTypes.TIMESTAMP_TZ:
|
|
@@ -77,8 +78,8 @@ const getTrinoTimestampDomain = (type) => {
|
|
|
77
78
|
};
|
|
78
79
|
exports.getTrinoTimestampDomain = getTrinoTimestampDomain;
|
|
79
80
|
const convertDataTypeToDimensionType = (type) => {
|
|
80
|
-
const
|
|
81
|
-
switch (
|
|
81
|
+
const typeWithoutParameters = removeNumericTypeParameters(type);
|
|
82
|
+
switch (typeWithoutParameters) {
|
|
82
83
|
case TrinoTypes.BOOLEAN:
|
|
83
84
|
return common_1.DimensionType.BOOLEAN;
|
|
84
85
|
case TrinoTypes.TINYINT:
|
|
@@ -94,6 +94,28 @@ describe('TrinoWarehouseClient', () => {
|
|
|
94
94
|
});
|
|
95
95
|
await expect(warehouse.getCatalog(warehouseClient.config)).resolves.toEqual(warehouseClient.expectedWarehouseSchemaWithNaiveTimestamp);
|
|
96
96
|
});
|
|
97
|
+
it('maps decimal precision and scale to a numeric dimension', async () => {
|
|
98
|
+
const warehouse = new TrinoWarehouseClient_1.TrinoWarehouseClient(TrinoWarehouseClient_mock_1.credentials);
|
|
99
|
+
queryResultMock.mockReturnValue({
|
|
100
|
+
next: vi.fn().mockResolvedValue({
|
|
101
|
+
done: true,
|
|
102
|
+
value: {
|
|
103
|
+
...TrinoWarehouseClient_mock_1.querySchemaResponse,
|
|
104
|
+
data: [
|
|
105
|
+
[
|
|
106
|
+
'myDatabase',
|
|
107
|
+
'mySchema',
|
|
108
|
+
'myTable',
|
|
109
|
+
'myDecimalColumn',
|
|
110
|
+
'decimal(18,4)',
|
|
111
|
+
],
|
|
112
|
+
],
|
|
113
|
+
},
|
|
114
|
+
}),
|
|
115
|
+
});
|
|
116
|
+
const catalog = await warehouse.getCatalog(warehouseClient.config);
|
|
117
|
+
expect(catalog.myDatabase.mySchema.myTable.myDecimalColumn).toEqual(common_1.DimensionType.NUMBER);
|
|
118
|
+
});
|
|
97
119
|
describe('streamQuery client tag headers', () => {
|
|
98
120
|
it('sends X-Trino-Client-Tags header as comma-separated key=value pairs when tags are provided', async () => {
|
|
99
121
|
const warehouse = new TrinoWarehouseClient_1.TrinoWarehouseClient(TrinoWarehouseClient_mock_1.credentials);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lightdash/warehouses",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.33.1",
|
|
4
4
|
"description": "Warehouse connectors for Lightdash",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"snowflake-sdk": "2.3.4",
|
|
29
29
|
"ssh2": "1.14.0",
|
|
30
30
|
"trino-client": "0.2.9",
|
|
31
|
-
"@lightdash/common": "2.
|
|
31
|
+
"@lightdash/common": "2.33.1"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"oxlint": "1.75.0",
|