@cubejs-backend/schema-compiler 0.24.0 → 0.24.1

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.24.1](https://github.com/cube-js/cube.js/compare/v0.24.0...v0.24.1) (2020-11-27)
+
+
+### Bug Fixes
+
+* Specifying `dateRange` in time dimension should produce same result as `inDateRange` in filter ([a7603d7](https://github.com/cube-js/cube.js/commit/a7603d724732a51301227f68c39ba699333c0e06)), closes [#962](https://github.com/cube-js/cube.js/issues/962)
+
+
+
+
+
 # [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
 
 

package/adapter/BaseFilter.js

@@ -132,7 +132,14 @@ class BaseFilter extends BaseDimension {
   }
 
   allocateTimestampParams() {
-    return this.filterParams().map(p => this.allocateTimestampParam(p));
+    return this.filterParams().map((p, i) => {
+      if (i > 1) {
+        throw new Error(`Expected only 2 parameters for timestamp filter but got: ${this.filterParams()}`);
+      }
+      return this.allocateTimestampParam(
+        i === 0 ? this.inDbTimeZoneDateFrom(p) : this.inDbTimeZoneDateTo(p)
+      );
+    });
   }
 
   allParamsRepeat(basePart) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/schema-compiler",
   "description": "Cube.js schema compiler",
   "author": "Cube Dev, Inc.",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.js.git",
@@ -62,5 +62,5 @@
     "uuid": "^3.3.2"
   },
   "license": "Apache-2.0",
-  "gitHead": "04d0fe148181b6e19cdfe53ef9f9cebc3b3ba766"
+  "gitHead": "0479050307f08ca69f4fdaee2d08d3e4f39453e6"
 }

package/test/integration/postgres/PreAggregationsTest.js

@@ -138,6 +138,14 @@ describe('PreAggregations', function test() {
           granularity: 'hour',
           partitionGranularity: 'hour'
         },
+        partitionedHourlyForRange: {
+          type: 'rollup',
+          measureReferences: [checkinsTotal],
+          dimensionReferences: [source, createdAt],
+          timeDimensionReference: createdAt,
+          granularity: 'hour',
+          partitionGranularity: 'hour'
+        },
         ratio: {
           type: 'rollup',
           measureReferences: [checkinsTotal, uniqueSourceCount],
@@ -795,6 +803,54 @@ describe('PreAggregations', function test() {
     });
   }));
 
+  it('partitioned inDateRange', () => compiler.compile().then(() => {
+    const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
+      measures: [
+        'visitors.checkinsTotal'
+      ],
+      dimensions: [
+        'visitors.source'
+      ],
+      timezone: 'America/Los_Angeles',
+      preAggregationsSchema: '',
+      filters: [{
+        member: 'visitors.createdAt',
+        operator: 'inDateRange',
+        values: ['2016-12-30', '2017-01-05']
+      }],
+      order: [{
+        id: 'visitors.checkinsTotal'
+      }],
+    });
+
+    const queryAndParams = query.buildSqlAndParams();
+    console.log(queryAndParams);
+    const preAggregationsDescription = query.preAggregations.preAggregationsDescription();
+    console.log(JSON.stringify(preAggregationsDescription, null, 2));
+
+    const queries = tempTablePreAggregations(preAggregationsDescription);
+
+    console.log(JSON.stringify(queries.concat(queryAndParams)));
+
+    return dbRunner.testQueries(
+      queries.concat([queryAndParams]).map(q => replaceTableName(q, preAggregationsDescription, 12342))
+    ).then(res => {
+      console.log(JSON.stringify(res));
+      res.should.be.deepEqual(
+        [
+          {
+            'visitors__source': 'google',
+            'visitors__checkins_total': '1'
+          },
+          {
+            'visitors__source': 'some',
+            'visitors__checkins_total': '5'
+          }
+        ]
+      );
+    });
+  }));
+
   it('partitioned hourly', () => compiler.compile().then(() => {
     const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
       measures: [