@cubejs-backend/schema-compiler - npm Package Compare versions

Comparing version 0.10.16 to 0.10.17

adapter/BaseQuery.js

@@ -1197,3 +1197,3 @@ /* eslint-disable no-unused-vars,prefer-template */
   aliasName(name) {
-    return inflection.underscore(name).replace(/\./g, '_');
+    return inflection.underscore(name).replace(/\./g, '__');
   }
@@ -1200,0 +1200,0 @@

CHANGELOG.md

@@ -6,2 +6,14 @@ # Change Log
 
+## [0.10.17](https://github.com/statsbotco/cubejs-client/compare/v0.10.16...v0.10.17) (2019-07-31)
+
+
+### Bug Fixes
+
+* BigQuery external rollup compatibility: use `__` separator for member aliases. Fix all tests. ([723359c](https://github.com/statsbotco/cubejs-client/commit/723359c))
+* Moved joi dependency to it's new availability ([#171](https://github.com/statsbotco/cubejs-client/issues/171)) ([1c20838](https://github.com/statsbotco/cubejs-client/commit/1c20838))
+
+
+
+
+
 ## [0.10.16](https://github.com/statsbotco/cubejs-client/compare/v0.10.15...v0.10.16) (2019-07-20)
@@ -8,0 +20,0 @@

compiler/CubeValidator.js

@@ -1,2 +0,2 @@
-const Joi = require('joi');
+const Joi = require('@hapi/joi');
 
@@ -3,0 +3,0 @@ const identifierRegex = /^[_a-zA-Z][_a-zA-Z0-9]*$/;

compiler/DashboardTemplateEvaluator.js

@@ -1,2 +0,2 @@
-const Joi = require('joi');
+const Joi = require('@hapi/joi');
 const inlection = require('inflection');
@@ -3,0 +3,0 @@ const humps = require('humps');

package.json

@@ -5,3 +5,3 @@ {
   "author": "Statsbot, Inc.",
-  "version": "0.10.16",
+  "version": "0.10.17",
   "engines": {
@@ -15,2 +15,3 @@ "node": ">=8.11.1"
   "dependencies": {
+    "@hapi/joi": "^14.3.1",
     "babel-generator": "^6.25.0",
@@ -22,3 +23,2 @@ "babel-traverse": "^6.25.0",
     "inflection": "^1.12.0",
-    "joi": "^14.3.1",
     "moment-range": "^4.0.1",
@@ -46,3 +46,3 @@ "moment-timezone": "^0.5.13",
   "license": "Apache-2.0",
-  "gitHead": "993b8eaf27d17e8d319d26c588490764936ef5fd"
+  "gitHead": "8f4bc9319297f7de13a85e00af8f5617cc04cb65"
 }

test/AsyncModuleTest.js

@@ -0,1 +1,2 @@
+/* eslint-disable quote-props */
 /* globals describe, it */
@@ -58,3 +59,3 @@ const PostgresQuery = require('../adapter/PostgresQuery');
           [
-            { "visitors.visitor_count": "6" }
+            { "visitors__visitor_count": "6" }
           ]
@@ -61,0 +62,0 @@ );

test/ClickHouseDataSchemaCompilerTest.js

@@ -0,1 +1,2 @@
+/* eslint-disable quote-props */
 /* globals describe, before, after, it */
@@ -171,6 +172,6 @@ const CompileError = require('../compiler/CompileError');
           [
-            { "visitors.created_at_date": "2017-01-02T00:00:00.000", "visitors.visitor_count": "1" },
-            { "visitors.created_at_date": "2017-01-04T00:00:00.000", "visitors.visitor_count": "1" },
-            { "visitors.created_at_date": "2017-01-05T00:00:00.000", "visitors.visitor_count": "1" },
-            { "visitors.created_at_date": "2017-01-06T00:00:00.000", "visitors.visitor_count": "2" }
+            { "visitors__created_at_date": "2017-01-02T00:00:00.000", "visitors__visitor_count": "1" },
+            { "visitors__created_at_date": "2017-01-04T00:00:00.000", "visitors__visitor_count": "1" },
+            { "visitors__created_at_date": "2017-01-05T00:00:00.000", "visitors__visitor_count": "1" },
+            { "visitors__created_at_date": "2017-01-06T00:00:00.000", "visitors__visitor_count": "2" }
           ]
@@ -234,4 +235,4 @@ );
           [
-            { "visitors.status": "Approved", "visitors.visitor_count": "2" },
-            { "visitors.status": "Canceled", "visitors.visitor_count": "4" }
+            { "visitors__status": "Approved", "visitors__visitor_count": "2" },
+            { "visitors__status": "Canceled", "visitors__visitor_count": "4" }
           ]
@@ -269,17 +270,17 @@ );
       const responses = [
-        [{ 'visitors.created_at': '2017-01-02T16:00:00.000' }],
+        [{ "visitors__created_at": '2017-01-02T16:00:00.000' }],
         [
-          { 'visitors.created_at': '2016-09-06T16:00:00.000' },
-          { 'visitors.created_at': '2017-01-04T16:00:00.000' },
-          { 'visitors.created_at': '2017-01-05T16:00:00.000' },
-          { 'visitors.created_at': '2017-01-06T16:00:00.000' }
+          { "visitors__created_at": '2016-09-06T16:00:00.000' },
+          { "visitors__created_at": '2017-01-04T16:00:00.000' },
+          { "visitors__created_at": '2017-01-05T16:00:00.000' },
+          { "visitors__created_at": '2017-01-06T16:00:00.000' }
         ],
-        [{ 'visitors.created_at': '2017-01-06T16:00:00.000' }],
+        [{ "visitors__created_at": '2017-01-06T16:00:00.000' }],
         [
-          { 'visitors.created_at': '2016-09-06T16:00:00.000' },
-          { 'visitors.created_at': '2017-01-02T16:00:00.000' },
-          { 'visitors.created_at': '2017-01-04T16:00:00.000' },
-          { 'visitors.created_at': '2017-01-05T16:00:00.000' }
+          { "visitors__created_at": '2016-09-06T16:00:00.000' },
+          { "visitors__created_at": '2017-01-02T16:00:00.000' },
+          { "visitors__created_at": '2017-01-04T16:00:00.000' },
+          { "visitors__created_at": '2017-01-05T16:00:00.000' }
         ],
-        [{ 'visitors.created_at': '2017-01-06T16:00:00.000' }]
+        [{ "visitors__created_at": '2017-01-06T16:00:00.000' }]
       ];
@@ -286,0 +287,0 @@ ['in_date_range', 'not_in_date_range', 'on_the_date', 'before_date', 'after_date'].map((operator, index) => {

test/ClickHouseGraphBuilderTest.js

@@ -0,1 +1,2 @@
+/* eslint-disable quote-props */
 /* globals describe, after, it */
@@ -321,28 +322,28 @@ const UserError = require('../compiler/UserError');
             {
-              "visitors.created_at_date": "2017-01-02T00:00:00.000Z",
-              "visitors.visitor_revenue": "100",
-              "visitors.visitor_count": "1",
-              "visitor_checkins.visitor_checkins_count": "3",
-              "visitors.per_visitor_revenue": "100"
+              "visitors__created_at_date": "2017-01-02T00:00:00.000Z",
+              "visitors__visitor_revenue": "100",
+              "visitors__visitor_count": "1",
+              "visitor_checkins__visitor_checkins_count": "3",
+              "visitors__per_visitor_revenue": "100"
             },
             {
-              "visitors.created_at_date": "2017-01-04T00:00:00.000Z",
-              "visitors.visitor_revenue": "200",
-              "visitors.visitor_count": "1",
-              "visitor_checkins.visitor_checkins_count": "2",
-              "visitors.per_visitor_revenue": "200"
+              "visitors__created_at_date": "2017-01-04T00:00:00.000Z",
+              "visitors__visitor_revenue": "200",
+              "visitors__visitor_count": "1",
+              "visitor_checkins__visitor_checkins_count": "2",
+              "visitors__per_visitor_revenue": "200"
             },
             {
-              "visitors.created_at_date": "2017-01-05T00:00:00.000Z",
-              "visitors.visitor_revenue": null,
-              "visitors.visitor_count": "1",
-              "visitor_checkins.visitor_checkins_count": "1",
-              "visitors.per_visitor_revenue": null
+              "visitors__created_at_date": "2017-01-05T00:00:00.000Z",
+              "visitors__visitor_revenue": null,
+              "visitors__visitor_count": "1",
+              "visitor_checkins__visitor_checkins_count": "1",
+              "visitors__per_visitor_revenue": null
             },
             {
-              "visitors.created_at_date": "2017-01-06T00:00:00.000Z",
-              "visitors.visitor_revenue": null,
-              "visitors.visitor_count": "2",
-              "visitor_checkins.visitor_checkins_count": "0",
-              "visitors.per_visitor_revenue": null
+              "visitors__created_at_date": "2017-01-06T00:00:00.000Z",
+              "visitors__visitor_revenue": null,
+              "visitors__visitor_count": "2",
+              "visitor_checkins__visitor_checkins_count": "0",
+              "visitors__per_visitor_revenue": null
             }
@@ -372,6 +373,6 @@ ]
       }, [{
-        "visitors.visitor_revenue": "300",
-        "visitors.visitor_count": "5",
-        "visitor_checkins.visitor_checkins_count": "6",
-        "visitors.per_visitor_revenue": "60"
+        "visitors__visitor_revenue": "300",
+        "visitors__visitor_count": "5",
+        "visitor_checkins__visitor_checkins_count": "6",
+        "visitors__per_visitor_revenue": "60"
       }])
