@cubejs-backend/schema-compiler 1.7.33 → 1.7.35

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

@@ -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"}
+{"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

@@ -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

@@ -1 +1 @@
-{"version":3,"file":"SnowflakeQuery.js","sourceRoot":"","sources":["../../../src/adapter/SnowflakeQuery.ts"],"names":[],"mappings":"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"}
+{"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;IAEM,gBAAgB,CAAC,IAAY,EAAE,QAAgB;QACpD,OAAO,GAAG,IAAI,gBAAgB,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC;IACjE,CAAC;IAEM,WAAW,CAAC,IAAY,EAAE,QAAgB;QAC/C,OAAO,GAAG,IAAI,gBAAgB,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC;IACjE,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;AAxHD,wCAwHC"}

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

@@ -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

@@ -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"}
+{"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

@@ -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

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

package/package.json

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/schema-compiler",
   "description": "Cube schema compiler",
   "author": "Cube Dev, Inc.",
-  "version": "1.7.33",
+  "version": "1.7.35",
   "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.35",
+    "@cubejs-backend/shared": "1.7.35",
     "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.35",
+    "@cubejs-backend/mssql-driver": "1.7.35",
+    "@cubejs-backend/query-orchestrator": "1.7.35",
     "@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": "c93da328cd867933b7759f116b8c919b79eb3474"
 }