npm - @cubejs-backend/schema-compiler - Versions diffs - 1.7.33 → 1.7.34 - Mend

@cubejs-backend/schema-compiler 1.7.33 → 1.7.34

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.

Files changed (32) hide show

package/dist/src/adapter/BigqueryQuery.d.ts +6 -0
package/dist/src/adapter/BigqueryQuery.d.ts.map +1 -1
package/dist/src/adapter/BigqueryQuery.js +25 -10
package/dist/src/adapter/BigqueryQuery.js.map +1 -1
package/dist/src/adapter/ClickHouseQuery.d.ts +5 -0
package/dist/src/adapter/ClickHouseQuery.d.ts.map +1 -1
package/dist/src/adapter/ClickHouseQuery.js +9 -2
package/dist/src/adapter/ClickHouseQuery.js.map +1 -1
package/dist/src/adapter/CubeStoreQuery.d.ts.map +1 -1
package/dist/src/adapter/CubeStoreQuery.js +17 -63
package/dist/src/adapter/CubeStoreQuery.js.map +1 -1
package/dist/src/adapter/HiveQuery.d.ts +5 -0
package/dist/src/adapter/HiveQuery.d.ts.map +1 -1
package/dist/src/adapter/HiveQuery.js +13 -4
package/dist/src/adapter/HiveQuery.js.map +1 -1
package/dist/src/adapter/MysqlQuery.d.ts +9 -0
package/dist/src/adapter/MysqlQuery.d.ts.map +1 -1
package/dist/src/adapter/MysqlQuery.js +22 -3
package/dist/src/adapter/MysqlQuery.js.map +1 -1
package/dist/src/adapter/PrestodbQuery.d.ts +7 -0
package/dist/src/adapter/PrestodbQuery.d.ts.map +1 -1
package/dist/src/adapter/PrestodbQuery.js +13 -0
package/dist/src/adapter/PrestodbQuery.js.map +1 -1
package/dist/src/adapter/SnowflakeQuery.d.ts +2 -0
package/dist/src/adapter/SnowflakeQuery.d.ts.map +1 -1
package/dist/src/adapter/SnowflakeQuery.js +6 -0
package/dist/src/adapter/SnowflakeQuery.js.map +1 -1
package/dist/src/adapter/SqliteQuery.d.ts +5 -0
package/dist/src/adapter/SqliteQuery.d.ts.map +1 -1
package/dist/src/adapter/SqliteQuery.js +11 -2
package/dist/src/adapter/SqliteQuery.js.map +1 -1
package/package.json +8 -8

package/dist/src/adapter/BigqueryQuery.d.ts CHANGED Viewed

@@ -27,6 +27,12 @@ export declare class BigqueryQuery extends BaseQuery {
     timestampPrecision(): number;
     subtractInterval(date: any, interval: any): string;
     addInterval(date: any, interval: any): string;
+    /**
+     * DATETIME_ADD and friends take an INTERVAL of one date part — a range literal such as
+     * `INTERVAL '3 14' MONTH TO DAY` parses on its own but not as their argument — so a compound
+     * interval is applied one unit at a time, coarsest first.
+     */
+    private applyInterval;
     subtractTimestampInterval(timestamp: any, interval: any): string;
     intervalString(interval: string): string;
     addTimestampInterval(timestamp: any, interval: any): string;

package/dist/src/adapter/BigqueryQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"BigqueryQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmCxD,qBAAa,aAAc,SAAQ,SAAS;IACnC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAI/C;;;;OAIG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAWxE;;;;;OAKG;IACH,OAAO,CAAC,cAAc;~~IAmDN~~,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAIvE,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,aAAa,EAAE,iBAAiB;IAO1C,eAAe;IAIf,kBAAkB,IAAI,MAAM;IAI5B,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;~~IAS~~/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;~~IAS1B~~,yBAAyB,CAAC,SAAS,KAAA,EAAE,QAAQ,KAAA;IAI7C,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxC,oBAAoB,CAAC,SAAS,KAAA,EAAE,QAAQ,KAAA;IAIxC,eAAe;IAIf,gBAAgB;IAIvB;;;;OAIG;IACa,gCAAgC,CAAC,WAAW,KAAA;IAuB5D;;;;OAIG;IACa,8BAA8B,CAAC,gBAAgB,KAAA,EAAE,eAAe,KAAA,EAAE,MAAM,KAAA;IAuCxE,8BAA8B,CAAC,iBAAiB,KAAA,EAAE,UAAU,KAAA,EAAE,gBAAgB,KAAA;IAuBvF,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAIrD,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,gBAAgB,CAAC,OAAO,KAAA;IAIxB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,YAAY;CAyEpB"}
1	+ {"version":3,"file":"BigqueryQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmCxD,qBAAa,aAAc,SAAQ,SAAS;IACnC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAI/C;;;;OAIG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAWxE;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAyDN,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAIvE,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,aAAa,EAAE,iBAAiB;IAO1C,eAAe;IAIf,kBAAkB,IAAI,MAAM;IAI5B,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAIjC;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAYd,yBAAyB,CAAC,SAAS,KAAA,EAAE,QAAQ,KAAA;IAI7C,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxC,oBAAoB,CAAC,SAAS,KAAA,EAAE,QAAQ,KAAA;IAIxC,eAAe;IAIf,gBAAgB;IAIvB;;;;OAIG;IACa,gCAAgC,CAAC,WAAW,KAAA;IAuB5D;;;;OAIG;IACa,8BAA8B,CAAC,gBAAgB,KAAA,EAAE,eAAe,KAAA,EAAE,MAAM,KAAA;IAuCxE,8BAA8B,CAAC,iBAAiB,KAAA,EAAE,UAAU,KAAA,EAAE,gBAAgB,KAAA;IAuBvF,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAIrD,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,gBAAgB,CAAC,OAAO,KAAA;IAIxB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,YAAY;CAyEpB"}

package/dist/src/adapter/BigqueryQuery.js CHANGED Viewed