@@ -405,31 +406,31 @@ );
           [{
-            "visitors.created_at_date": "2017-01-01T00:00:00.000Z",
-            "visitors.revenue_running": null
+            "visitors__created_at_date": "2017-01-01T00:00:00.000Z",
+            "visitors__revenue_running": null
           }, {
-            "visitors.created_at_date": "2017-01-02T00:00:00.000Z",
-            "visitors.revenue_running": "100"
+            "visitors__created_at_date": "2017-01-02T00:00:00.000Z",
+            "visitors__revenue_running": "100"
           }, {
-            "visitors.created_at_date": "2017-01-03T00:00:00.000Z",
-            "visitors.revenue_running": "100"
+            "visitors__created_at_date": "2017-01-03T00:00:00.000Z",
+            "visitors__revenue_running": "100"
           }, {
-            "visitors.created_at_date": "2017-01-04T00:00:00.000Z",
-            "visitors.revenue_running": "300"
+            "visitors__created_at_date": "2017-01-04T00:00:00.000Z",
+            "visitors__revenue_running": "300"
           }, {
-            "visitors.created_at_date": "2017-01-05T00:00:00.000Z",
-            "visitors.revenue_running": "600"
+            "visitors__created_at_date": "2017-01-05T00:00:00.000Z",
+            "visitors__revenue_running": "600"
           }, {
-            "visitors.created_at_date": "2017-01-06T00:00:00.000Z",
-            "visitors.revenue_running": "1500"
+            "visitors__created_at_date": "2017-01-06T00:00:00.000Z",
+            "visitors__revenue_running": "1500"
           }, {
-            "visitors.created_at_date": "2017-01-07T00:00:00.000Z",
-            "visitors.revenue_running": "1500"
+            "visitors__created_at_date": "2017-01-07T00:00:00.000Z",
+            "visitors__revenue_running": "1500"
           }, {
-            "visitors.created_at_date": "2017-01-08T00:00:00.000Z",
-            "visitors.revenue_running": "1500"
+            "visitors__created_at_date": "2017-01-08T00:00:00.000Z",
+            "visitors__revenue_running": "1500"
           }, {
-            "visitors.created_at_date": "2017-01-09T00:00:00.000Z",
-            "visitors.revenue_running": "1500"
+            "visitors__created_at_date": "2017-01-09T00:00:00.000Z",
+            "visitors__revenue_running": "1500"
           }, {
-            "visitors.created_at_date": "2017-01-10T00:00:00.000Z",
-            "visitors.revenue_running": "1500"
+            "visitors__created_at_date": "2017-01-10T00:00:00.000Z",
+            "visitors__revenue_running": "1500"
           }]
@@ -459,12 +460,12 @@ );
       }, [
-        { "visitors.created_at_date": "2017-01-01T00:00:00.000Z", "visitors.revenue_rolling": null },
-        { "visitors.created_at_date": "2017-01-02T00:00:00.000Z", "visitors.revenue_rolling": null },
-        { "visitors.created_at_date": "2017-01-03T00:00:00.000Z", "visitors.revenue_rolling": "100" },
-        { "visitors.created_at_date": "2017-01-04T00:00:00.000Z", "visitors.revenue_rolling": "100" },
-        { "visitors.created_at_date": "2017-01-05T00:00:00.000Z", "visitors.revenue_rolling": "200" },
-        { "visitors.created_at_date": "2017-01-06T00:00:00.000Z", "visitors.revenue_rolling": "500" },
-        { "visitors.created_at_date": "2017-01-07T00:00:00.000Z", "visitors.revenue_rolling": "1200" },
-        { "visitors.created_at_date": "2017-01-08T00:00:00.000Z", "visitors.revenue_rolling": "900" },
-        { "visitors.created_at_date": "2017-01-09T00:00:00.000Z", "visitors.revenue_rolling": null },
-        { "visitors.created_at_date": "2017-01-10T00:00:00.000Z", "visitors.revenue_rolling": null }
+        { "visitors__created_at_date": "2017-01-01T00:00:00.000Z", "visitors__revenue_rolling": null },
+        { "visitors__created_at_date": "2017-01-02T00:00:00.000Z", "visitors__revenue_rolling": null },
+        { "visitors__created_at_date": "2017-01-03T00:00:00.000Z", "visitors__revenue_rolling": "100" },
+        { "visitors__created_at_date": "2017-01-04T00:00:00.000Z", "visitors__revenue_rolling": "100" },
+        { "visitors__created_at_date": "2017-01-05T00:00:00.000Z", "visitors__revenue_rolling": "200" },
+        { "visitors__created_at_date": "2017-01-06T00:00:00.000Z", "visitors__revenue_rolling": "500" },
+        { "visitors__created_at_date": "2017-01-07T00:00:00.000Z", "visitors__revenue_rolling": "1200" },
+        { "visitors__created_at_date": "2017-01-08T00:00:00.000Z", "visitors__revenue_rolling": "900" },
+        { "visitors__created_at_date": "2017-01-09T00:00:00.000Z", "visitors__revenue_rolling": null },
+        { "visitors__created_at_date": "2017-01-10T00:00:00.000Z", "visitors__revenue_rolling": null }
       ])
@@ -491,15 +492,15 @@ );
       {
-        "visitors.created_at_date": "2017-01-02T00:00:00.000Z", "visitors.revenue_rolling": null,
-        "visitor_checkins.visitor_checkins_count": "3"
+        "visitors__created_at_date": "2017-01-02T00:00:00.000Z", "visitors__revenue_rolling": null,
+        "visitor_checkins__visitor_checkins_count": "3"
       },
       {
-        "visitors.created_at_date": "2017-01-04T00:00:00.000Z", "visitors.revenue_rolling": "100",
+        "visitors__created_at_date": "2017-01-04T00:00:00.000Z", "visitors__revenue_rolling": "100",
         'visitor_checkins.visitor_checkins_count': '2'
       },
       {
-        "visitors.created_at_date": "2017-01-05T00:00:00.000Z", "visitors.revenue_rolling": "200",
+        "visitors__created_at_date": "2017-01-05T00:00:00.000Z", "visitors__revenue_rolling": "200",
         'visitor_checkins.visitor_checkins_count': '1'
       },
       {
-        "visitors.created_at_date": "2017-01-06T00:00:00.000Z", "visitors.revenue_rolling": "500",
+        "visitors__created_at_date": "2017-01-06T00:00:00.000Z", "visitors__revenue_rolling": "500",
         'visitor_checkins.visitor_checkins_count': '0'
@@ -526,3 +527,3 @@ }
     }, [
-      { "visitors.created_at_week": "2017-01-09T00:00:00.000Z", "visitors.revenue_rolling3day": "900" }
+      { "visitors__created_at_week": "2017-01-09T00:00:00.000Z", "visitors__revenue_rolling3day": "900" }
     ])
