@cubejs-backend/databricks-jdbc-driver 0.35.81 → 0.36.0

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.
@@ -13,6 +13,18 @@ export declare class DatabricksQuery extends BaseQuery {
13
13
  subtractInterval(date: string, interval: string): string;
14
14
  addInterval(date: string, interval: string): string;
15
15
  timeGroupedColumn(granularity: string, dimension: string): string;
16
+ /**
17
+ * Returns sql for source expression floored to timestamps aligned with
18
+ * intervals relative to origin timestamp point.
19
+ */
20
+ dateBin(interval: string, source: string, origin: string): string;
21
+ /**
22
+ * The input interval with (possible) plural units, like "2 years", "3 months", "4 weeks", "5 days"...
23
+ * will be converted to Databricks dialect.
24
+ * @see https://docs.databricks.com/en/sql/language-manual/data-types/interval-type.html
25
+ * It returns a tuple of (formatted interval, timeUnit to use in datediff functions)
26
+ */
27
+ private formatInterval;
16
28
  escapeColumnName(name: string): string;
17
29
  getFieldIndex(id: string): any;
18
30
  unixTimestampSql(): string;
@@ -1 +1 @@
1
- {"version":3,"file":"DatabricksQuery.d.ts","sourceRoot":"","sources":["../../src/DatabricksQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAqBxE,qBAAa,eAAgB,SAAQ,SAAS;IACrC,SAAS,CAAC,MAAM,EAAE,GAAG,GAAG,UAAU;IAIlC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIjC,OAAO,CAAC,GAAG,EAAE,MAAM;IAInB,QAAQ,CAAC,GAAG,EAAE,MAAM;IAIpB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAInC,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC,mBAAmB,CAAC,GAAG,EAAE,MAAM;IAI/B,SAAS,CAAC,KAAK,EAAE,MAAM;IAIvB,aAAa,CAAC,KAAK,EAAE,MAAM;IAI3B,YAAY,CAAC,KAAK,EAAE,MAAM;IAI1B,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAM/C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAM1C,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAIjE,gBAAgB,CAAC,IAAI,EAAE,MAAM;IAI7B,aAAa,CAAC,EAAE,EAAE,MAAM;IAQxB,gBAAgB;IAIhB,iBAAiB,CAAC,IAAI,EAAE,GAAG;IAwB3B,iCAAiC;IAIjC,YAAY;CAoBpB"}
1
+ {"version":3,"file":"DatabricksQuery.d.ts","sourceRoot":"","sources":["../../src/DatabricksQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAsBxE,qBAAa,eAAgB,SAAQ,SAAS;IACrC,SAAS,CAAC,MAAM,EAAE,GAAG,GAAG,UAAU;IAIlC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIjC,OAAO,CAAC,GAAG,EAAE,MAAM;IAInB,QAAQ,CAAC,GAAG,EAAE,MAAM;IAIpB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAInC,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC,mBAAmB,CAAC,GAAG,EAAE,MAAM;IAI/B,SAAS,CAAC,KAAK,EAAE,MAAM;IAIvB,aAAa,CAAC,KAAK,EAAE,MAAM;IAI3B,YAAY,CAAC,KAAK,EAAE,MAAM;IAI1B,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWnD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAIxE;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAWxE;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IA+Bf,gBAAgB,CAAC,IAAI,EAAE,MAAM;IAI7B,aAAa,CAAC,EAAE,EAAE,MAAM;IAQxB,gBAAgB;IAIhB,iBAAiB,CAAC,IAAI,EAAE,GAAG;IAwB3B,iCAAiC;IAIjC,YAAY;CAoBpB"}
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.DatabricksQuery = void 0;
7
7
  const ramda_1 = __importDefault(require("ramda"));
8
8
  const schema_compiler_1 = require("@cubejs-backend/schema-compiler");
9
+ const shared_1 = require("@cubejs-backend/shared");
9
10
  const GRANULARITY_TO_INTERVAL = {
10
11
  day: 'day',
11
12
  week: 'week',
@@ -55,16 +56,79 @@ class DatabricksQuery extends schema_compiler_1.BaseQuery {
55
56
  return `from_utc_timestamp(${value}, 'UTC')`; // TODO
56
57
  }
57
58
  subtractInterval(date, interval) {
58
- const [number, type] = this.parseInterval(interval);
59
- return `(${date} - INTERVAL '${number}' ${type})`;
59
+ const intervalParsed = (0, shared_1.parseSqlInterval)(interval);
60
+ let res = date;
61
+ for (const [key, value] of Object.entries(intervalParsed)) {
62
+ res = `(${res} - INTERVAL '${value}' ${key})`;
63
+ }
64
+ return res;
60
65
  }
61
66
  addInterval(date, interval) {
62
- const [number, type] = this.parseInterval(interval);
63
- return `(${date} + INTERVAL '${number}' ${type})`;
67
+ const intervalParsed = (0, shared_1.parseSqlInterval)(interval);
68
+ let res = date;
69
+ for (const [key, value] of Object.entries(intervalParsed)) {
70
+ res = `(${res} + INTERVAL '${value}' ${key})`;
71
+ }
72
+ return res;
64
73
  }
65
74
  timeGroupedColumn(granularity, dimension) {
66
75
  return `date_trunc('${GRANULARITY_TO_INTERVAL[granularity]}', ${dimension})`;
67
76
  }
77
+ /**
78
+ * Returns sql for source expression floored to timestamps aligned with
79
+ * intervals relative to origin timestamp point.
80
+ */
81
+ dateBin(interval, source, origin) {
82
+ const [intervalFormatted, timeUnit] = this.formatInterval(interval);
83
+ const beginOfTime = this.dateTimeCast('\'1970-01-01T00:00:00\'');
84
+ return `${this.timeStampCast(`'${origin}'`)} + INTERVAL ${intervalFormatted} *
85
+ floor(
86
+ date_diff(${timeUnit}, ${this.timeStampCast(`'${origin}'`)}, ${source}) /
87
+ date_diff(${timeUnit}, ${beginOfTime}, ${beginOfTime} + INTERVAL ${intervalFormatted})
88
+ )`;
89
+ }
90
+ /**
91
+ * The input interval with (possible) plural units, like "2 years", "3 months", "4 weeks", "5 days"...
92
+ * will be converted to Databricks dialect.
93
+ * @see https://docs.databricks.com/en/sql/language-manual/data-types/interval-type.html
94
+ * It returns a tuple of (formatted interval, timeUnit to use in datediff functions)
95
+ */
96
+ formatInterval(interval) {
97
+ const intervalParsed = (0, shared_1.parseSqlInterval)(interval);
98
+ const intKeys = Object.keys(intervalParsed).length;
99
+ if (intervalParsed.year && intKeys === 1) {
100
+ return [`'${intervalParsed.year}' YEAR`, 'YEAR'];
101
+ }
102
+ else if (intervalParsed.year && intervalParsed.month && intKeys === 2) {
103
+ return [`'${intervalParsed.year}-${intervalParsed.month}' YEAR TO MONTH`, 'MONTH'];
104
+ }
105
+ else if (intervalParsed.month && intKeys === 1) {
106
+ return [`'${intervalParsed.month}' MONTH`, 'MONTH'];
107
+ }
108
+ else if (intervalParsed.day && intKeys === 1) {
109
+ return [`'${intervalParsed.day}' DAY`, 'DAY'];
110
+ }
111
+ else if (intervalParsed.day && intervalParsed.hour && intKeys === 2) {
112
+ return [`'${intervalParsed.day} ${intervalParsed.hour}' DAY TO HOUR`, 'HOUR'];
113
+ }
114
+ else if (intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intKeys === 3) {
115
+ return [`'${intervalParsed.day} ${intervalParsed.hour}:${intervalParsed.minute}' DAY TO MINUTE`, 'MINUTE'];
116
+ }
117
+ else if (intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 4) {
118
+ return [`'${intervalParsed.day} ${intervalParsed.hour}:${intervalParsed.minute}:${intervalParsed.second}' DAY TO SECOND`, 'SECOND'];
119
+ }
120
+ else if (intervalParsed.hour && intervalParsed.minute && intKeys === 2) {
121
+ return [`'${intervalParsed.hour}:${intervalParsed.minute}' HOUR TO MINUTE`, 'MINUTE'];
122
+ }
123
+ else if (intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 3) {
124
+ return [`'${intervalParsed.hour}:${intervalParsed.minute}:${intervalParsed.second}' HOUR TO SECOND`, 'SECOND'];
125
+ }
126
+ else if (intervalParsed.minute && intervalParsed.second && intKeys === 2) {
127
+ return [`'${intervalParsed.minute}:${intervalParsed.second}' MINUTE TO SECOND`, 'SECOND'];
128
+ }
129
+ // No need to support microseconds.
130
+ throw new Error(`Cannot transform interval expression "${interval}" to Databricks dialect`);
131
+ }
68
132
  escapeColumnName(name) {
69
133
  return `\`${name}\``;
70
134
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DatabricksQuery.js","sourceRoot":"","sources":["../../src/DatabricksQuery.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAsB;AACtB,qEAAwE;AAExE,MAAM,uBAAuB,GAA2B;IACtD,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,MAAM;CACb,CAAC;AAEF,MAAM,gBAAiB,SAAQ,4BAAU;IAChC,cAAc,CAAC,MAAW,EAAE,GAAQ,EAAE,KAAU,EAAE,IAAY;QACnE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,SAAS,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,YAAY,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;IACjH,CAAC;CACF;AAED,MAAa,eAAgB,SAAQ,2BAAS;IACrC,SAAS,CAAC,MAAW;QAC1B,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAEM,YAAY,CAAC,GAAW;QAC7B,OAAO,QAAQ,GAAG,aAAa,CAAC;IAClC,CAAC;IAEM,OAAO,CAAC,GAAW;QACxB,OAAO,kBAAkB,GAAG,GAAG,CAAC;IAClC,CAAC;IAEM,QAAQ,CAAC,GAAW;QACzB,OAAO,iBAAiB,GAAG,GAAG,CAAC;IACjC,CAAC;IAEM,cAAc,CAAC,GAAW;QAC/B,OAAO,uBAAuB,GAAG,GAAG,CAAC;IACvC,CAAC;IAEM,mBAAmB,CAAC,GAAW;QACpC,OAAO,qCAAqC,GAAG,IAAI,CAAC;IACtD,CAAC;IAEM,mBAAmB,CAAC,GAAW;QACpC,OAAO,yBAAyB,GAAG,GAAG,CAAC;IACzC,CAAC;IAEM,SAAS,CAAC,KAAa;QAC5B,OAAO,sBAAsB,KAAK,MAAM,IAAI,CAAC,QAAQ,IAAI,CAAC;IAC5D,CAAC;IAEM,aAAa,CAAC,KAAa;QAChC,OAAO,sCAAsC,KAAK,+BAA+B,CAAC;IACpF,CAAC;IAEM,YAAY,CAAC,KAAa;QAC/B,OAAO,sBAAsB,KAAK,UAAU,CAAC,CAAC,OAAO;IACvD,CAAC;IAEM,gBAAgB,CAAC,IAAY,EAAE,QAAgB;QACpD,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAEpD,OAAO,IAAI,IAAI,gBAAgB,MAAM,KAAK,IAAI,GAAG,CAAC;IACpD,CAAC;IAEM,WAAW,CAAC,IAAY,EAAE,QAAgB;QAC/C,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAEpD,OAAO,IAAI,IAAI,gBAAgB,MAAM,KAAK,IAAI,GAAG,CAAC;IACpD,CAAC;IAEM,iBAAiB,CAAC,WAAmB,EAAE,SAAiB;QAC7D,OAAO,eAAe,uBAAuB,CAAC,WAAW,CAAC,MAAM,SAAS,GAAG,CAAC;IAC/E,CAAC;IAEM,gBAAgB,CAAC,IAAY;QAClC,OAAO,KAAK,IAAI,IAAI,CAAC;IACvB,CAAC;IAEM,aAAa,CAAC,EAAU;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,CAAC;QAClF,IAAI,SAAS,EAAE;YACb,OAAO,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1D,CAAC;IAEM,gBAAgB;QACrB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAEM,iBAAiB,CAAC,IAAS;QAChC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/C,IAAI,UAAU,KAAK,IAAI,EAAE;YACvB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACvD,MAAM,gBAAgB,GAAG,eAAC,CAAC,OAAO,CAChC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,CACxE;aACE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpB,IAAI,gBAAgB,CAAC,MAAM,EAAE;YAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7C,OAAO,GAAG,UAAU,IAAI,SAAS,EAAE,CAAC;SACrC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,iCAAiC;QACtC,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,YAAY;QACjB,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;QACvC,SAAS,CAAC,SAAS,CAAC,SAAS,GAAG,+BAA+B,CAAC;QAChE,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,8EAA8E,CAAC;QAC3G,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,sCAAsC,CAAC;QACnE,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,sCAAsC,CAAC;QACnE,SAAS,CAAC,SAAS,CAAC,QAAQ,GAAG,2HAA2H,CAAC;QAC3J,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,0BAA0B,CAAC;QACvD,SAAS,CAAC,SAAS,CAAC,QAAQ,GAAG,6BAA6B,CAAC;QAC7D,SAAS,CAAC,WAAW,CAAC,iBAAiB,GAAG,8CAA8C,CAAC;QACzF,SAAS,CAAC,MAAM,CAAC,WAAW,GAAG,GAAG,CAAC;QACnC,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;QAC/B,8EAA8E;QAC9E,2DAA2D;QAC3D,+CAA+C;QAC/C,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5B,wFAAwF;QACxF,OAAO,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC;QAChC,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAzHD,0CAyHC"}
1
+ {"version":3,"file":"DatabricksQuery.js","sourceRoot":"","sources":["../../src/DatabricksQuery.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/databricks-jdbc-driver",
3
3
  "description": "Cube.js Databricks database driver",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "0.35.81",
5
+ "version": "0.36.0",
6
6
  "license": "Apache-2.0",
7
7
  "repository": {
8
8
  "type": "git",
@@ -31,17 +31,17 @@
31
31
  "@aws-sdk/client-s3": "^3.49.0",
32
32
  "@aws-sdk/s3-request-presigner": "^3.49.0",
33
33
  "@azure/storage-blob": "^12.9.0",
34
- "@cubejs-backend/base-driver": "^0.35.81",
35
- "@cubejs-backend/jdbc-driver": "^0.35.81",
36
- "@cubejs-backend/schema-compiler": "^0.35.81",
37
- "@cubejs-backend/shared": "^0.35.67",
34
+ "@cubejs-backend/base-driver": "^0.36.0",
35
+ "@cubejs-backend/jdbc-driver": "^0.36.0",
36
+ "@cubejs-backend/schema-compiler": "^0.36.0",
37
+ "@cubejs-backend/shared": "^0.36.0",
38
38
  "node-fetch": "^2.6.1",
39
39
  "ramda": "^0.27.2",
40
40
  "source-map-support": "^0.5.19",
41
41
  "uuid": "^8.3.2"
42
42
  },
43
43
  "devDependencies": {
44
- "@cubejs-backend/linter": "^0.35.0",
44
+ "@cubejs-backend/linter": "^0.36.0",
45
45
  "@types/generic-pool": "^3.1.9",
46
46
  "@types/jest": "^27",
47
47
  "@types/node": "^14",
@@ -59,5 +59,5 @@
59
59
  "jest": {
60
60
  "testEnvironment": "node"
61
61
  },
62
- "gitHead": "995f526853573d15ee57566c14c129005ca34f0f"
62
+ "gitHead": "84c176ca957c71efe09d2049acd863b68532cf88"
63
63
  }