@cubejs-backend/schema-compiler 1.7.23 → 1.7.25

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

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

package/dist/src/adapter/ClickHouseQuery.js

@@ -233,6 +233,9 @@ class ClickHouseQuery extends BaseQuery_1.BaseQuery {
         templates.functions.DATETRUNC = 'DATE_TRUNC({{ args_concat }})';
         templates.functions.UTCTIMESTAMP = 'now(\'UTC\')';
         templates.functions.STRING_AGG = 'arrayStringConcat(group{% if distinct %}Uniq{% endif %}Array({{ args[0] }}), {{ args[1] }})';
+        // DATEADD is being rewritten to DATE_ADD. The operator form is used instead of
+        // addDate(), which only exists since ClickHouse 23.9
+        templates.functions.DATE_ADD = '({{ args[0] }} + INTERVAL {{ interval }} {{ date_part }})';
         // TODO: Introduce additional filter in jinja? or parseDateTimeBestEffort?
         // https://github.com/ClickHouse/ClickHouse/issues/19351
         templates.expressions.timestamp_literal = 'parseDateTimeBestEffort(\'{{ value }}\')';

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"MssqlQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/MssqlQuery.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAoBlD,cAAM,mBAAoB,SAAQ,cAAc;IACvC,gBAAgB,CAAC,UAAU,KAAA;CAGnC;AA4CD,qBAAa,UAAW,SAAQ,SAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;gBAEzB,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;IAMxC,SAAS,CAAC,MAAM,KAAA;IAIhB,UAAU,CAAC,OAAO,KAAA,GAAG,WAAW;IAIhC,YAAY,CAAC,GAAG,KAAA;IAIhB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE;IAIlC,SAAS,CAAC,KAAK,KAAA;IAcf,aAAa,CAAC,KAAK,EAAE,MAAM;IAI3B,YAAY,CAAC,KAAK,EAAE,MAAM;IAI1B,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAIxE;;;;OAIG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAiBjE,iBAAiB,CAAC,gBAAgB,KAAA;IAKlC,qBAAqB;IAQrB,QAAQ;IAOf;;;;;;OAMG;IACI,aAAa;IAWpB;;;;;OAKG;IACI,8BAA8B;IAK9B,oBAAoB,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,oBAAoB,KAAA,EAAE,cAAc,KAAA;IAsBvG,eAAe;IAIf,gBAAgB;IAKhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAKrD,6BAA6B,CAAC,GAAG,KAAA;IAIjC,SAAS,CAAC,aAAa,KAAA;IAOvB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWnD,YAAY;CAoGpB"}
+{"version":3,"file":"MssqlQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/MssqlQuery.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAoBlD,cAAM,mBAAoB,SAAQ,cAAc;IACvC,gBAAgB,CAAC,UAAU,KAAA;CAGnC;AA4CD,qBAAa,UAAW,SAAQ,SAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;gBAEzB,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;IAMxC,SAAS,CAAC,MAAM,KAAA;IAIhB,UAAU,CAAC,OAAO,KAAA,GAAG,WAAW;IAIhC,YAAY,CAAC,GAAG,KAAA;IAIhB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE;IAIlC,SAAS,CAAC,KAAK,KAAA;IAcf,aAAa,CAAC,KAAK,EAAE,MAAM;IAI3B,YAAY,CAAC,KAAK,EAAE,MAAM;IAI1B,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAIxE;;;;OAIG;IACI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAiBjE,iBAAiB,CAAC,gBAAgB,KAAA;IAKlC,qBAAqB;IAQrB,QAAQ;IAOf;;;;;;OAMG;IACI,aAAa;IAWpB;;;;;OAKG;IACI,8BAA8B;IAK9B,oBAAoB,CAAC,kBAAkB,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,KAAA,EAAE,oBAAoB,KAAA,EAAE,cAAc,KAAA;IAsBvG,eAAe;IAIf,gBAAgB;IAKhB,qBAAqB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,SAAS,KAAA;IAKrD,6BAA6B,CAAC,GAAG,KAAA;IAIjC,SAAS,CAAC,aAAa,KAAA;IAOvB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWnD,YAAY;CAsGpB"}

package/dist/src/adapter/MssqlQuery.js