@@ -547,12 +548,12 @@ );
     }, [
-      { "visitors.created_at_date": "2017-01-01T00:00:00.000Z", "visitors.count_rolling": null },
-      { "visitors.created_at_date": "2017-01-02T00:00:00.000Z", "visitors.count_rolling": null },
-      { "visitors.created_at_date": "2017-01-03T00:00:00.000Z", "visitors.count_rolling": "1" },
-      { "visitors.created_at_date": "2017-01-04T00:00:00.000Z", "visitors.count_rolling": "1" },
-      { "visitors.created_at_date": "2017-01-05T00:00:00.000Z", "visitors.count_rolling": "1" },
-      { "visitors.created_at_date": "2017-01-06T00:00:00.000Z", "visitors.count_rolling": "2" },
-      { "visitors.created_at_date": "2017-01-07T00:00:00.000Z", "visitors.count_rolling": "3" },
-      { "visitors.created_at_date": "2017-01-08T00:00:00.000Z", "visitors.count_rolling": "2" },
-      { "visitors.created_at_date": "2017-01-09T00:00:00.000Z", "visitors.count_rolling": null },
-      { "visitors.created_at_date": "2017-01-10T00:00:00.000Z", "visitors.count_rolling": null }
+      { "visitors__created_at_date": "2017-01-01T00:00:00.000Z", "visitors__count_rolling": null },
+      { "visitors__created_at_date": "2017-01-02T00:00:00.000Z", "visitors__count_rolling": null },
+      { "visitors__created_at_date": "2017-01-03T00:00:00.000Z", "visitors__count_rolling": "1" },
+      { "visitors__created_at_date": "2017-01-04T00:00:00.000Z", "visitors__count_rolling": "1" },
+      { "visitors__created_at_date": "2017-01-05T00:00:00.000Z", "visitors__count_rolling": "1" },
+      { "visitors__created_at_date": "2017-01-06T00:00:00.000Z", "visitors__count_rolling": "2" },
+      { "visitors__created_at_date": "2017-01-07T00:00:00.000Z", "visitors__count_rolling": "3" },
+      { "visitors__created_at_date": "2017-01-08T00:00:00.000Z", "visitors__count_rolling": "2" },
+      { "visitors__created_at_date": "2017-01-09T00:00:00.000Z", "visitors__count_rolling": null },
+      { "visitors__created_at_date": "2017-01-10T00:00:00.000Z", "visitors__count_rolling": null }
     ])
@@ -576,6 +577,6 @@ );
     }, [
-      {"visitors.created_at_sql_utils_date":"2017-01-02T00:00:00.000","visitors.visitor_count":"1"},
-      {"visitors.created_at_sql_utils_date":"2017-01-04T00:00:00.000","visitors.visitor_count":"1"},
-      {"visitors.created_at_sql_utils_date":"2017-01-05T00:00:00.000","visitors.visitor_count":"1"},
-      {"visitors.created_at_sql_utils_date":"2017-01-06T00:00:00.000","visitors.visitor_count":"2"}
+      {"visitors__created_at_sql_utils_date":"2017-01-02T00:00:00.000","visitors__visitor_count":"1"},
+      {"visitors__created_at_sql_utils_date":"2017-01-04T00:00:00.000","visitors__visitor_count":"1"},
+      {"visitors__created_at_sql_utils_date":"2017-01-05T00:00:00.000","visitors__visitor_count":"1"},
+      {"visitors__created_at_sql_utils_date":"2017-01-06T00:00:00.000","visitors__visitor_count":"2"}
     ])
@@ -599,3 +600,3 @@ );
         {
-          "visitors.revenue_running": "1500"
+          "visitors__revenue_running": "1500"
         }
@@ -621,12 +622,12 @@ ])
       }, [
-        { "visitors.created_at_date": "2017-01-01T00:00:00.000Z", "visitors.running_revenue_per_count": null },
-        { "visitors.created_at_date": "2017-01-02T00:00:00.000Z", "visitors.running_revenue_per_count": "100" },
-        { "visitors.created_at_date": "2017-01-03T00:00:00.000Z", "visitors.running_revenue_per_count": "100" },
-        { "visitors.created_at_date": "2017-01-04T00:00:00.000Z", "visitors.running_revenue_per_count": "150" },
-        { "visitors.created_at_date": "2017-01-05T00:00:00.000Z", "visitors.running_revenue_per_count": "200" },
-        { "visitors.created_at_date": "2017-01-06T00:00:00.000Z", "visitors.running_revenue_per_count": "300" },
-        { "visitors.created_at_date": "2017-01-07T00:00:00.000Z", "visitors.running_revenue_per_count": "300" },
-        { "visitors.created_at_date": "2017-01-08T00:00:00.000Z", "visitors.running_revenue_per_count": "300" },
-        { "visitors.created_at_date": "2017-01-09T00:00:00.000Z", "visitors.running_revenue_per_count": "300" },
-        { "visitors.created_at_date": "2017-01-10T00:00:00.000Z", "visitors.running_revenue_per_count": "300" }
+        { "visitors__created_at_date": "2017-01-01T00:00:00.000Z", "visitors__running_revenue_per_count": null },
+        { "visitors__created_at_date": "2017-01-02T00:00:00.000Z", "visitors__running_revenue_per_count": "100" },
+        { "visitors__created_at_date": "2017-01-03T00:00:00.000Z", "visitors__running_revenue_per_count": "100" },
+        { "visitors__created_at_date": "2017-01-04T00:00:00.000Z", "visitors__running_revenue_per_count": "150" },
+        { "visitors__created_at_date": "2017-01-05T00:00:00.000Z", "visitors__running_revenue_per_count": "200" },
+        { "visitors__created_at_date": "2017-01-06T00:00:00.000Z", "visitors__running_revenue_per_count": "300" },
+        { "visitors__created_at_date": "2017-01-07T00:00:00.000Z", "visitors__running_revenue_per_count": "300" },
+        { "visitors__created_at_date": "2017-01-08T00:00:00.000Z", "visitors__running_revenue_per_count": "300" },
+        { "visitors__created_at_date": "2017-01-09T00:00:00.000Z", "visitors__running_revenue_per_count": "300" },
+        { "visitors__created_at_date": "2017-01-10T00:00:00.000Z", "visitors__running_revenue_per_count": "300" }
       ])
@@ -677,3 +678,3 @@ );
         res.should.be.deepEqual(
-          [{ "visitor_checkins.revenue_per_checkin": "50" }]
+          [{ "visitor_checkins__revenue_per_checkin": "50" }]
         );
@@ -701,3 +702,3 @@ });
         res.should.be.deepEqual(
-          [{ "visitor_checkins.google_sourced_checkins": "1" }]
+          [{ "visitor_checkins__google_sourced_checkins": "1" }]
         );
@@ -728,3 +729,3 @@ });
         res.should.be.deepEqual(
-          [{ "visitor_checkins.google_sourced_checkins": "1" }]
+          [{ "visitor_checkins__google_sourced_checkins": "1" }]
         );
@@ -764,7 +765,7 @@ });
           [{
-            "visitors.source": "some",
-            "visitors.visitor_count": "2"
+            "visitors__source": "some",
+            "visitors__visitor_count": "2"
           },{
-            "visitors.source": null,
-            "visitors.visitor_count": "3"
+            "visitors__source": null,
+            "visitors__visitor_count": "3"
           }]
@@ -802,6 +803,6 @@ );
             {
-              "visitors.source": "some"
+              "visitors__source": "some"
             },
             {
-              "visitors.source": null
+              "visitors__source": null
             },
@@ -840,3 +841,3 @@ ]
             [{
-              "visitors.source": "some"
+              "visitors__source": "some"
             }]
@@ -877,3 +878,3 @@ );
             [{
-              "visitors.source": "some"
+              "visitors__source": "some"
             }]