@@ -136,6 +136,15 @@ class BigqueryQuery extends BaseQuery_1.BaseQuery {
         else if (intervalParsed.minute && intervalParsed.second && intKeys === 2) {
             return [`'${intervalParsed.minute}:${intervalParsed.second}' MINUTE TO SECOND`, 'SECOND'];
         }
+        else if (intervalParsed.hour && intKeys === 1) {
+            return [`${intervalParsed.hour} HOUR`, 'HOUR'];
+        }
+        else if (intervalParsed.minute && intKeys === 1) {
+            return [`${intervalParsed.minute} MINUTE`, 'MINUTE'];
+        }
+        else if (intervalParsed.second && intKeys === 1) {
+            return [`${intervalParsed.second} SECOND`, 'SECOND'];
+        }
         else if (intervalParsed.millisecond && intKeys === 1) {
             return [`'${intervalParsed.millisecond}' MILLISECOND`, 'MILLISECOND'];
         }
@@ -158,18 +167,24 @@ class BigqueryQuery extends BaseQuery_1.BaseQuery {
         return 6;
     }
     subtractInterval(date, interval) {
-        const [intervalFormatted, timeUnit] = this.formatInterval(interval);
-        if (['YEAR', 'MONTH', 'QUARTER'].includes(timeUnit) || intervalFormatted.includes('WEEK')) {
-            return this.timeStampCast(`DATETIME_SUB(DATETIME(${date}), INTERVAL ${intervalFormatted})`);
-        }
-        return `TIMESTAMP_SUB(${date}, INTERVAL ${intervalFormatted})`;
+        return this.applyInterval('SUB', date, interval);
     }
     addInterval(date, interval) {
-        const [intervalFormatted, timeUnit] = this.formatInterval(interval);
-        if (['YEAR', 'MONTH', 'QUARTER'].includes(timeUnit) || intervalFormatted.includes('WEEK')) {
-            return this.timeStampCast(`DATETIME_ADD(DATETIME(${date}), INTERVAL ${intervalFormatted})`);
-        }
-        return `TIMESTAMP_ADD(${date}, INTERVAL ${intervalFormatted})`;
+        return this.applyInterval('ADD', date, interval);
+    }
+    /**
+     * DATETIME_ADD and friends take an INTERVAL of one date part — a range literal such as
+     * `INTERVAL '3 14' MONTH TO DAY` parses on its own but not as their argument — so a compound
+     * interval is applied one unit at a time, coarsest first.
+     */
+    applyInterval(direction, date, interval) {
+        const parts = (0, shared_1.splitSqlInterval)(interval).map(part => this.formatInterval(part));
+        return parts.reduce((acc, [intervalFormatted, timeUnit]) => {
+            if (['YEAR', 'MONTH', 'QUARTER'].includes(timeUnit) || intervalFormatted.includes('WEEK')) {
+                return this.timeStampCast(`DATETIME_${direction}(DATETIME(${acc}), INTERVAL ${intervalFormatted})`);
+            }
+            return `TIMESTAMP_${direction}(${acc}, INTERVAL ${intervalFormatted})`;
+        }, date);
     }
     subtractTimestampInterval(timestamp, interval) {
         return this.subtractInterval(timestamp, interval);

package/dist/src/adapter/BigqueryQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"BigqueryQuery.js","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"BigqueryQuery.js","sourceRoot":"","sources":["../../../src/adapter/BigqueryQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/ClickHouseQuery.d.ts CHANGED Viewed

@@ -12,6 +12,11 @@ export declare class ClickHouseQuery extends BaseQuery {
     dateBin(interval: string, source: string, origin: string): string;
     subtractInterval(date: string, interval: string): string;
     addInterval(date: string, interval: string): string;
+    /**
+     * `subDate` and `addDate` take one interval, and a sum of intervals of different units is a
+     * Tuple they reject, so a compound interval is applied one unit at a time, coarsest first.
+     */
+    private applyInterval;
     /**
      * The input interval with (possible) plural units, like "2 years", "3 months", "4 weeks", "5 days"...
      * will be converted to ClickHouse form of sum of single intervals.

package/dist/src/adapter/ClickHouseQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ClickHouseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA4BxD,qBAAa,eAAgB,SAAQ,SAAS;IACrC,SAAS,CAAC,MAAM,KAAA;IAIhB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,KAAK,KAAA;IAWf,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAY/C;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAiBjE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI1D;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAQf,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIpC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IActD,uBAAuB,CAAC,SAAS,KAAA,EAAE,UAAU,KAAA;IAUpC,iBAAiB,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;IAmB9D,aAAa;IAYb,eAAe,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA;IAYlC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,aAAa,EAAE,iBAAiB;IA2C1C,gBAAgB,CAAC,OAAO,KAAA;IAKxB,gBAAgB;IAIhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAUrD,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC,cAAc,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA;IAInD,gBAAgB,CAAC,SAAS,KAAA;IAW1B,YAAY;CA8CpB"}
1	+ {"version":3,"file":"ClickHouseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA4BxD,qBAAa,eAAgB,SAAQ,SAAS;IACrC,SAAS,CAAC,MAAM,KAAA;IAIhB,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,KAAK,KAAA;IAWf,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAY/C;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAiBjE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI1D;;;OAGG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAQf,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIpC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IActD,uBAAuB,CAAC,SAAS,KAAA,EAAE,UAAU,KAAA;IAUpC,iBAAiB,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;IAmB9D,aAAa;IAYb,eAAe,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA;IAYlC,YAAY,CAAC,GAAG,KAAA;IAIhB,SAAS,CAAC,aAAa,EAAE,iBAAiB;IA2C1C,gBAAgB,CAAC,OAAO,KAAA;IAKxB,gBAAgB;IAIhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAUrD,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC,cAAc,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA;IAInD,gBAAgB,CAAC,SAAS,KAAA;IAW1B,YAAY;CA8CpB"}

package/dist/src/adapter/ClickHouseQuery.js CHANGED Viewed

@@ -77,10 +77,17 @@ class ClickHouseQuery extends BaseQuery_1.BaseQuery {
     )`;
     }
     subtractInterval(date, interval) {
-        return `subDate(${date}, ${this.formatInterval(interval)})`;
+        return this.applyInterval('subDate', date, interval);
     }
     addInterval(date, interval) {
-        return `addDate(${date}, ${this.formatInterval(interval)})`;
+        return this.applyInterval('addDate', date, interval);
+    }
+    /**
+     * `subDate` and `addDate` take one interval, and a sum of intervals of different units is a
+     * Tuple they reject, so a compound interval is applied one unit at a time, coarsest first.
+     */
+    applyInterval(fn, date, interval) {
+        return (0, shared_1.splitSqlInterval)(interval).reduce((acc, part) => `${fn}(${acc}, ${this.formatInterval(part)})`, date);
     }
     /**
      * The input interval with (possible) plural units, like "2 years", "3 months", "4 weeks", "5 days"...

package/dist/src/adapter/ClickHouseQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ClickHouseQuery.js","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":";;;AAAA,~~mDAA0D~~;~~AAC1D~~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~~WAAW,~~IAAI,~~KAAK~~,~~IAAI~~,CAAC,~~cAAc~~,~~CAAC~~,QAAQ,CAAC,~~GAAG,~~CAAC;~~IAC9D~~,CAAC;IAEM,WAAW,CAAC,IAAY,EAAE,QAAgB;QAC/C,OAAO,~~WAAW~~,IAAI,KAAK,IAAI,CAAC,cAAc,CAAC,~~QAAQ~~,CAAC,GAAG,CAAC;~~IAC9D~~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~~AApRD~~,~~0CAoRC~~"}
1	+ {"version":3,"file":"ClickHouseQuery.js","sourceRoot":"","sources":["../../../src/adapter/ClickHouseQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/CubeStoreQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CubeStoreQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/CubeStoreQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAuB5C,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;CAC1B,CAAC;AAEF,qBAAa,cAAe,SAAQ,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAU;gBAElC,SAAS,KAAA,EAAE,OAAO,KAAA;IAK9B,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,cAAc;IAId,aAAa,CAAC,KAAK,KAAA;IAInB,eAAe;IAIf,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAO/C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAO1C,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAKxD,gCAAgC;IAIvC;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;~~IAIxE~~;;;OAGG;IACH,OAAO,CAAC,cAAc;~~IAmDf~~,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,aAAa,KAAA;IAMvB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE;IAIlC,gBAAgB;IAIhB,6BAA6B,CAAC,GAAG,EAAE,MAAM;IAIzC,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,EAAE,MAAM;IAI/B,cAAc,CAAC,GAAG,EAAE,MAAM;IAI1B,YAAY,CAAC,GAAG,EAAE,MAAM;IAIxB,mBAAmB,CAAC,GAAG,EAAE,MAAM;IAK/B,+BAA+B,CACpC,eAAe,EAAE,WAAW,EAAE,EAC9B,kBAAkB,EAAE,WAAW,EAAE,EACjC,kBAAkB,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,EACjD,sBAAsB,EAAE,GAAG;IA8CtB,0BAA0B,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA,EAAE,aAAa,KAAA,EAAE,sBAAsB,KAAA;IAW9H,UAAU,CAAC,QAAQ,KAAA;IAQnB,gBAAgB,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;IAyCnE,6BAA6B,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,aAAa,KAAA,EAAE,sBAAsB,KAAA;IA+CtG,YAAY;CAiBpB"}
1	+ {"version":3,"file":"CubeStoreQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/CubeStoreQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAuB5C,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC/B,MAAM,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;CAC1B,CAAC;AAEF,qBAAa,cAAe,SAAQ,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAU;gBAElC,SAAS,KAAA,EAAE,OAAO,KAAA;IAK9B,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,cAAc;IAId,aAAa,CAAC,KAAK,KAAA;IAInB,eAAe;IAIf,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAO/C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAO1C,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAKxD,gCAAgC;IAIvC;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAexE;;;OAGG;IACH,OAAO,CAAC,cAAc;IAcf,gBAAgB,CAAC,IAAI,KAAA;IAIrB,SAAS,CAAC,aAAa,KAAA;IAMvB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE;IAIlC,gBAAgB;IAIhB,6BAA6B,CAAC,GAAG,EAAE,MAAM;IAIzC,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,EAAE,MAAM;IAI/B,cAAc,CAAC,GAAG,EAAE,MAAM;IAI1B,YAAY,CAAC,GAAG,EAAE,MAAM;IAIxB,mBAAmB,CAAC,GAAG,EAAE,MAAM;IAK/B,+BAA+B,CACpC,eAAe,EAAE,WAAW,EAAE,EAC9B,kBAAkB,EAAE,WAAW,EAAE,EACjC,kBAAkB,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,EACjD,sBAAsB,EAAE,GAAG;IA8CtB,0BAA0B,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA,EAAE,aAAa,KAAA,EAAE,sBAAsB,KAAA;IAW9H,UAAU,CAAC,QAAQ,KAAA;IAQnB,gBAAgB,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;IAyCnE,6BAA6B,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,aAAa,KAAA,EAAE,sBAAsB,KAAA;IA+CtG,YAAY;CAiBpB"}

package/dist/src/adapter/CubeStoreQuery.js CHANGED Viewed

@@ -73,6 +73,15 @@ class CubeStoreQuery extends BaseQuery_1.BaseQuery {
      * intervals relative to origin timestamp point.
      */
     dateBin(interval, source, origin) {
+        const intervalParsed = (0, shared_1.parseSqlInterval)(interval);
+        const months = shared_1.SQL_INTERVAL_UNITS.slice(0, shared_1.SQL_INTERVAL_UNITS.indexOf('week'));
+        const hasMonths = months.some(unit => intervalParsed[unit]);
+        const hasDayTime = shared_1.SQL_INTERVAL_UNITS.slice(shared_1.SQL_INTERVAL_UNITS.indexOf('week'))
+            .some(unit => intervalParsed[unit]);
+        // DATE_BIN mixes no month component with a day or time one, unlike DATE_ADD / DATE_SUB.
+        if (hasMonths && hasDayTime) {
+            throw new Error(`Cannot transform interval expression "${interval}" to CubeStore dialect`);
+        }
         return `DATE_BIN(INTERVAL ${this.formatInterval(interval)}, ${this.dateTimeCast(source)}, ${this.dateTimeCast(`'${origin}'`)})`;
     }
     /**
@@ -81,69 +90,14 @@ class CubeStoreQuery extends BaseQuery_1.BaseQuery {
      */
     formatInterval(interval) {
         const intervalParsed = (0, shared_1.parseSqlInterval)(interval);
-        const intKeys = Object.keys(intervalParsed).length;
-        if (intervalParsed.year && intKeys === 1) {
-            return `'${intervalParsed.year} YEAR'`;
-        }
-        else if (intervalParsed.year && intervalParsed.month && intKeys === 2) {
-            return `'${intervalParsed.year} YEAR ${intervalParsed.month} MONTH'`;
-        }
-        else if (intervalParsed.year && intervalParsed.month && intervalParsed.quarter && intKeys === 3) {
-            return `'${intervalParsed.year} YEAR ${intervalParsed.quarter} QUARTER ${intervalParsed.month} MONTH'`;
-        }
-        else if (intervalParsed.quarter && intKeys === 1) {
-            return `'${intervalParsed.quarter} QUARTER'`;
-        }
-        else if (intervalParsed.quarter && intervalParsed.month && intKeys === 2) {
-            return `'${intervalParsed.quarter} QUARTER ${intervalParsed.month} MONTH'`;
-        }
-        else if (intervalParsed.month && intKeys === 1) {
-            return `'${intervalParsed.month} MONTH'`;
-        }
-        else if (intervalParsed.week && intKeys === 1) {
-            return `'${intervalParsed.week} WEEK'`;
-        }
-        else if (intervalParsed.week && intervalParsed.day && intKeys === 2) {
-            return `'${intervalParsed.week} WEEK ${intervalParsed.day} DAY'`;
-        }
-        else if (intervalParsed.week && intervalParsed.day && intervalParsed.hour && intKeys === 3) {
-            return `'${intervalParsed.week} WEEK ${intervalParsed.day} DAY ${intervalParsed.hour} HOUR'`;
-        }
-        else if (intervalParsed.week && intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intKeys === 4) {
-            return `'${intervalParsed.week} WEEK ${intervalParsed.day} DAY ${intervalParsed.hour} HOUR ${intervalParsed.minute} MINUTE'`;
-        }
-        else if (intervalParsed.week && intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 5) {
-            return `'${intervalParsed.week} WEEK ${intervalParsed.day} DAY ${intervalParsed.hour} HOUR ${intervalParsed.minute} MINUTE ${intervalParsed.second} SECOND'`;
-        }
-        else if (intervalParsed.day && intKeys === 1) {
-            return `'${intervalParsed.day} DAY'`;
-        }
-        else if (intervalParsed.day && intervalParsed.hour && intKeys === 2) {
-            return `'${intervalParsed.day} DAY ${intervalParsed.hour} HOUR'`;
-        }
-        else if (intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intKeys === 3) {
-            return `'${intervalParsed.day} DAY ${intervalParsed.hour} HOUR ${intervalParsed.minute} MINUTE'`;
-        }
-        else if (intervalParsed.day && intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 4) {
-            return `'${intervalParsed.day} DAY ${intervalParsed.hour} HOUR ${intervalParsed.minute} MINUTE ${intervalParsed.second} SECOND'`;
-        }
-        else if (intervalParsed.hour && intKeys === 1) {
-            return `'${intervalParsed.hour} HOUR'`;
-        }
-        else if (intervalParsed.hour && intervalParsed.minute && intKeys === 2) {
-            return `'${intervalParsed.hour} HOUR ${intervalParsed.minute} MINUTE'`;
-        }
-        else if (intervalParsed.hour && intervalParsed.minute && intervalParsed.second && intKeys === 3) {
-            return `'${intervalParsed.hour} HOUR ${intervalParsed.minute} MINUTE ${intervalParsed.second} SECOND'`;
-        }
-        else if (intervalParsed.minute && intKeys === 1) {
-            return `'${intervalParsed.minute} MINUTE'`;
-        }
-        else if (intervalParsed.minute && intervalParsed.second && intKeys === 2) {
-            return `'${intervalParsed.minute} MINUTE ${intervalParsed.second} SECOND'`;
-        }
-        // No need to support microseconds.
-        throw new Error(`Cannot transform interval expression "${interval}" to CubeStore dialect`);
+        const parts = shared_1.SQL_INTERVAL_UNITS
+            .filter(unit => intervalParsed[unit])
+            .map(unit => `${intervalParsed[unit]} ${unit.toUpperCase()}`);
+        // Sub-second units have no representation here.
+        if (!parts.length || parts.length !== Object.keys(intervalParsed).length) {
+            throw new Error(`Cannot transform interval expression "${interval}" to CubeStore dialect`);
+        }
+        return `'${parts.join(' ')}'`;
     }
     escapeColumnName(name) {
         return `\`${name}\``;

package/dist/src/adapter/CubeStoreQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CubeStoreQuery.js","sourceRoot":"","sources":["../../../src/adapter/CubeStoreQuery.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"CubeStoreQuery.js","sourceRoot":"","sources":["../../../src/adapter/CubeStoreQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/HiveQuery.d.ts CHANGED Viewed

@@ -10,6 +10,11 @@ export declare class HiveQuery extends BaseQuery {
     dateTimeCast(value: any): string;
     subtractInterval(date: any, interval: any): string;
     addInterval(date: any, interval: any): string;
+    /**
+     * Hive INTERVAL literals carry a single unit, so a compound interval is applied one unit at a
+     * time, coarsest first.
+     */
+    private applyInterval;
     timeGroupedColumn(granularity: any, dimension: any): any;
     escapeColumnName(name: any): string;
     simpleQuery(): string;

package/dist/src/adapter/HiveQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"HiveQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/HiveQuery.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAY1C,cAAM,UAAW,SAAQ,UAAU;IAC1B,cAAc,CAAC,MAAM,KAAA,EAAE,GAAG,KAAA,EAAE,KAAK,KAAA,EAAE,IAAI,KAAA;CAK/C;AAED,qBAAa,SAAU,SAAQ,SAAS;IAC/B,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;~~IAM~~/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;~~IAM1B~~,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,gBAAgB,CAAC,IAAI,KAAA;IAIrB,WAAW;IAkBX,SAAS,CAAC,aAAa,KAAA;IAOvB,aAAa;IASb,aAAa,CAAC,EAAE,KAAA;IAUhB,gBAAgB;IAIhB,iCAAiC;IAIjC,YAAY;CAKpB"}
1	+ {"version":3,"file":"HiveQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/HiveQuery.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAY1C,cAAM,UAAW,SAAQ,UAAU;IAC1B,cAAc,CAAC,MAAM,KAAA,EAAE,GAAG,KAAA,EAAE,KAAK,KAAA,EAAE,IAAI,KAAA;CAK/C;AAED,qBAAa,SAAU,SAAQ,SAAS;IAC/B,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAI/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAIjC;;;OAGG;IACH,OAAO,CAAC,aAAa;IAQd,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,gBAAgB,CAAC,IAAI,KAAA;IAIrB,WAAW;IAkBX,SAAS,CAAC,aAAa,KAAA;IAOvB,aAAa;IASb,aAAa,CAAC,EAAE,KAAA;IAUhB,gBAAgB;IAIhB,iCAAiC;IAIjC,YAAY;CAKpB"}

package/dist/src/adapter/HiveQuery.js CHANGED Viewed

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HiveQuery = void 0;
 const ramda_1 = __importDefault(require("ramda"));
+const shared_1 = require("@cubejs-backend/shared");
 const BaseQuery_1 = require("./BaseQuery");
 const BaseFilter_1 = require("./BaseFilter");
 const GRANULARITY_TO_INTERVAL = {
@@ -37,12 +38,20 @@ class HiveQuery extends BaseQuery_1.BaseQuery {
         return `from_utc_timestamp(${value}, 'UTC')`; // TODO
     }
     subtractInterval(date, interval) {
-        const [number, type] = this.parseInterval(interval);
-        return `(${date} - INTERVAL '${number}' ${type})`;
+        return this.applyInterval('-', date, interval);
     }
     addInterval(date, interval) {
-        const [number, type] = this.parseInterval(interval);
-        return `(${date} + INTERVAL '${number}' ${type})`;
+        return this.applyInterval('+', date, interval);
+    }
+    /**
+     * Hive INTERVAL literals carry a single unit, so a compound interval is applied one unit at a
+     * time, coarsest first.
+     */
+    applyInterval(operator, date, interval) {
+        return (0, shared_1.splitSqlInterval)(interval).reduce((acc, part) => {
+            const [number, type] = this.parseInterval(part);
+            return `(${acc} ${operator} INTERVAL '${number}' ${type})`;
+        }, date);
     }
     timeGroupedColumn(granularity, dimension) {
         return GRANULARITY_TO_INTERVAL[granularity](dimension);

package/dist/src/adapter/HiveQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"HiveQuery.js","sourceRoot":"","sources":["../../../src/adapter/HiveQuery.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAsB;~~AAEtB~~,2CAAwC;AACxC,6CAA0C;AAE1C,MAAM,uBAAuB,GAAG;IAC9B,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;IAChE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,2FAA2F,IAAI,oHAAoH;IACnO,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;IACjE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;IACnE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;IACnE,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;IAClE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,8BAA8B;CAClE,CAAC;AAEF,MAAM,UAAW,SAAQ,uBAAU;IAC1B,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI;QAC5C,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,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;IACnG,CAAC;CACF;AAED,MAAa,SAAU,SAAQ,qBAAS;IAC/B,SAAS,CAAC,MAAM;QACrB,OAAO,IAAI,UAAU,CAAC,IAAiB,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;IAEM,SAAS,CAAC,KAAK;QACpB,OAAO,sBAAsB,KAAK,MAAM,IAAI,CAAC,QAAQ,IAAI,CAAC;IAC5D,CAAC;IAEM,aAAa,CAAC,KAAK;QACxB,OAAO,sCAAsC,KAAK,+BAA+B,CAAC;IACpF,CAAC;IAEM,YAAY,CAAC,KAAK;QACvB,OAAO,sBAAsB,KAAK,UAAU,CAAC,CAAC,OAAO;IACvD,CAAC;IAEM,gBAAgB,CAAC,IAAI,EAAE,QAAQ;QACpC,~~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,IAAI,EAAE,~~QAAQ~~;~~QAC/B~~,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~~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~~AA9FD~~,~~8BA8FC~~"}
1	+ {"version":3,"file":"HiveQuery.js","sourceRoot":"","sources":["../../../src/adapter/HiveQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/MysqlQuery.d.ts CHANGED Viewed

@@ -12,6 +12,11 @@ export declare class MysqlQuery extends BaseQuery {
     dateTimeCast(value: string): string;
     subtractInterval(date: string, interval: string): string;
     addInterval(date: string, interval: string): string;
+    /**
+     * MySQL compound INTERVAL units only cover contiguous unit ranges (DAY_HOUR, HOUR_SECOND, ...),
+     * so an interval it can not spell in one go is applied one unit at a time, coarsest first.
+     */
+    private applyInterval;
     timeGroupedColumn(granularity: string, dimension: any): string;
     /**
      * Returns sql for source expression floored to timestamps aligned with
@@ -25,6 +30,10 @@ export declare class MysqlQuery extends BaseQuery {
      * @see https://dev.mysql.com/doc/refman/8.4/en/expressions.html#temporal-intervals
      */
     private formatInterval;
+    /**
+     * The formatted interval, or undefined when MySQL has no single INTERVAL spelling for it.
+     */
+    private tryFormatInterval;
     escapeColumnName(name: string): string;
     seriesSql(timeDimension: BaseTimeDimension): string;
     concatStringsSql(strings: string[]): string;

package/dist/src/adapter/MysqlQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MysqlQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/MysqlQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAqBxD,qBAAa,UAAW,SAAQ,SAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;IAE5C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAU;gBAE9B,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;IAOxC,SAAS,CAAC,MAAM,KAAA;IAIhB,YAAY,CAAC,GAAG,EAAE,MAAM;IAIxB,SAAS,CAAC,KAAK,EAAE,MAAM;IAQvB,aAAa,CAAC,KAAK,EAAE,MAAM;IAI3B,eAAe;IAIf,YAAY,CAAC,KAAK,EAAE,MAAM;IAI1B,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAI/C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;~~IAI1C~~,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,KAAA;IAIvD;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAaxE,OAAO,CAAC,YAAY;IAIpB;;;;OAIG;IACH,OAAO,CAAC,cAAc;~~IA0Cf~~,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAItC,SAAS,CAAC,aAAa,EAAE,iBAAiB,GAAG,MAAM;IAOnD,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM;IAI3C,gBAAgB,IAAI,MAAM;IAI1B,6BAA6B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIlD,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,MAAM;IAQ9F,iCAAiC,IAAI,OAAO;IAI5C,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxC,YAAY;CAyFpB"}
1	+ {"version":3,"file":"MysqlQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/MysqlQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAqBxD,qBAAa,UAAW,SAAQ,SAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;IAE5C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAU;gBAE9B,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;IAOxC,SAAS,CAAC,MAAM,KAAA;IAIhB,YAAY,CAAC,GAAG,EAAE,MAAM;IAIxB,SAAS,CAAC,KAAK,EAAE,MAAM;IAQvB,aAAa,CAAC,KAAK,EAAE,MAAM;IAI3B,eAAe;IAIf,YAAY,CAAC,KAAK,EAAE,MAAM;IAI1B,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAI/C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAIjD;;;OAGG;IACH,OAAO,CAAC,aAAa;IAOd,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,KAAA;IAIvD;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAaxE,OAAO,CAAC,YAAY;IAIpB;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAUtB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA0ClB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAItC,SAAS,CAAC,aAAa,EAAE,iBAAiB,GAAG,MAAM;IAOnD,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM;IAI3C,gBAAgB,IAAI,MAAM;IAI1B,6BAA6B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIlD,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,MAAM;IAQ9F,iCAAiC,IAAI,OAAO;IAI5C,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxC,YAAY;CAyFpB"}

package/dist/src/adapter/MysqlQuery.js CHANGED Viewed

@@ -56,10 +56,19 @@ class MysqlQuery extends BaseQuery_1.BaseQuery {
         return `TIMESTAMP(${value})`;
     }
     subtractInterval(date, interval) {
-        return `DATE_SUB(${date}, INTERVAL ${this.formatInterval(interval)})`;
+        return this.applyInterval('DATE_SUB', date, interval);
     }
     addInterval(date, interval) {
-        return `DATE_ADD(${date}, INTERVAL ${this.formatInterval(interval)})`;
+        return this.applyInterval('DATE_ADD', date, interval);
+    }
+    /**
+     * MySQL compound INTERVAL units only cover contiguous unit ranges (DAY_HOUR, HOUR_SECOND, ...),
+     * so an interval it can not spell in one go is applied one unit at a time, coarsest first.
+     */
+    applyInterval(fn, date, interval) {
+        const whole = this.tryFormatInterval(interval);
+        const parts = whole ? [whole] : (0, shared_1.splitSqlInterval)(interval).map(part => this.formatInterval(part));
+        return parts.reduce((acc, part) => `${fn}(${acc}, INTERVAL ${part})`, date);
     }
     timeGroupedColumn(granularity, dimension) {
         return `CAST(${GRANULARITY_TO_INTERVAL[granularity](dimension)} AS DATETIME)`;
@@ -88,6 +97,16 @@ class MysqlQuery extends BaseQuery_1.BaseQuery {
      * @see https://dev.mysql.com/doc/refman/8.4/en/expressions.html#temporal-intervals
      */
     formatInterval(interval) {
+        const formatted = this.tryFormatInterval(interval);
+        if (!formatted) {
+            throw new Error(`Cannot transform interval expression "${interval}" to MySQL dialect`);
+        }
+        return formatted;
+    }
+    /**
+     * The formatted interval, or undefined when MySQL has no single INTERVAL spelling for it.
+     */
+    tryFormatInterval(interval) {
         const intervalParsed = (0, shared_1.parseSqlInterval)(interval);
         const intKeys = Object.keys(intervalParsed).length;
         if (intervalParsed.year && intKeys === 1) {
@@ -139,7 +158,7 @@ class MysqlQuery extends BaseQuery_1.BaseQuery {
             // MySQL doesn't support MILLISECOND, use MICROSECOND instead (1ms = 1000μs)
             return `${intervalParsed.millisecond * 1000} MICROSECOND`;
         }
-        throw new Error(`Cannot transform interval expression "${interval}" to MySQL dialect`);
+        return undefined;
     }
     escapeColumnName(name) {
         return `\`${name}\``;

package/dist/src/adapter/MysqlQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MysqlQuery.js","sourceRoot":"","sources":["../../../src/adapter/MysqlQuery.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAqC;AACrC,~~mDAAkE~~;~~AAClE~~,2CAAwC;AACxC,6CAA0C;AAC1C,qDAAkD;AAGlD,MAAM,uBAAuB,GAAG;IAC9B,GAAG,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,eAAe,IAAI,4BAA4B;IACtE,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,iFAAiF,IAAI,mCAAmC;IAChJ,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,eAAe,IAAI,4BAA4B;IACvE,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,eAAe,IAAI,4BAA4B;IACzE,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,eAAe,IAAI,4BAA4B;IACzE,KAAK,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,eAAe,IAAI,4BAA4B;IACxE,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,wEAAwE,IAAI,YAAY;IACnH,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,eAAe,IAAI,4BAA4B;CACxE,CAAC;AAEF,MAAM,WAAY,SAAQ,uBAAU;IAC3B,cAAc,CAAC,MAAc,EAAE,GAAY,EAAE,KAAK,EAAE,IAAY;QACrE,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,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;IACnG,CAAC;CACF;AAED,MAAa,UAAW,SAAQ,qBAAS;IACtB,iBAAiB,CAAU;IAE3B,sBAAsB,CAAU;IAEjD,YAAmB,SAAc,EAAE,OAAY;QAC7C,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAE1B,IAAI,CAAC,iBAAiB,GAAG,IAAA,eAAM,EAAC,wBAAwB,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC3F,IAAI,CAAC,sBAAsB,GAAG,IAAA,eAAM,EAAC,6BAA6B,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IACvG,CAAC;IAEM,SAAS,CAAC,MAAM;QACrB,OAAO,IAAI,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;IAEM,YAAY,CAAC,GAAW;QAC7B,OAAO,QAAQ,GAAG,WAAW,CAAC;IAChC,CAAC;IAEM,SAAS,CAAC,KAAa;QAC5B,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,OAAO,cAAc,KAAK,2BAA2B,IAAI,CAAC,QAAQ,IAAI,CAAC;SACxE;QAED,OAAO,cAAc,KAAK,2BAA2B,IAAA,yBAAM,GAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;IAClG,CAAC;IAEM,aAAa,CAAC,KAAa;QAChC,OAAO,wBAAwB,KAAK,mCAAmC,CAAC;IAC1E,CAAC;IAEM,eAAe;QACpB,OAAO,yBAAyB,CAAC;IACnC,CAAC;IAEM,YAAY,CAAC,KAAa;QAC/B,OAAO,aAAa,KAAK,GAAG,CAAC;IAC/B,CAAC;IAEM,gBAAgB,CAAC,IAAY,EAAE,QAAgB;QACpD,OAAO,~~YAAY,~~IAAI,~~cAAc~~,~~IAAI~~,CAAC,~~cAAc~~,~~CAAC~~,QAAQ,CAAC,~~GAAG,~~CAAC;~~IACxE~~,CAAC;IAEM,WAAW,CAAC,IAAY,EAAE,QAAgB;QAC/C,OAAO,~~YAAY~~,IAAI,~~cAAc~~,IAAI,CAAC,~~cAAc~~,CAAC,QAAQ,CAAC,GAAG,CAAC;~~IACxE~~,CAAC;IAEM,iBAAiB,CAAC,WAAmB,EAAE,SAAS;QACrD,OAAO,QAAQ,uBAAuB,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC;IAChF,CAAC;IAED;;;OAGG;IACI,OAAO,CAAC,QAAgB,EAAE,MAAc,EAAE,MAAc;QAC7D,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;QAElE,OAAO,gBAAgB,QAAQ;;0BAET,QAAQ,KAAK,IAAI,CAAC,YAAY,CAAC,IAAI,MAAM,GAAG,CAAC,KAAK,MAAM;0BACxD,QAAQ,6DAA6D,iBAAiB;4BACpF,QAAQ,6DAA6D,iBAAiB;UACxG,IAAI,CAAC,YAAY,CAAC,IAAI,MAAM,GAAG,CAAC;MACpC,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,QAAgB;QACnC,OAAO,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACK,cAAc,CAAC,QAAgB;QACrC,MAAM,cAAc,GAAG,IAAA,yBAAgB,EAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC;QAEnD,IAAI,cAAc,CAAC,IAAI,IAAI,OAAO,KAAK,CAAC,EAAE;YACxC,OAAO,GAAG,cAAc,CAAC,IAAI,OAAO,CAAC;SACtC;aAAM,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,EAAE;YACvE,OAAO,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,KAAK,cAAc,CAAC;SACtE;aAAM,IAAI,cAAc,CAAC,OAAO,IAAI,OAAO,KAAK,CAAC,EAAE;YAClD,OAAO,GAAG,cAAc,CAAC,OAAO,UAAU,CAAC;SAC5C;aAAM,IAAI,cAAc,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,EAAE;YAChD,OAAO,GAAG,cAAc,CAAC,KAAK,QAAQ,CAAC;SACxC;aAAM,IAAI,cAAc,CAAC,IAAI,IAAI,OAAO,KAAK,CAAC,EAAE;YAC/C,OAAO,GAAG,cAAc,CAAC,IAAI,OAAO,CAAC;SACtC;aAAM,IAAI,cAAc,CAAC,GAAG,IAAI,OAAO,KAAK,CAAC,EAAE;YAC9C,OAAO,GAAG,cAAc,CAAC,GAAG,MAAM,CAAC;SACpC;aAAM,IAAI,cAAc,CAAC,GAAG,IAAI,cAAc,CAAC,IAAI,IAAI,OAAO,KAAK,CAAC,EAAE;YACrE,OAAO,IAAI,cAAc,CAAC,GAAG,IAAI,cAAc,CAAC,IAAI,YAAY,CAAC;SAClE;aAAM,IAAI,cAAc,CAAC,GAAG,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,MAAM,IAAI,OAAO,KAAK,CAAC,EAAE;YAC9F,OAAO,IAAI,cAAc,CAAC,GAAG,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,MAAM,cAAc,CAAC;SAC7F;aAAM,IAAI,cAAc,CAAC,GAAG,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,IAAI,OAAO,KAAK,CAAC,EAAE;YACvH,OAAO,IAAI,cAAc,CAAC,GAAG,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,cAAc,CAAC;SACtH;aAAM,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,MAAM,IAAI,OAAO,KAAK,CAAC,EAAE;YACxE,OAAO,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,MAAM,eAAe,CAAC;SACxE;aAAM,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,IAAI,OAAO,KAAK,CAAC,EAAE;YACjG,OAAO,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,eAAe,CAAC;SACjG;aAAM,IAAI,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,IAAI,OAAO,KAAK,CAAC,EAAE;YAC1E,OAAO,IAAI,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,iBAAiB,CAAC;SAC5E;aAAM,IAAI,cAAc,CAAC,IAAI,IAAI,OAAO,KAAK,CAAC,EAAE;YAC/C,OAAO,GAAG,cAAc,CAAC,IAAI,OAAO,CAAC;SACtC;aAAM,IAAI,cAAc,CAAC,MAAM,IAAI,OAAO,KAAK,CAAC,EAAE;YACjD,OAAO,GAAG,cAAc,CAAC,MAAM,SAAS,CAAC;SAC1C;aAAM,IAAI,cAAc,CAAC,MAAM,IAAI,OAAO,KAAK,CAAC,EAAE;YACjD,OAAO,GAAG,cAAc,CAAC,MAAM,SAAS,CAAC;SAC1C;aAAM,IAAI,cAAc,CAAC,WAAW,IAAI,OAAO,KAAK,CAAC,EAAE;YACtD,4EAA4E;YAC5E,OAAO,GAAG,cAAc,CAAC,WAAW,GAAG,IAAI,cAAc,CAAC;SAC3D;QAED,~~MAAM~~,~~IAAI~~,~~KAAK,~~CAAC~~,yCAAyC,QAAQ,oBAAoB,CAAC,CAAC~~;~~IACzF~~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~~AAxPD~~,~~gCAwPC~~"}
1	+ {"version":3,"file":"MysqlQuery.js","sourceRoot":"","sources":["../../../src/adapter/MysqlQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/PrestodbQuery.d.ts CHANGED Viewed

@@ -32,6 +32,13 @@ export declare class PrestodbQuery extends BaseQuery {
      */
     dateBin(interval: string, source: string, origin: string): string;
     timeGroupedColumn(granularity: any, dimension: any): string;
+    subtractInterval(date: string, interval: string): string;
+    addInterval(date: string, interval: string): string;
+    /**
+     * A Presto INTERVAL literal carries a single unit, so a compound interval is applied one unit at
+     * a time, coarsest first.
+     */
+    private applyInterval;
     intervalString(interval: string): string;
     seriesSql(timeDimension: any): string;
     unixTimestampSql(): string;

package/dist/src/adapter/PrestodbQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PrestodbQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/PrestodbQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAiCxC,qBAAa,aAAc,SAAQ,SAAS;IACnC,SAAS,CAAC,MAAM,KAAA;IAIhB,cAAc;IAId,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIzB;;;;;;;;;;;;;;;OAeG;IACH,SAAS,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIvC,SAAS,CAAC,KAAK,KAAA;IAU/B;;;;;;;OAOG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAmBjE,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAKxC,SAAS,CAAC,aAAa,KAAA;IAOvB,gBAAgB;IAIhB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,iCAAiC;IAIxC,SAAS,CAAC,iBAAiB,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAMlC,YAAY;IA0EZ,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAI9B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAGtC"}
1	+ {"version":3,"file":"PrestodbQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/PrestodbQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAiCxC,qBAAa,aAAc,SAAQ,SAAS;IACnC,SAAS,CAAC,MAAM,KAAA;IAIhB,cAAc;IAId,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIzB;;;;;;;;;;;;;;;OAeG;IACH,SAAS,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIvC,SAAS,CAAC,KAAK,KAAA;IAU/B;;;;;;;OAOG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAmBjE,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI1D;;;OAGG;IACH,OAAO,CAAC,aAAa;IAOd,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAKxC,SAAS,CAAC,aAAa,KAAA;IAOvB,gBAAgB;IAIhB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,iCAAiC;IAIxC,SAAS,CAAC,iBAAiB,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA;IAMlC,YAAY;IA0EZ,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAI9B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAGtC"}

package/dist/src/adapter/PrestodbQuery.js CHANGED Viewed

@@ -97,6 +97,19 @@ class PrestodbQuery extends BaseQuery_1.BaseQuery {
     timeGroupedColumn(granularity, dimension) {
         return `date_trunc('${GRANULARITY_TO_INTERVAL[granularity]}', ${dimension})`;
     }
+    subtractInterval(date, interval) {
+        return this.applyInterval('-', date, interval);
+    }
+    addInterval(date, interval) {
+        return this.applyInterval('+', date, interval);
+    }
+    /**
+     * A Presto INTERVAL literal carries a single unit, so a compound interval is applied one unit at
+     * a time, coarsest first.
+     */
+    applyInterval(operator, date, interval) {
+        return (0, shared_1.splitSqlInterval)(interval).reduce((acc, part) => `${acc} ${operator} interval ${this.intervalString(part)}`, date);
+    }
     intervalString(interval) {
         const [intervalValue, intervalUnit] = interval.split(' ');
         return `'${intervalValue}' ${intervalUnit}`;

package/dist/src/adapter/PrestodbQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PrestodbQuery.js","sourceRoot":"","sources":["../../../src/adapter/PrestodbQuery.ts"],"names":[],"mappings":";;;AAAA,~~mDAA0D~~;~~AAC1D~~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~~AA/MD~~,~~sCA+MC~~"}
1	+ {"version":3,"file":"PrestodbQuery.js","sourceRoot":"","sources":["../../../src/adapter/PrestodbQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/SnowflakeQuery.d.ts CHANGED Viewed

@@ -8,6 +8,8 @@ export declare class SnowflakeQuery extends BaseQuery {
      * intervals relative to origin timestamp point.
      */
     dateBin(interval: string, source: string, origin: string): string;
+    subtractInterval(date: string, interval: string): string;
+    addInterval(date: string, interval: string): string;
     /**
      * The input interval in format "2 years 3 months 4 weeks 5 days...."
      * will be converted to Snowflake dialect "2 years, 3 months, 4 weeks, 5 days...."

package/dist/src/adapter/SnowflakeQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SnowflakeQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/SnowflakeQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA+BxC,qBAAa,cAAe,SAAQ,SAAS;IACpC,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAI/C;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;~~IAaxE~~;;;OAGG;IACH,OAAO,CAAC,cAAc;IASf,aAAa,CAAC,KAAK,KAAA;IAInB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,eAAe;IAIf,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,YAAY;CAuCpB"}
1	+ {"version":3,"file":"SnowflakeQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/SnowflakeQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA+BxC,qBAAa,cAAe,SAAQ,SAAS;IACpC,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAIf,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAI/C;;;OAGG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAajE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI1D;;;OAGG;IACH,OAAO,CAAC,cAAc;IASf,aAAa,CAAC,KAAK,KAAA;IAInB,iCAAiC;IAIjC,sBAAsB;;;IAMtB,eAAe;IAIf,OAAO,CAAC,GAAG,KAAA;IAIX,QAAQ,CAAC,GAAG,KAAA;IAIZ,mBAAmB,CAAC,GAAG,KAAA;IAIvB,YAAY;CAuCpB"}

package/dist/src/adapter/SnowflakeQuery.js CHANGED Viewed

@@ -54,6 +54,12 @@ class SnowflakeQuery extends BaseQuery_1.BaseQuery {
         ) * DATEDIFF(${timeUnit}, ${beginOfTime}, (${beginOfTime} + interval '${intervalFormatted}')),
         ${this.dateTimeCast(`'${origin}'`)})`;
     }
+    subtractInterval(date, interval) {
+        return `${date} - interval '${this.formatInterval(interval)}'`;
+    }
+    addInterval(date, interval) {
+        return `${date} + interval '${this.formatInterval(interval)}'`;
+    }
     /**
      * The input interval in format "2 years 3 months 4 weeks 5 days...."
      * will be converted to Snowflake dialect "2 years, 3 months, 4 weeks, 5 days...."

package/dist/src/adapter/SnowflakeQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SnowflakeQuery.js","sourceRoot":"","sources":["../../../src/adapter/SnowflakeQuery.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,6CAA0C;AAE1C,MAAM,uBAAuB,GAAG;IAC9B,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,eAAgB,SAAQ,uBAAU;IAC/B,cAAc,CAAC,MAAc,EAAE,GAAY,EAAE,KAAU,EAAE,IAAY;QAC1E,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QACjF,uBAAuB;QACvB,6GAA6G;QAC7G,kHAAkH;QAClH,iHAAiH;QACjH,oEAAoE;QACpE,EAAE;QACF,oGAAoG;QACpG,2FAA2F;QAC3F,yCAAyC;QACzC,OAAO,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC;IAClG,CAAC;CACF;AAED,MAAa,cAAe,SAAQ,qBAAS;IACpC,SAAS,CAAC,MAAM;QACrB,OAAO,IAAI,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;IAEM,SAAS,CAAC,KAAK;QACpB,OAAO,qBAAqB,IAAI,CAAC,QAAQ,MAAM,KAAK,gCAAgC,CAAC;IACvF,CAAC;IAEM,iBAAiB,CAAC,WAAW,EAAE,SAAS;QAC7C,OAAO,eAAe,uBAAuB,CAAC,WAAW,CAAC,MAAM,SAAS,GAAG,CAAC;IAC/E,CAAC;IAED;;;OAGG;IACI,OAAO,CAAC,QAAgB,EAAE,MAAc,EAAE,MAAc;QAC7D,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,WAAW,GAAG,2CAA2C,CAAC;QAEhE,OAAO,WAAW,QAAQ;;qBAET,QAAQ,KAAK,IAAI,CAAC,YAAY,CAAC,IAAI,MAAM,GAAG,CAAC,KAAK,MAAM;qBACxD,QAAQ,KAAK,WAAW,MAAM,WAAW,gBAAgB,iBAAiB;uBACxE,QAAQ,KAAK,WAAW,MAAM,WAAW,gBAAgB,iBAAiB;UACvF,IAAI,CAAC,YAAY,CAAC,IAAI,MAAM,GAAG,CAAC,GAAG,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACK,cAAc,CAAC,QAAgB;QACrC,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAClD,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,OAAO,GAAG,IAAI,GAAG,CAAC;aACnB;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAEM,aAAa,CAAC,KAAK;QACxB,OAAO,GAAG,KAAK,gBAAgB,CAAC;IAClC,CAAC;IAEM,iCAAiC;QACtC,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,sBAAsB;QAC3B,OAAO;YACL,KAAK,EAAE,WAAW;SACnB,CAAC;IACJ,CAAC;IAEM,eAAe;QACpB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAEM,OAAO,CAAC,GAAG;QAChB,OAAO,6BAA6B,GAAG,IAAI,CAAC;IAC9C,CAAC;IAEM,QAAQ,CAAC,GAAG;QACjB,OAAO,uCAAuC,GAAG,KAAK,CAAC;IACzD,CAAC;IAEM,mBAAmB,CAAC,GAAG;QAC5B,OAAO,yBAAyB,GAAG,GAAG,CAAC;IACzC,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,QAAQ,GAAG,8BAA8B,CAAC;QAC9D,SAAS,CAAC,SAAS,CAAC,WAAW,GAAG,cAAc,CAAC;QACjD,SAAS,CAAC,SAAS,CAAC,GAAG,GAAG,mBAAmB,CAAC;QAC9C,SAAS,CAAC,SAAS,CAAC,YAAY,GAAG,WAAW,CAAC;QAC/C,SAAS,CAAC,SAAS,CAAC,GAAG,GAAG,oEAAoE,CAAC;QAC/F,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,4BAA4B,CAAC;QAC1D,SAAS,CAAC,SAAS,CAAC,eAAe,GAAG,uBAAuB,CAAC;QAC9D,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,yBAAyB,CAAC;QACtD,SAAS,CAAC,SAAS,CAAC,UAAU,GAAG,iEAAiE,CAAC;QACnG,yCAAyC;QACzC,SAAS,CAAC,SAAS,CAAC,QAAQ,GAAG,yDAAyD,CAAC;QACzF,SAAS,CAAC,WAAW,CAAC,OAAO,GAAG,0CAA0C,CAAC;QAC3E,4EAA4E;QAC5E,2EAA2E;QAC3E,qEAAqE;QACrE,SAAS,CAAC,WAAW,CAAC,YAAY,GAAG,iDAAiD,CAAC;QACvF,8EAA8E;QAC9E,4EAA4E;QAC5E,2EAA2E;QAC3E,2EAA2E;QAC3E,gCAAgC;QAChC,SAAS,CAAC,WAAW,CAAC,kBAAkB,GAAG,+DAA+D,CAAC;QAC3G,SAAS,CAAC,WAAW,CAAC,QAAQ,GAAG,6BAA6B,CAAC;QAC/D,SAAS,CAAC,WAAW,CAAC,iBAAiB,GAAG,+BAA+B,CAAC;QAC1E,SAAS,CAAC,WAAW,CAAC,IAAI,GAAG,gHAAgH,CAAC;QAC9I,SAAS,CAAC,WAAW,CAAC,KAAK,GAAG,iHAAiH,CAAC;QAChJ,SAAS,CAAC,SAAS,CAAC,oBAAoB,GAAG,sBAAsB,CAAC;QAClE,sEAAsE;QACtE,uEAAuE;QACvE,2EAA2E;QAC3E,mCAAmC;QACnC,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,+EAA+E,CAAC;QAC5G,SAAS,CAAC,SAAS,CAAC,eAAe,GAAG,MAAM,CAAC;QAC7C,OAAO,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC;QAChC,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;~~AAhHD~~,~~wCAgHC~~"}
1	+ {"version":3,"file":"SnowflakeQuery.js","sourceRoot":"","sources":["../../../src/adapter/SnowflakeQuery.ts"],"names":[],"mappings":"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"}

package/dist/src/adapter/SqliteQuery.d.ts CHANGED Viewed

@@ -7,6 +7,11 @@ export declare class SqliteQuery extends BaseQuery {
     dateTimeCast(value: any): string;
     subtractInterval(date: any, interval: any): string;
     addInterval(date: any, interval: any): string;
+    /**
+     * A strftime modifier carries a single unit, so a compound interval becomes one modifier
+     * argument per unit, coarsest first.
+     */
+    private applyInterval;
     timeGroupedColumn(granularity: any, dimension: any): any;
     seriesSql(timeDimension: any): string;
     nowTimestampSql(): string;

package/dist/src/adapter/SqliteQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SqliteQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/SqliteQuery.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA2BxC,qBAAa,WAAY,SAAQ,SAAS;IACjC,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAQf,QAAQ,CAAC,OAAO,KAAA;IAKhB,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;~~IAI~~/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;~~IAI1B~~,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,SAAS,CAAC,aAAa,KAAA;IAOvB,eAAe;IAKf,gBAAgB;IAKhB,YAAY;CAQpB"}
1	+ {"version":3,"file":"SqliteQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/SqliteQuery.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA2BxC,qBAAa,WAAY,SAAQ,SAAS;IACjC,SAAS,CAAC,MAAM,KAAA;IAIhB,SAAS,CAAC,KAAK,KAAA;IAQf,QAAQ,CAAC,OAAO,KAAA;IAKhB,aAAa,CAAC,KAAK,KAAA;IAInB,YAAY,CAAC,KAAK,KAAA;IAIlB,gBAAgB,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAO/B,WAAW,CAAC,IAAI,KAAA,EAAE,QAAQ,KAAA;IAIjC;;;OAGG;IACH,OAAO,CAAC,aAAa;IAMd,iBAAiB,CAAC,WAAW,KAAA,EAAE,SAAS,KAAA;IAIxC,SAAS,CAAC,aAAa,KAAA;IAOvB,eAAe;IAKf,gBAAgB;IAKhB,YAAY;CAQpB"}

package/dist/src/adapter/SqliteQuery.js CHANGED Viewed

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqliteQuery = void 0;
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
+const shared_1 = require("@cubejs-backend/shared");
 const BaseQuery_1 = require("./BaseQuery");
 const BaseFilter_1 = require("./BaseFilter");
 const GRANULARITY_TO_INTERVAL = {
@@ -49,10 +50,18 @@ class SqliteQuery extends BaseQuery_1.BaseQuery {
         return `strftime('%Y-%m-%dT%H:%M:%f', ${value})`;
     }
     subtractInterval(date, interval) {
-        return `strftime('%Y-%m-%dT%H:%M:%f', ${date}, '${interval.replace('-', '+').replace(/(^\+|^)/, '-')}')`;
+        return this.applyInterval(date, (0, shared_1.splitSqlInterval)(interval).map(part => part.replace('-', '+').replace(/(^\+|^)/, '-')));
     }
     addInterval(date, interval) {
-        return `strftime('%Y-%m-%dT%H:%M:%f', ${date}, '${interval}')`;
+        return this.applyInterval(date, (0, shared_1.splitSqlInterval)(interval));
+    }
+    /**
+     * A strftime modifier carries a single unit, so a compound interval becomes one modifier
+     * argument per unit, coarsest first.
+     */
+    applyInterval(date, parts) {
+        const modifiers = parts.map(part => `'${part}'`).join(', ');
+        return `strftime('%Y-%m-%dT%H:%M:%f', ${date}, ${modifiers})`;
     }
     timeGroupedColumn(granularity, dimension) {
         return GRANULARITY_TO_INTERVAL[granularity](dimension);

package/dist/src/adapter/SqliteQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SqliteQuery.js","sourceRoot":"","sources":["../../../src/adapter/SqliteQuery.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAqC;~~AAErC~~,2CAAwC;AACxC,6CAA0C;AAE1C,MAAM,uBAAuB,GAAG;IAC9B,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,qCAAqC,IAAI,GAAG;IAC3D,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,oDAAoD,IAAI,yBAAyB,IAAI,eAAe,IAAI,4BAA4B,IAAI,gCAAgC;IACxL,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,qCAAqC,IAAI,GAAG;IAC5D,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,qCAAqC,IAAI,GAAG;IAC9D,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,qCAAqC,IAAI,GAAG;IAC9D,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,qCAAqC,IAAI,GAAG;IAC7D,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,qCAAqC,IAAI,GAAG;IAC5D,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;iCACY,IAAI,wEAAwE,IAAI;iCAChF,IAAI,wEAAwE,IAAI;iCAChF,IAAI,wEAAwE,IAAI;+CAClE,IAAI;QAC3C;CACP,CAAC;AAEF,MAAM,YAAa,SAAQ,uBAAU;IAC5B,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI;QAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QACjF,OAAO,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC;IAClG,CAAC;CACF;AAED,MAAa,WAAY,SAAQ,qBAAS;IACjC,SAAS,CAAC,MAAM;QACrB,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAEM,SAAS,CAAC,KAAK;QACpB,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QACjC,IAAA,yBAAM,GAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;aACnC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC;aACjB,OAAO,CAAC,GAAG,EAAE,GAAG,CACrB,GAAG,CAAC;IACN,CAAC;IAEM,QAAQ,CAAC,OAAO;QACrB,8BAA8B;QAC9B,OAAO,UAAU,OAAO,iBAAiB,OAAO,aAAa,OAAO,aAAa,CAAC;IACpF,CAAC;IAEM,aAAa,CAAC,KAAK;QACxB,OAAO,iCAAiC,KAAK,GAAG,CAAC;IACnD,CAAC;IAEM,YAAY,CAAC,KAAK;QACvB,OAAO,iCAAiC,KAAK,GAAG,CAAC;IACnD,CAAC;IAEM,gBAAgB,CAAC,IAAI,EAAE,QAAQ;QACpC,OAAO,~~iCAAiC~~,IAAI,~~MAAM~~,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,~~IAAI~~,CAAC;~~IAC3G~~,CAAC;IAEM,WAAW,CAAC,IAAI,EAAE,QAAQ;QAC/B,OAAO,~~iCAAiC~~,IAAI,~~MAAM~~,QAAQ,IAAI,CAAC;~~IACjE~~,CAAC;IAEM,iBAAiB,CAAC,WAAW,EAAE,SAAS;QAC7C,OAAO,uBAAuB,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC;IACzD,CAAC;IAEM,SAAS,CAAC,aAAa;QAC5B,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC,GAAG,CAC3C,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,WAAW,IAAI,SAAS,EAAE,KAAK,CAChD,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtB,OAAO,mDAAmD,MAAM,YAAY,CAAC;IAC/E,CAAC;IAEM,eAAe;QACpB,kCAAkC;QAClC,OAAO,uCAAuC,CAAC;IACjD,CAAC;IAEM,gBAAgB;QACrB,kCAAkC;QAClC,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAEM,YAAY;QACjB,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;QACvC,OAAO,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC;QACxC,qFAAqF;QACrF,wEAAwE;QACxE,OAAO,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC;QAClC,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;~~AA/DD~~,~~kCA+DC~~"}
1	+ {"version":3,"file":"SqliteQuery.js","sourceRoot":"","sources":["../../../src/adapter/SqliteQuery.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/schema-compiler",
   "description": "Cube schema compiler",
   "author": "Cube Dev, Inc.",
-  "version": "1.7.33",
+  "version": "1.7.34",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -40,8 +40,8 @@
     "@babel/standalone": "^7.24",
     "@babel/traverse": "^7.24",
     "@babel/types": "^7.24",
-    "@cubejs-backend/native": "1.7.33",
-    "@cubejs-backend/shared": "1.7.33",
+    "@cubejs-backend/native": "1.7.34",
+    "@cubejs-backend/shared": "1.7.34",
     "antlr4": "^4.13.2",
     "camelcase": "^6.2.0",
     "cron-parser": "^4.9.0",
@@ -59,10 +59,10 @@
     "yaml": "^2.7.1"
   },
   "devDependencies": {
-    "@clickhouse/client": "^1.12.0",
-    "@cubejs-backend/linter": "1.7.33",
-    "@cubejs-backend/mssql-driver": "1.7.33",
-    "@cubejs-backend/query-orchestrator": "1.7.33",
+    "@clickhouse/client": "^1.23.1",
+    "@cubejs-backend/linter": "1.7.34",
+    "@cubejs-backend/mssql-driver": "1.7.34",
+    "@cubejs-backend/query-orchestrator": "1.7.34",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.5",
@@ -88,5 +88,5 @@
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
-  "gitHead": "465fdf160665cf78e2bee9c964719a96e9a55d12"
+  "gitHead": "9237c26f3c6181fa6abe964ee784d4a997e89523"
 }