@@ -222,6 +222,8 @@ class MssqlQuery extends BaseQuery_1.BaseQuery {
         templates.functions.UTCTIMESTAMP = 'GETUTCDATE()';
         // MSSQL ROUND requires 2 arguments: ROUND(number, length)
         templates.functions.ROUND = 'ROUND({{ args_concat }}{% if args | length < 2 %}, 0{% endif %})';
+        // DATEADD is being rewritten to DATE_ADD
+        templates.functions.DATE_ADD = 'DATEADD({{ date_part }}, {{ interval }}, {{ args[0] }})';
         // NOTE: MSSQL does not support DISTINCT clause. No workaround is available
         delete templates.functions.STRING_AGG;
         // PERCENTILE_CONT works but requires PARTITION BY

package/dist/src/adapter/MssqlQuery.js.map

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

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

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

package/dist/src/adapter/MysqlQuery.js

@@ -174,6 +174,11 @@ class MysqlQuery extends BaseQuery_1.BaseQuery {
         const templates = super.sqlTemplates();
         templates.functions.STRING_AGG = 'GROUP_CONCAT({% if distinct %}DISTINCT {% endif %}{{ args[0] }} SEPARATOR {{ args[1] }})';
         templates.functions.UTCTIMESTAMP = 'UTC_TIMESTAMP()';
+        // DATEADD is being rewritten to DATE_ADD, which reports sub-day intervals in
+        // milliseconds. MySQL has no MILLISECOND unit, so those are scaled to microseconds
+        templates.functions.DATE_ADD = 'DATE_ADD({{ args[0] }}, INTERVAL '
+            + '{% if date_part == "MILLISECOND" %}{{ interval }}000 MICROSECOND'
+            + '{% else %}{{ interval }} {{ date_part }}{% endif %})';
         // PERCENTILE_CONT works but requires PARTITION BY
         delete templates.functions.PERCENTILECONT;
         delete templates.functions.WIDTH_BUCKET;

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

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

package/dist/src/adapter/PostgresQuery.js

@@ -79,7 +79,7 @@ class PostgresQuery extends BaseQuery_1.BaseQuery {
         templates.functions.NOW = 'NOW({{ args_concat }})';
         templates.functions.UTCTIMESTAMP = '(NOW() AT TIME ZONE \'UTC\')';
         // DATEADD is being rewritten to DATE_ADD
-        // templates.functions.DATEADD = '({{ args[2] }} + \'{{ interval }} {{ date_part }}\'::interval)';
+        templates.functions.DATE_ADD = '({{ args[0] }} + \'{{ interval }} {{ date_part }}\'::interval)';
         // TODO: is DATEDIFF expr worth documenting?
         templates.functions.DATEDIFF = 'CASE WHEN LOWER(\'{{ date_part }}\') IN (\'year\', \'quarter\', \'month\') THEN (EXTRACT(YEAR FROM AGE(DATE_TRUNC(\'{{ date_part }}\', {{ args[2] }}), DATE_TRUNC(\'{{ date_part }}\', {{ args[1] }}))) * 12 + EXTRACT(MONTH FROM AGE(DATE_TRUNC(\'{{ date_part }}\', {{ args[2] }}), DATE_TRUNC(\'{{ date_part }}\', {{ args[1] }})))) / CASE LOWER(\'{{ date_part }}\') WHEN \'year\' THEN 12 WHEN \'quarter\' THEN 3 WHEN \'month\' THEN 1 END ELSE EXTRACT(EPOCH FROM DATE_TRUNC(\'{{ date_part }}\', {{ args[2] }}) - DATE_TRUNC(\'{{ date_part }}\', {{ args[1] }})) / EXTRACT(EPOCH FROM \'1 {{ date_part }}\'::interval) END::bigint';
         templates.expressions.interval = 'INTERVAL \'{{ interval }}\'';

package/dist/src/adapter/PostgresQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"PostgresQuery.js","sourceRoot":"","sources":["../../../src/adapter/PostgresQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PostgresQuery.js","sourceRoot":"","sources":["../../../src/adapter/PostgresQuery.ts"],"names":[],"mappings":";;;AAAA,mDAA0D;AAC1D,2CAAwC;AACxC,qDAAkD;AAElD,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,sBAAuB,SAAQ,+BAAc;IAC1C,gBAAgB,CAAC,UAAU;QAChC,OAAO,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;IAC9B,CAAC;CACF;AAED,MAAa,aAAc,SAAQ,qBAAS;IACnC,iBAAiB,CAAC,gBAAgB;QACvC,OAAO,IAAI,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;IACtD,CAAC;IAEM,SAAS,CAAC,KAAa;QAC5B,OAAO,IAAI,KAAK,+BAA+B,IAAI,CAAC,QAAQ,IAAI,CAAC;IACnE,CAAC;IAEM,iBAAiB,CAAC,WAAmB,EAAE,SAAiB;QAC7D,OAAO,eAAe,uBAAuB,CAAC,WAAW,CAAC,MAAM,SAAS,GAAG,CAAC;IAC/E,CAAC;IAED;;;;;OAKG;IACI,OAAO,CAAC,QAAgB,EAAE,MAAc,EAAE,MAAc;QAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAClD,OAAO,KAAK,MAAM,2BAA2B,WAAW;;8BAE9B,MAAM,OAAO,MAAM;sCACX,WAAW;SACxC,CAAC;IACR,CAAC;IAEe,cAAc,CAAC,QAAgB;QAC7C,MAAM,MAAM,GAAG,IAAA,yBAAgB,EAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC;YACxD,OAAO,MAAM,CAAC,OAAO,CAAC;SACvB;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;aACtC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;aACnE,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,OAAO,IAAI,UAAU,GAAG,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,GAAG;QAChB,OAAO,4BAA4B,GAAG,IAAI,CAAC;IAC7C,CAAC;IAEM,QAAQ,CAAC,GAAG;QACjB,OAAO,uCAAuC,GAAG,KAAK,CAAC;IACzD,CAAC;IAEM,mBAAmB,CAAC,GAAG;QAC5B,OAAO,kDAAkD,GAAG,MAAM,CAAC;IACrE,CAAC;IAEM,iCAAiC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,YAAY;QACjB,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;QACvC,uDAAuD;QACvD,SAAS,CAAC,MAAM,CAAC,KAAK,GAAG,wBAAwB,CAAC;QAClD,SAAS,CAAC,SAAS,CAAC,SAAS,GAAG,+BAA+B,CAAC;QAChE,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,kGAAkG,CAAC;QAChI,SAAS,CAAC,SAAS,CAAC,QAAQ,GAAG,8BAA8B,CAAC;QAC9D,SAAS,CAAC,SAAS,CAAC,WAAW,GAAG,cAAc,CAAC;QACjD,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,0BAA0B,CAAC;QACvD,SAAS,CAAC,SAAS,CAAC,QAAQ,GAAG,6BAA6B,CAAC;QAC7D,SAAS,CAAC,SAAS,CAAC,GAAG,GAAG,wBAAwB,CAAC;QACnD,SAAS,CAAC,SAAS,CAAC,YAAY,GAAG,8BAA8B,CAAC;QAClE,yCAAyC;QACzC,SAAS,CAAC,SAAS,CAAC,QAAQ,GAAG,gEAAgE,CAAC;QAChG,4CAA4C;QAC5C,SAAS,CAAC,SAAS,CAAC,QAAQ,GAAG,8mBAA8mB,CAAC;QAC9oB,SAAS,CAAC,WAAW,CAAC,QAAQ,GAAG,6BAA6B,CAAC;QAC/D,SAAS,CAAC,WAAW,CAAC,OAAO,GAAG,0CAA0C,CAAC;QAC3E,SAAS,CAAC,WAAW,CAAC,iBAAiB,GAAG,6BAA6B,CAAC;QACxE,SAAS,CAAC,kBAAkB,CAAC,MAAM,GAAG,QAAQ,CAAC;QAC/C,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;QAChC,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,UAAU,CAAC;QACrC,SAAS,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC;QAC/B,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,kBAAkB,CAAC;QAC5C,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC;QACjC,SAAS,CAAC,SAAS,CAAC,oBAAoB,GAAG,sBAAsB,CAAC;QAClE,SAAS,CAAC,UAAU,CAAC,4BAA4B,GAAG,0CAA0C;YAC5F,+BAA+B;YAC/B,qGAAqG,CAAC;QACxG,SAAS,CAAC,UAAU,CAAC,2CAA2C,GAAG,4BAA4B;YAC7F,6EAA6E;YAC7E,wJAAwJ,CAAC;QAC3J,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA9FD,sCA8FC"}

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

@@ -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;IAmEZ,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAI9B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAGtC"}
+{"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;IAqEZ,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAI9B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAGtC"}

package/dist/src/adapter/PrestodbQuery.js

@@ -138,6 +138,8 @@ class PrestodbQuery extends BaseQuery_1.BaseQuery {
         templates.functions.DATETRUNC = 'DATE_TRUNC({{ args_concat }})';
         templates.functions.DATEPART = 'DATE_PART({{ args_concat }})';
         templates.functions.DATEDIFF = 'DATE_DIFF(\'{{ date_part }}\', {{ args[1] }}, {{ args[2] }})';
+        // DATEADD is being rewritten to DATE_ADD
+        templates.functions.DATE_ADD = 'DATE_ADD(\'{{ date_part }}\', {{ interval }}, {{ args[0] }})';
         templates.functions.CURRENTDATE = 'CURRENT_DATE';
         templates.functions.UTCTIMESTAMP = 'CAST(NOW() AT TIME ZONE \'UTC\' AS TIMESTAMP)';
         templates.functions.TRUNC = 'TRUNCATE({{ args_concat }})';

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"RedshiftQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/RedshiftQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,qBAAa,aAAc,SAAQ,aAAa;IACvC,SAAS,CAAC,aAAa,KAAA;IAOvB,eAAe;IAItB;;;OAGG;IACa,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWxE;;;OAGG;IACa,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWnE;;;OAGG;IACa,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAkC1E,YAAY;CAwBpB"}
+{"version":3,"file":"RedshiftQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/RedshiftQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,qBAAa,aAAc,SAAQ,aAAa;IACvC,SAAS,CAAC,aAAa,KAAA;IAOvB,eAAe;IAItB;;;OAGG;IACa,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWxE;;;OAGG;IACa,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAWnE;;;OAGG;IACa,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAkC1E,YAAY;CA0BpB"}

package/dist/src/adapter/RedshiftQuery.js

@@ -72,6 +72,8 @@ class RedshiftQuery extends PostgresQuery_1.PostgresQuery {
         // nodes, unlike NOW(), which is a leader node–only function.
         templates.functions.UTCTIMESTAMP = 'GETDATE()';
         templates.functions.DATEDIFF = 'DATEDIFF({{ date_part }}, {{ args[1] }}, {{ args[2] }})';
+        // DATEADD is being rewritten to DATE_ADD
+        templates.functions.DATE_ADD = 'DATEADD({{ date_part }}, {{ interval }}, {{ args[0] }})';
         templates.functions.STRING_AGG = 'LISTAGG({% if distinct %}DISTINCT {% endif %}{{ args_concat }})';
         templates.statements.time_series_select = 'SELECT dates.f::timestamp date_from, dates.t::timestamp date_to \n' +
             'FROM (\n' +

package/dist/src/adapter/RedshiftQuery.js.map

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

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

package/dist/src/adapter/SnowflakeQuery.js

@@ -101,6 +101,8 @@ class SnowflakeQuery extends BaseQuery_1.BaseQuery {
         templates.functions.CHARACTERLENGTH = 'LENGTH({{ args[0] }})';
         templates.functions.BTRIM = 'TRIM({{ args_concat }})';
         templates.functions.STRING_AGG = 'LISTAGG({% if distinct %}DISTINCT {% endif %}{{ args_concat }})';
+        // DATEADD is being rewritten to DATE_ADD
+        templates.functions.DATE_ADD = 'DATEADD({{ date_part }}, {{ interval }}, {{ args[0] }})';
         templates.expressions.extract = 'EXTRACT({{ date_part }} FROM {{ expr }})';
         // Snowflake `/` is decimal division even for integer operands (output scale
         // is dividend scale + 6), while this template must keep PostgreSQL integer

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":"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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.23",
+  "version": "1.7.25",
   "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.23",
-    "@cubejs-backend/shared": "1.7.23",
+    "@cubejs-backend/native": "1.7.25",
+    "@cubejs-backend/shared": "1.7.25",
     "antlr4": "^4.13.2",
     "camelcase": "^6.2.0",
     "cron-parser": "^4.9.0",
@@ -60,9 +60,9 @@
   },
   "devDependencies": {
     "@clickhouse/client": "^1.12.0",
-    "@cubejs-backend/linter": "1.7.23",
-    "@cubejs-backend/mssql-driver": "1.7.23",
-    "@cubejs-backend/query-orchestrator": "1.7.23",
+    "@cubejs-backend/linter": "1.7.25",
+    "@cubejs-backend/mssql-driver": "1.7.25",
+    "@cubejs-backend/query-orchestrator": "1.7.25",
     "@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": "8b6e94c38c0d3abba0f12988026e721e025e3031"
+  "gitHead": "bad33e7d9cd9a093144683cbc8cce18f0e0eb125"
 }