@@ -912,17 +913,17 @@ );
           [{
-            "visitors.checkins": "0",
-            "visitors.created_at_date": "2017-01-06T00:00:00.000",
-            "visitors.visitor_count": "2"
+            "visitors__checkins": "0",
+            "visitors__created_at_date": "2017-01-06T00:00:00.000",
+            "visitors__visitor_count": "2"
           }, {
-            "visitors.checkins": "1",
-            "visitors.created_at_date": "2017-01-05T00:00:00.000",
-            "visitors.visitor_count": "1"
+            "visitors__checkins": "1",
+            "visitors__created_at_date": "2017-01-05T00:00:00.000",
+            "visitors__visitor_count": "1"
           }, {
-            "visitors.checkins": "2",
-            "visitors.created_at_date": "2017-01-04T00:00:00.000",
-            "visitors.visitor_count": "1"
+            "visitors__checkins": "2",
+            "visitors__created_at_date": "2017-01-04T00:00:00.000",
+            "visitors__visitor_count": "1"
           }, {
-            "visitors.checkins": "3",
-            "visitors.created_at_date": "2017-01-02T00:00:00.000",
-            "visitors.visitor_count": "1"
+            "visitors__checkins": "3",
+            "visitors__created_at_date": "2017-01-02T00:00:00.000",
+            "visitors__visitor_count": "1"
           }]
@@ -966,3 +967,3 @@ );
         res.should.be.deepEqual(
-          [{ "visitors.created_at_date": "2017-01-02T00:00:00.000Z", "visitors.average_checkins": "6.0000000000000000" }]
+          [{ "visitors__created_at_date": "2017-01-02T00:00:00.000Z", "visitors__average_checkins": "6__0000000000000000" }]
         );
@@ -1006,12 +1007,12 @@ });
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-02T00:00:00.000Z",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-02T00:00:00.000Z",
+        "visitors__visitor_count": "1"
       },
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-04T00:00:00.000Z",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-04T00:00:00.000Z",
+        "visitors__visitor_count": "1"
       },
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-05T00:00:00.000Z",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-05T00:00:00.000Z",
+        "visitors__visitor_count": "1"
       }
@@ -1041,12 +1042,12 @@ ]).then(() => {
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-02T00:00:00.000",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-02T00:00:00.000",
+        "visitors__visitor_count": "1"
       },
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-04T00:00:00.000",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-04T00:00:00.000",
+        "visitors__visitor_count": "1"
       },
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-05T00:00:00.000",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-05T00:00:00.000",
+        "visitors__visitor_count": "1"
       }
@@ -1087,12 +1088,12 @@ ])
         {
-          "visitor_checkins.cards_count": "0",
-          "visitors.visitor_revenue": "300"
+          "visitor_checkins__cards_count": "0",
+          "visitors__visitor_revenue": "300"
         },
         {
-          "visitor_checkins.cards_count": "1",
-          "visitors.visitor_revenue": "100"
+          "visitor_checkins__cards_count": "1",
+          "visitors__visitor_revenue": "100"
         },
         {
-          "visitor_checkins.cards_count": null,
-          "visitors.visitor_revenue": null
+          "visitor_checkins__cards_count": null,
+          "visitors__visitor_revenue": null
         }
@@ -1144,5 +1145,5 @@ ])
             {
-              "visitor_checkins.source": "google",
-              "visitors.created_at_date": "2017-01-02T00:00:00.000Z",
-              "visitors.per_visitor_revenue": "100"
+              "visitor_checkins__source": "google",
+              "visitors__created_at_date": "2017-01-02T00:00:00.000Z",
+              "visitors__per_visitor_revenue": "100"
             }
@@ -1192,3 +1193,3 @@ ]
             {
-              "visitors.visitor_revenue": "100"
+              "visitors__visitor_revenue": "100"
             }
@@ -1219,3 +1220,3 @@ ]
         res.should.be.deepEqual(
-          [{ "visitor_checkins.revenue_per_checkin": "60" }]
+          [{ "visitor_checkins__revenue_per_checkin": "60" }]
         );
@@ -1245,3 +1246,3 @@ });
       res.should.be.deepEqual(
-        [{ "visitor_checkins.revenue_per_checkin": "50" }]
+        [{ "visitor_checkins__revenue_per_checkin": "50" }]
       );
@@ -1262,3 +1263,3 @@ });
       }],
-    }, [{ "reference_visitors.count": "1" }])
+    }, [{ "reference_visitors__count": "1" }])
   );
@@ -1277,3 +1278,3 @@
       }],
-    }, [{"reference_visitors.google_sourced_count":"1"}])
+    }, [{"reference_visitors__google_sourced_count":"1"}])
   );
@@ -1290,7 +1291,7 @@
         // in ClickHouse float to string omits any trailing zeros after the decimal point
-        { 'visitors.location': '120.12,10.6' }, 
-        { 'visitors.location': '120.12,40.6' },
-        { 'visitors.location': '120.12,58.1' },
-        { 'visitors.location': '120.12,58.6' },
-        { 'visitors.location': '120.12,70.6' }
+        { "visitors__location": '120.12,10.6' },
+        { "visitors__location": '120.12,40.6' },
+        { "visitors__location": '120.12,58.1' },
+        { "visitors__location": '120.12,58.6' },
+        { "visitors__location": '120.12,70.6' }
     ])
@@ -1311,4 +1312,4 @@ );
     }, [
-      { 'visitors.id': '1' }, // all numbers are transformed to strings.  ClickHouse returns large number types as strings so we normalise that to all numbers as strings
-      { 'visitors.id': '2' }
+      { "visitors__id": '1' }, // all numbers are transformed to strings.  ClickHouse returns large number types as strings so we normalise that to all numbers as strings
+      { "visitors__id": '2' }
     ])
@@ -1335,3 +1336,3 @@ );
     }, [
-      { 'visitors.source': 'some' }
+      { "visitors__source": 'some' }
     ])
@@ -1356,8 +1357,8 @@ );
       {
-        "visitors.created_at_year": "2016-01-01T00:00:00.000",
-        "visitors.visitor_count": "1"
+        "visitors__created_at_year": "2016-01-01T00:00:00.000",
+        "visitors__visitor_count": "1"
       },
       {
-        "visitors.created_at_year": "2017-01-01T00:00:00.000",
-        "visitors.visitor_count": "5"
+        "visitors__created_at_year": "2017-01-01T00:00:00.000",
+        "visitors__visitor_count": "5"
       }
@@ -1364,0 +1365,0 @@ ])

test/DataSchemaCompilerTest.js

@@ -0,1 +1,2 @@
+/* eslint-disable quote-props */
 const CompileError = require('../compiler/CompileError');
@@ -158,6 +159,6 @@ const PostgresQuery = require('../adapter/PostgresQuery');
           [
-            { "visitors.created_at_date": "2017-01-02T00:00:00.000Z", "visitors.visitor_count": "1" },
-            { "visitors.created_at_date": "2017-01-04T00:00:00.000Z", "visitors.visitor_count": "1" },
-            { "visitors.created_at_date": "2017-01-05T00:00:00.000Z", "visitors.visitor_count": "1" },
-            { "visitors.created_at_date": "2017-01-06T00:00:00.000Z", "visitors.visitor_count": "2" }
+            { "visitors__created_at_date": "2017-01-02T00:00:00.000Z", "visitors__visitor_count": "1" },
+            { "visitors__created_at_date": "2017-01-04T00:00:00.000Z", "visitors__visitor_count": "1" },
+            { "visitors__created_at_date": "2017-01-05T00:00:00.000Z", "visitors__visitor_count": "1" },
+            { "visitors__created_at_date": "2017-01-06T00:00:00.000Z", "visitors__visitor_count": "2" }
           ]
@@ -221,4 +222,4 @@ );
           [
-            { "visitors.status": "Approved", "visitors.visitor_count": "2" },
-            { "visitors.status": "Canceled", "visitors.visitor_count": "4" }
+            { "visitors__status": "Approved", "visitors__visitor_count": "2" },
+            { "visitors__status": "Canceled", "visitors__visitor_count": "4" }
           ]
@@ -255,17 +256,17 @@ );
     const responses = [
-      [{ 'visitors.created_at': '2017-01-03T00:00:00.000Z' }],
+      [{ "visitors__created_at": '2017-01-03T00:00:00.000Z' }],
       [
-        { 'visitors.created_at': '2016-09-07T00:00:00.000Z' },
-        { 'visitors.created_at': '2017-01-05T00:00:00.000Z' },
-        { 'visitors.created_at': '2017-01-06T00:00:00.000Z' },
-        { 'visitors.created_at': '2017-01-07T00:00:00.000Z' }
+        { "visitors__created_at": '2016-09-07T00:00:00.000Z' },
+        { "visitors__created_at": '2017-01-05T00:00:00.000Z' },
+        { "visitors__created_at": '2017-01-06T00:00:00.000Z' },
+        { "visitors__created_at": '2017-01-07T00:00:00.000Z' }
       ],
-      [{ 'visitors.created_at': '2017-01-07T00:00:00.000Z' }],
+      [{ "visitors__created_at": '2017-01-07T00:00:00.000Z' }],
       [
-        { 'visitors.created_at': '2016-09-07T00:00:00.000Z' },
-        { 'visitors.created_at': '2017-01-03T00:00:00.000Z' },
-        { 'visitors.created_at': '2017-01-05T00:00:00.000Z' },
-        { 'visitors.created_at': '2017-01-06T00:00:00.000Z' }
+        { "visitors__created_at": '2016-09-07T00:00:00.000Z' },
+        { "visitors__created_at": '2017-01-03T00:00:00.000Z' },
+        { "visitors__created_at": '2017-01-05T00:00:00.000Z' },
+        { "visitors__created_at": '2017-01-06T00:00:00.000Z' }
       ],
-      [{ 'visitors.created_at': '2017-01-07T00:00:00.000Z' }]
+      [{ "visitors__created_at": '2017-01-07T00:00:00.000Z' }]
     ];
@@ -272,0 +273,0 @@ const result = compiler.compile().then(() => {

test/GraphBuilderTest.js

@@ -315,28 +315,28 @@ const CompileError = require('../compiler/CompileError');
             {
-              "visitors.created_at_date": "2017-01-02T00:00:00.000Z",
-              "visitors.visitor_revenue": "100",
-              "visitors.visitor_count": "1",
-              "visitor_checkins.visitor_checkins_count": "3",
-              "visitors.per_visitor_revenue": "100"
+              "visitors__created_at_date": "2017-01-02T00:00:00.000Z",
+              "visitors__visitor_revenue": "100",
+              "visitors__visitor_count": "1",
+              "visitor_checkins__visitor_checkins_count": "3",
+              "visitors__per_visitor_revenue": "100"
             },
             {
-              "visitors.created_at_date": "2017-01-04T00:00:00.000Z",
-              "visitors.visitor_revenue": "200",
-              "visitors.visitor_count": "1",
-              "visitor_checkins.visitor_checkins_count": "2",
-              "visitors.per_visitor_revenue": "200"
+              "visitors__created_at_date": "2017-01-04T00:00:00.000Z",
+              "visitors__visitor_revenue": "200",
+              "visitors__visitor_count": "1",
+              "visitor_checkins__visitor_checkins_count": "2",
+              "visitors__per_visitor_revenue": "200"
             },
             {
-              "visitors.created_at_date": "2017-01-05T00:00:00.000Z",
-              "visitors.visitor_revenue": null,
-              "visitors.visitor_count": "1",
-              "visitor_checkins.visitor_checkins_count": "1",
-              "visitors.per_visitor_revenue": null
+              "visitors__created_at_date": "2017-01-05T00:00:00.000Z",
+              "visitors__visitor_revenue": null,
+              "visitors__visitor_count": "1",
+              "visitor_checkins__visitor_checkins_count": "1",
+              "visitors__per_visitor_revenue": null
             },
             {
-              "visitors.created_at_date": "2017-01-06T00:00:00.000Z",
-              "visitors.visitor_revenue": null,
-              "visitors.visitor_count": "2",
-              "visitor_checkins.visitor_checkins_count": "0",
-              "visitors.per_visitor_revenue": null
+              "visitors__created_at_date": "2017-01-06T00:00:00.000Z",
+              "visitors__visitor_revenue": null,
+              "visitors__visitor_count": "2",
+              "visitor_checkins__visitor_checkins_count": "0",
+              "visitors__per_visitor_revenue": null
             }
@@ -366,6 +366,6 @@ ]
       }, [{
-        "visitors.visitor_revenue": "300",
-        "visitors.visitor_count": "5",
-        "visitor_checkins.visitor_checkins_count": "6",
-        "visitors.per_visitor_revenue": "60"
+        "visitors__visitor_revenue": "300",
+        "visitors__visitor_count": "5",
+        "visitor_checkins__visitor_checkins_count": "6",
+        "visitors__per_visitor_revenue": "60"
       }])
@@ -398,31 +398,31 @@ );
           [{
-            "visitors.created_at_date": "2017-01-01T00:00:00.000Z",
-            "visitors.revenue_running": null
+            "visitors__created_at_date": "2017-01-01T00:00:00.000Z",
+            "visitors__revenue_running": null
           }, {
-            "visitors.created_at_date": "2017-01-02T00:00:00.000Z",
-            "visitors.revenue_running": "100"
+            "visitors__created_at_date": "2017-01-02T00:00:00.000Z",
+            "visitors__revenue_running": "100"
           }, {
-            "visitors.created_at_date": "2017-01-03T00:00:00.000Z",
-            "visitors.revenue_running": "100"
+            "visitors__created_at_date": "2017-01-03T00:00:00.000Z",
+            "visitors__revenue_running": "100"
           }, {
-            "visitors.created_at_date": "2017-01-04T00:00:00.000Z",
-            "visitors.revenue_running": "300"
+            "visitors__created_at_date": "2017-01-04T00:00:00.000Z",
+            "visitors__revenue_running": "300"
           }, {
-            "visitors.created_at_date": "2017-01-05T00:00:00.000Z",
-            "visitors.revenue_running": "600"
+            "visitors__created_at_date": "2017-01-05T00:00:00.000Z",
+            "visitors__revenue_running": "600"
           }, {
-            "visitors.created_at_date": "2017-01-06T00:00:00.000Z",
-            "visitors.revenue_running": "1500"
+            "visitors__created_at_date": "2017-01-06T00:00:00.000Z",
+            "visitors__revenue_running": "1500"
           }, {
-            "visitors.created_at_date": "2017-01-07T00:00:00.000Z",
-            "visitors.revenue_running": "1500"
+            "visitors__created_at_date": "2017-01-07T00:00:00.000Z",
+            "visitors__revenue_running": "1500"
           }, {
-            "visitors.created_at_date": "2017-01-08T00:00:00.000Z",
-            "visitors.revenue_running": "1500"
+            "visitors__created_at_date": "2017-01-08T00:00:00.000Z",
+            "visitors__revenue_running": "1500"
           }, {
-            "visitors.created_at_date": "2017-01-09T00:00:00.000Z",
-            "visitors.revenue_running": "1500"
+            "visitors__created_at_date": "2017-01-09T00:00:00.000Z",
+            "visitors__revenue_running": "1500"
           }, {
-            "visitors.created_at_date": "2017-01-10T00:00:00.000Z",
-            "visitors.revenue_running": "1500"
+            "visitors__created_at_date": "2017-01-10T00:00:00.000Z",
+            "visitors__revenue_running": "1500"
           }]
@@ -451,12 +451,12 @@ );
       }, [
-        { "visitors.created_at_date": "2017-01-01T00:00:00.000Z", "visitors.revenue_rolling": null },
-        { "visitors.created_at_date": "2017-01-02T00:00:00.000Z", "visitors.revenue_rolling": null },
-        { "visitors.created_at_date": "2017-01-03T00:00:00.000Z", "visitors.revenue_rolling": "100" },
-        { "visitors.created_at_date": "2017-01-04T00:00:00.000Z", "visitors.revenue_rolling": "100" },
-        { "visitors.created_at_date": "2017-01-05T00:00:00.000Z", "visitors.revenue_rolling": "200" },
-        { "visitors.created_at_date": "2017-01-06T00:00:00.000Z", "visitors.revenue_rolling": "500" },
-        { "visitors.created_at_date": "2017-01-07T00:00:00.000Z", "visitors.revenue_rolling": "1200" },
-        { "visitors.created_at_date": "2017-01-08T00:00:00.000Z", "visitors.revenue_rolling": "900" },
-        { "visitors.created_at_date": "2017-01-09T00:00:00.000Z", "visitors.revenue_rolling": null },
-        { "visitors.created_at_date": "2017-01-10T00:00:00.000Z", "visitors.revenue_rolling": null }
+        { "visitors__created_at_date": "2017-01-01T00:00:00.000Z", "visitors__revenue_rolling": null },
+        { "visitors__created_at_date": "2017-01-02T00:00:00.000Z", "visitors__revenue_rolling": null },
+        { "visitors__created_at_date": "2017-01-03T00:00:00.000Z", "visitors__revenue_rolling": "100" },
+        { "visitors__created_at_date": "2017-01-04T00:00:00.000Z", "visitors__revenue_rolling": "100" },
+        { "visitors__created_at_date": "2017-01-05T00:00:00.000Z", "visitors__revenue_rolling": "200" },
+        { "visitors__created_at_date": "2017-01-06T00:00:00.000Z", "visitors__revenue_rolling": "500" },
+        { "visitors__created_at_date": "2017-01-07T00:00:00.000Z", "visitors__revenue_rolling": "1200" },
+        { "visitors__created_at_date": "2017-01-08T00:00:00.000Z", "visitors__revenue_rolling": "900" },
+        { "visitors__created_at_date": "2017-01-09T00:00:00.000Z", "visitors__revenue_rolling": null },
+        { "visitors__created_at_date": "2017-01-10T00:00:00.000Z", "visitors__revenue_rolling": null }
       ])
@@ -482,16 +482,16 @@ );
       {
-        "visitors.created_at_date": "2017-01-02T00:00:00.000Z", "visitors.revenue_rolling": null,
-        "visitor_checkins.visitor_checkins_count": "3"
+        "visitors__created_at_date": "2017-01-02T00:00:00.000Z", "visitors__revenue_rolling": null,
+        "visitor_checkins__visitor_checkins_count": "3"
       },
       {
-        "visitors.created_at_date": "2017-01-04T00:00:00.000Z", "visitors.revenue_rolling": "100",
-        'visitor_checkins.visitor_checkins_count': '2'
+        "visitors__created_at_date": "2017-01-04T00:00:00.000Z", "visitors__revenue_rolling": "100",
+        "visitor_checkins__visitor_checkins_count": '2'
       },
       {
-        "visitors.created_at_date": "2017-01-05T00:00:00.000Z", "visitors.revenue_rolling": "200",
-        'visitor_checkins.visitor_checkins_count': '1'
+        "visitors__created_at_date": "2017-01-05T00:00:00.000Z", "visitors__revenue_rolling": "200",
+        "visitor_checkins__visitor_checkins_count": '1'
       },
       {
-        "visitors.created_at_date": "2017-01-06T00:00:00.000Z", "visitors.revenue_rolling": "500",
-        'visitor_checkins.visitor_checkins_count': '0'
+        "visitors__created_at_date": "2017-01-06T00:00:00.000Z", "visitors__revenue_rolling": "500",
+        "visitor_checkins__visitor_checkins_count": '0'
       }
@@ -516,3 +516,3 @@ ])
     }, [
-      { "visitors.created_at_week": "2017-01-09T00:00:00.000Z", "visitors.revenue_rolling3day": "900" }
+      { "visitors__created_at_week": "2017-01-09T00:00:00.000Z", "visitors__revenue_rolling3day": "900" }
     ])
@@ -536,12 +536,12 @@ );
     }, [
-      { "visitors.created_at_date": "2017-01-01T00:00:00.000Z", "visitors.count_rolling": null },
-      { "visitors.created_at_date": "2017-01-02T00:00:00.000Z", "visitors.count_rolling": null },
-      { "visitors.created_at_date": "2017-01-03T00:00:00.000Z", "visitors.count_rolling": "1" },
-      { "visitors.created_at_date": "2017-01-04T00:00:00.000Z", "visitors.count_rolling": "1" },
-      { "visitors.created_at_date": "2017-01-05T00:00:00.000Z", "visitors.count_rolling": "1" },
-      { "visitors.created_at_date": "2017-01-06T00:00:00.000Z", "visitors.count_rolling": "2" },
-      { "visitors.created_at_date": "2017-01-07T00:00:00.000Z", "visitors.count_rolling": "3" },
-      { "visitors.created_at_date": "2017-01-08T00:00:00.000Z", "visitors.count_rolling": "2" },
-      { "visitors.created_at_date": "2017-01-09T00:00:00.000Z", "visitors.count_rolling": null },
-      { "visitors.created_at_date": "2017-01-10T00:00:00.000Z", "visitors.count_rolling": null }
+      { "visitors__created_at_date": "2017-01-01T00:00:00.000Z", "visitors__count_rolling": null },
+      { "visitors__created_at_date": "2017-01-02T00:00:00.000Z", "visitors__count_rolling": null },
+      { "visitors__created_at_date": "2017-01-03T00:00:00.000Z", "visitors__count_rolling": "1" },
+      { "visitors__created_at_date": "2017-01-04T00:00:00.000Z", "visitors__count_rolling": "1" },
+      { "visitors__created_at_date": "2017-01-05T00:00:00.000Z", "visitors__count_rolling": "1" },
+      { "visitors__created_at_date": "2017-01-06T00:00:00.000Z", "visitors__count_rolling": "2" },
+      { "visitors__created_at_date": "2017-01-07T00:00:00.000Z", "visitors__count_rolling": "3" },
+      { "visitors__created_at_date": "2017-01-08T00:00:00.000Z", "visitors__count_rolling": "2" },
+      { "visitors__created_at_date": "2017-01-09T00:00:00.000Z", "visitors__count_rolling": null },
+      { "visitors__created_at_date": "2017-01-10T00:00:00.000Z", "visitors__count_rolling": null }
     ])
@@ -565,6 +565,6 @@ );
     }, [
-      {"visitors.created_at_sql_utils_date":"2017-01-02T00:00:00.000Z","visitors.visitor_count":"1"},
-      {"visitors.created_at_sql_utils_date":"2017-01-04T00:00:00.000Z","visitors.visitor_count":"1"},
-      {"visitors.created_at_sql_utils_date":"2017-01-05T00:00:00.000Z","visitors.visitor_count":"1"},
-      {"visitors.created_at_sql_utils_date":"2017-01-06T00:00:00.000Z","visitors.visitor_count":"2"}
+      {"visitors__created_at_sql_utils_date":"2017-01-02T00:00:00.000Z","visitors__visitor_count":"1"},
+      {"visitors__created_at_sql_utils_date":"2017-01-04T00:00:00.000Z","visitors__visitor_count":"1"},
+      {"visitors__created_at_sql_utils_date":"2017-01-05T00:00:00.000Z","visitors__visitor_count":"1"},
+      {"visitors__created_at_sql_utils_date":"2017-01-06T00:00:00.000Z","visitors__visitor_count":"2"}
     ])
@@ -588,3 +588,3 @@ );
         {
-          "visitors.revenue_running": "1500"
+          "visitors__revenue_running": "1500"
         }
@@ -609,12 +609,12 @@ ])
       }, [
-        { "visitors.created_at_date": "2017-01-01T00:00:00.000Z", "visitors.running_revenue_per_count": null },
-        { "visitors.created_at_date": "2017-01-02T00:00:00.000Z", "visitors.running_revenue_per_count": "100" },
-        { "visitors.created_at_date": "2017-01-03T00:00:00.000Z", "visitors.running_revenue_per_count": "100" },
-        { "visitors.created_at_date": "2017-01-04T00:00:00.000Z", "visitors.running_revenue_per_count": "150" },
-        { "visitors.created_at_date": "2017-01-05T00:00:00.000Z", "visitors.running_revenue_per_count": "200" },
-        { "visitors.created_at_date": "2017-01-06T00:00:00.000Z", "visitors.running_revenue_per_count": "300" },
-        { "visitors.created_at_date": "2017-01-07T00:00:00.000Z", "visitors.running_revenue_per_count": "300" },
-        { "visitors.created_at_date": "2017-01-08T00:00:00.000Z", "visitors.running_revenue_per_count": "300" },
-        { "visitors.created_at_date": "2017-01-09T00:00:00.000Z", "visitors.running_revenue_per_count": "300" },
-        { "visitors.created_at_date": "2017-01-10T00:00:00.000Z", "visitors.running_revenue_per_count": "300" }
+        { "visitors__created_at_date": "2017-01-01T00:00:00.000Z", "visitors__running_revenue_per_count": null },
+        { "visitors__created_at_date": "2017-01-02T00:00:00.000Z", "visitors__running_revenue_per_count": "100" },
+        { "visitors__created_at_date": "2017-01-03T00:00:00.000Z", "visitors__running_revenue_per_count": "100" },
+        { "visitors__created_at_date": "2017-01-04T00:00:00.000Z", "visitors__running_revenue_per_count": "150" },
+        { "visitors__created_at_date": "2017-01-05T00:00:00.000Z", "visitors__running_revenue_per_count": "200" },
+        { "visitors__created_at_date": "2017-01-06T00:00:00.000Z", "visitors__running_revenue_per_count": "300" },
+        { "visitors__created_at_date": "2017-01-07T00:00:00.000Z", "visitors__running_revenue_per_count": "300" },
+        { "visitors__created_at_date": "2017-01-08T00:00:00.000Z", "visitors__running_revenue_per_count": "300" },
+        { "visitors__created_at_date": "2017-01-09T00:00:00.000Z", "visitors__running_revenue_per_count": "300" },
+        { "visitors__created_at_date": "2017-01-10T00:00:00.000Z", "visitors__running_revenue_per_count": "300" }
       ])
@@ -664,3 +664,3 @@ );
         res.should.be.deepEqual(
-          [{ "visitor_checkins.revenue_per_checkin": "50" }]
+          [{ "visitor_checkins__revenue_per_checkin": "50" }]
         );
@@ -688,3 +688,3 @@ });
         res.should.be.deepEqual(
-          [{ "visitor_checkins.google_sourced_checkins": "1" }]
+          [{ "visitor_checkins__google_sourced_checkins": "1" }]
         );
@@ -715,3 +715,3 @@ });
         res.should.be.deepEqual(
-          [{ "visitor_checkins.google_sourced_checkins": "1" }]
+          [{ "visitor_checkins__google_sourced_checkins": "1" }]
         );
@@ -751,7 +751,7 @@ });
           [{
-            "visitors.source": "some",
-            "visitors.visitor_count": "2"
+            "visitors__source": "some",
+            "visitors__visitor_count": "2"
           }, {
-            "visitors.source": null,
-            "visitors.visitor_count": "3"
+            "visitors__source": null,
+            "visitors__visitor_count": "3"
           }]
@@ -788,5 +788,5 @@ );
           [{
-            "visitors.source": "some"
+            "visitors__source": "some"
           }, {
-            "visitors.source": null
+            "visitors__source": null
           }]
@@ -823,3 +823,3 @@ );
             [{
-              "visitors.source": "some"
+              "visitors__source": "some"
             }]
@@ -860,3 +860,3 @@ );
             [{
-              "visitors.source": "some"
+              "visitors__source": "some"
             }]
@@ -895,17 +895,17 @@ );
           [{
-            "visitors.checkins": "0",
-            "visitors.created_at_date": "2017-01-06T00:00:00.000Z",
-            "visitors.visitor_count": "2"
+            "visitors__checkins": "0",
+            "visitors__created_at_date": "2017-01-06T00:00:00.000Z",
+            "visitors__visitor_count": "2"
           }, {
-            "visitors.checkins": "1",
-            "visitors.created_at_date": "2017-01-05T00:00:00.000Z",
-            "visitors.visitor_count": "1"
+            "visitors__checkins": "1",
+            "visitors__created_at_date": "2017-01-05T00:00:00.000Z",
+            "visitors__visitor_count": "1"
           }, {
-            "visitors.checkins": "2",
-            "visitors.created_at_date": "2017-01-04T00:00:00.000Z",
-            "visitors.visitor_count": "1"
+            "visitors__checkins": "2",
+            "visitors__created_at_date": "2017-01-04T00:00:00.000Z",
+            "visitors__visitor_count": "1"
           }, {
-            "visitors.checkins": "3",
-            "visitors.created_at_date": "2017-01-02T00:00:00.000Z",
-            "visitors.visitor_count": "1"
+            "visitors__checkins": "3",
+            "visitors__created_at_date": "2017-01-02T00:00:00.000Z",
+            "visitors__visitor_count": "1"
           }]
@@ -946,3 +946,3 @@ );
         res.should.be.deepEqual(
-          [{ "visitors.created_at_date": "2017-01-02T00:00:00.000Z", "visitors.average_checkins": "6.0000000000000000" }]
+          [{ "visitors__created_at_date": "2017-01-02T00:00:00.000Z", "visitors__average_checkins": "6.0000000000000000" }]
         );
@@ -986,12 +986,12 @@ });
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-02T00:00:00.000Z",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-02T00:00:00.000Z",
+        "visitors__visitor_count": "1"
       },
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-04T00:00:00.000Z",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-04T00:00:00.000Z",
+        "visitors__visitor_count": "1"
       },
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-05T00:00:00.000Z",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-05T00:00:00.000Z",
+        "visitors__visitor_count": "1"
       }
@@ -1021,12 +1021,12 @@ ]).then(() => {
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-02T00:00:00.000Z",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-02T00:00:00.000Z",
+        "visitors__visitor_count": "1"
       },
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-04T00:00:00.000Z",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-04T00:00:00.000Z",
+        "visitors__visitor_count": "1"
       },
       {
-        "visitors.min_visitor_checkin_date_date": "2017-01-05T00:00:00.000Z",
-        "visitors.visitor_count": "1"
+        "visitors__min_visitor_checkin_date_date": "2017-01-05T00:00:00.000Z",
+        "visitors__visitor_count": "1"
       }
@@ -1067,12 +1067,12 @@ ])
         {
-          "visitor_checkins.cards_count": "0",
-          "visitors.visitor_revenue": "300"
+          "visitor_checkins__cards_count": "0",
+          "visitors__visitor_revenue": "300"
         },
         {
-          "visitor_checkins.cards_count": "1",
-          "visitors.visitor_revenue": "100"
+          "visitor_checkins__cards_count": "1",
+          "visitors__visitor_revenue": "100"
         },
         {
-          "visitor_checkins.cards_count": null,
-          "visitors.visitor_revenue": null
+          "visitor_checkins__cards_count": null,
+          "visitors__visitor_revenue": null
         }
@@ -1123,5 +1123,5 @@ ])
             {
-              "visitor_checkins.source": "google",
-              "visitors.created_at_date": "2017-01-02T00:00:00.000Z",
-              "visitors.per_visitor_revenue": "100"
+              "visitor_checkins__source": "google",
+              "visitors__created_at_date": "2017-01-02T00:00:00.000Z",
+              "visitors__per_visitor_revenue": "100"
             }
@@ -1170,3 +1170,3 @@ ]
             {
-              "visitors.visitor_revenue": "100"
+              "visitors__visitor_revenue": "100"
             }
@@ -1197,3 +1197,3 @@ ]
         res.should.be.deepEqual(
-          [{ "visitor_checkins.revenue_per_checkin": "60" }]
+          [{ "visitor_checkins__revenue_per_checkin": "60" }]
         );
@@ -1223,3 +1223,3 @@ });
       res.should.be.deepEqual(
-        [{ "visitor_checkins.revenue_per_checkin": "50" }]
+        [{ "visitor_checkins__revenue_per_checkin": "50" }]
       );
@@ -1240,3 +1240,3 @@ });
       }],
-    }, [{ "reference_visitors.count": "1" }])
+    }, [{ "reference_visitors__count": "1" }])
   );
@@ -1255,3 +1255,3 @@
       }],
-    }, [{"reference_visitors.google_sourced_count":"1"}])
+    }, [{"reference_visitors__google_sourced_count":"1"}])
   );
@@ -1267,7 +1267,7 @@
     }, [
-        { 'visitors.location': '120.120,10.60' },
-        { 'visitors.location': '120.120,40.60' },
-        { 'visitors.location': '120.120,58.10' },
-        { 'visitors.location': '120.120,58.60' },
-        { 'visitors.location': '120.120,70.60' }
+        { "visitors__location": '120.120,10.60' },
+        { "visitors__location": '120.120,40.60' },
+        { "visitors__location": '120.120,58.10' },
+        { "visitors__location": '120.120,58.60' },
+        { "visitors__location": '120.120,70.60' }
     ])
@@ -1288,4 +1288,4 @@ );
     }, [
-      { 'visitors.id': 1 },
-      { 'visitors.id': 2 }
+      { "visitors__id": 1 },
+      { "visitors__id": 2 }
     ])
@@ -1312,3 +1312,3 @@ );
     }, [
-      { 'visitors.source': 'some' }
+      { "visitors__source": 'some' }
     ])
@@ -1333,8 +1333,8 @@ );
       {
-        "visitors.created_at_year": "2016-01-01T00:00:00.000Z",
-        "visitors.visitor_count": "1"
+        "visitors__created_at_year": "2016-01-01T00:00:00.000Z",
+        "visitors__visitor_count": "1"
       },
       {
-        "visitors.created_at_year": "2017-01-01T00:00:00.000Z",
-        "visitors.visitor_count": "5"
+        "visitors__created_at_year": "2017-01-01T00:00:00.000Z",
+        "visitors__visitor_count": "5"
       }
@@ -1341,0 +1341,0 @@ ])

test/PreAggregationsTest.js

@@ -0,1 +1,2 @@
+/* eslint-disable quote-props */
 const R = require('ramda');
@@ -224,16 +225,16 @@
             {
-              "visitors.created_at_date": "2017-01-02T00:00:00.000Z",
-              "visitors.count": "1"
+              "visitors__created_at_date": "2017-01-02T00:00:00.000Z",
+              "visitors__count": "1"
             },
             {
-              "visitors.created_at_date": "2017-01-04T00:00:00.000Z",
-              "visitors.count": "1"
+              "visitors__created_at_date": "2017-01-04T00:00:00.000Z",
+              "visitors__count": "1"
             },
             {
-              "visitors.created_at_date": "2017-01-05T00:00:00.000Z",
-              "visitors.count": "1"
+              "visitors__created_at_date": "2017-01-05T00:00:00.000Z",
+              "visitors__count": "1"
             },
             {
-              "visitors.created_at_date": "2017-01-06T00:00:00.000Z",
-              "visitors.count": "2"
+              "visitors__created_at_date": "2017-01-06T00:00:00.000Z",
+              "visitors__count": "2"
             }
@@ -276,16 +277,16 @@ ]
             {
-              "visitors.created_at_date": "2017-01-02T00:00:00.000Z",
-              "visitors.ratio": '0.33333333333333333333'
+              "visitors__created_at_date": "2017-01-02T00:00:00.000Z",
+              "visitors__ratio": '0.33333333333333333333'
             },
             {
-              "visitors.created_at_date": "2017-01-04T00:00:00.000Z",
-              "visitors.ratio": '0.50000000000000000000'
+              "visitors__created_at_date": "2017-01-04T00:00:00.000Z",
+              "visitors__ratio": '0.50000000000000000000'
             },
             {
-              "visitors.created_at_date": "2017-01-05T00:00:00.000Z",
-              "visitors.ratio": '1.00000000000000000000'
+              "visitors__created_at_date": "2017-01-05T00:00:00.000Z",
+              "visitors__ratio": '1.00000000000000000000'
             },
             {
-              "visitors.created_at_date": "2017-01-06T00:00:00.000Z",
-              "visitors.ratio": null
+              "visitors__created_at_date": "2017-01-06T00:00:00.000Z",
+              "visitors__ratio": null
             }
@@ -327,4 +328,4 @@ ]
             {
-              "google_visitors.created_at_date": "2017-01-05T00:00:00.000Z",
-              "google_visitors.count": "1"
+              "google_visitors__created_at_date": "2017-01-05T00:00:00.000Z",
+              "google_visitors__count": "1"
             }
@@ -392,6 +393,6 @@ ]
           [
-            { "visitors.checkins_count": "0", "visitors.count": "3" },
-            { "visitors.checkins_count": "1", "visitors.count": "1" },
-            { "visitors.checkins_count": "2", "visitors.count": "1" },
-            { "visitors.checkins_count": "3", "visitors.count": "1" }
+            { "visitors__checkins_count": "0", "visitors__count": "3" },
+            { "visitors__checkins_count": "1", "visitors__count": "1" },
+            { "visitors__checkins_count": "2", "visitors__count": "1" },
+            { "visitors__checkins_count": "3", "visitors__count": "1" }
           ]
@@ -440,4 +441,4 @@ );
             {
-              'visitors.created_at_month': '2017-01-01T00:00:00.000Z',
-              'visitors.checkins_total': '6'
+              "visitors__created_at_month": '2017-01-01T00:00:00.000Z',
+              "visitors__checkins_total": '6'
             }
@@ -487,15 +488,15 @@ ]
             {
-              "visitors.source": "some",
-              "visitors.created_at_date": "2017-01-02T00:00:00.000Z",
-              "visitors.checkins_total": "3"
+              "visitors__source": "some",
+              "visitors__created_at_date": "2017-01-02T00:00:00.000Z",
+              "visitors__checkins_total": "3"
             },
             {
-              "visitors.source": "some",
-              "visitors.created_at_date": "2017-01-04T00:00:00.000Z",
-              "visitors.checkins_total": "2"
+              "visitors__source": "some",
+              "visitors__created_at_date": "2017-01-04T00:00:00.000Z",
+              "visitors__checkins_total": "2"
             },
             {
-              "visitors.source": "google",
-              "visitors.created_at_date": "2017-01-05T00:00:00.000Z",
-              "visitors.checkins_total": "1"
+              "visitors__source": "google",
+              "visitors__created_at_date": "2017-01-05T00:00:00.000Z",
+              "visitors__checkins_total": "1"
             }
@@ -544,4 +545,4 @@ ]
             {
-              "visitors.created_at_date": "2017-01-05T00:00:00.000Z",
-              "visitors.checkins_total": "1"
+              "visitors__created_at_date": "2017-01-05T00:00:00.000Z",
+              "visitors__checkins_total": "1"
             }
@@ -584,5 +585,5 @@ ]
           [
-            { "visitors.source": "some", "visitors.checkins_total": "5" },
-            { "visitors.source": "google", "visitors.checkins_total": "1" },
-            { "visitors.source": null, "visitors.checkins_total": "0" }
+            { "visitors__source": "some", "visitors__checkins_total": "5" },
+            { "visitors__source": "google", "visitors__checkins_total": "1" },
+            { "visitors__source": null, "visitors__checkins_total": "0" }
           ]
@@ -589,0 +590,0 @@ );

No alert changes

Improved metrics

Total package byte prevSize

340466

increased by0.33%

Lines of code

9378

increased by0.05%

Dependency changes

• + Added@hapi/joi@^14.3.1

• + Added@hapi/hoek@6.2.48.5.1(transitive)

• + Added@hapi/joi@14.5.0(transitive)

• + Added@hapi/marker@1.0.0(transitive)

• + Added@hapi/topo@3.1.6(transitive)

• - Removedjoi@^14.3.1

• - Removedhoek@6.1.3(transitive)

• - Removedjoi@14.3.1(transitive)

• - Removedtopo@3.0.3(transitive)