Merge branch 'master' into event-analytics-example

* master:
  ResultSet.normalizePivotConfig() fix (#6)
  Serverless deployment
  Serverless deployment
  Add support for Athena in JDBC driver (#5)

packages/cubejs-cli/cubejsCli.js

@@ -9,6 +9,7 @@ const Analytics = require('analytics-node');
 const client = new Analytics('dSR8JiNYIGKyQHKid9OaLYugXLao18hA', { flushInterval: 100 });
 const { machineIdSync } = require('node-machine-id');
 const { promisify } = require('util');
+const templates = require('./templates');
 
 const packageJson = require('./package.json');
 
@@ -30,54 +31,6 @@ const executeCommand = (command, args) => {
   })
 };
 
-const indexJs = `const CubejsServer = require('@cubejs-backend/server');
-
-const server = new CubejsServer();
-
-server.listen().then(({ port }) => {
-  console.log(\`🚀 Cube.js server is listening on \${port}\`);
-});
-`;
-
-const dotEnv = `CUBEJS_DB_HOST=<YOUR_DB_HOST_HERE>
-CUBEJS_DB_NAME=<YOUR_DB_NAME_HERE>
-CUBEJS_DB_USER=<YOUR_DB_USER_HERE>
-CUBEJS_DB_PASS=<YOUR_DB_PASS_HERE>
-`;
-
-const ordersJs = `cube(\`Orders\`, {
-  sql: \`
-  select 1 as id, 100 as amount, 'new' status
-  UNION ALL
-  select 2 as id, 200 as amount, 'new' status
-  UNION ALL
-  select 3 as id, 300 as amount, 'processed' status
-  UNION ALL
-  select 4 as id, 500 as amount, 'processed' status
-  UNION ALL
-  select 5 as id, 600 as amount, 'shipped' status
-  \`,
-
-  measures: {
-    count: {
-      type: \`count\`
-    },
-
-    totalAmount: {
-      sql: \`amount\`,
-      type: \`sum\`
-    }
-  },
-
-  dimensions: {
-    status: {
-      sql: \`status\`,
-      type: \`string\`
-    }
-  }
-});
-`;
-
 const anonymousId = machineIdSync();
 
 const event = async (name, props) => {
@@ -141,6 +94,13 @@ const createApp = async (projectName, options) => {
       createAppOptions
     );
   }
+  const template = options.template || 'express';
+  if (!templates[template]) {
+    await displayError(
+      `Unknown template ${chalk.red(template)}`,
+      createAppOptions
+    );
+  }
   await fs.ensureDir(projectName);
   process.chdir(projectName);
 
@@ -150,12 +110,9 @@ const createApp = async (projectName, options) => {
     version: '0.0.1',
     private: true,
     scripts: {
-      dev: "node index.js"
+      dev: "./node_modules/.bin/cubejs-dev-server"
     }
   });
-  await fs.writeFile('index.js', indexJs);
-  await fs.ensureDir('schema');
-  await fs.writeFile(path.join('schema', 'Orders.js'), ordersJs);
 
   logStage('Installing server dependencies');
   await npmInstall(['@cubejs-backend/server']);
@@ -190,8 +147,23 @@ const createApp = async (projectName, options) => {
     await executeCommand('npm', ['install']);
   }
 
-  logStage('Creating default configuration');
-  await fs.writeFile('.env', dotEnv + `CUBEJS_DB_TYPE=${options.dbType}\nCUBEJS_API_SECRET=${crypto.randomBytes(64).toString('hex')}\n`);
+  logStage('Writing files from template');
+
+  const templateConfig = templates[template];
+  const env = {
+    dbType: options.dbType,
+    apiSecret: crypto.randomBytes(64).toString('hex'),
+    projectName
+  };
+  await Promise.all(Object.keys(templateConfig.files).map(async fileName => {
+    await fs.ensureDir(path.dirname(fileName));
+    await fs.writeFile(fileName, templateConfig.files[fileName](env));
+  }));
+
+  if (templateConfig.dependencies) {
+    logStage('Installing template dependencies');
+    await npmInstall(templateConfig.dependencies);
+  }
 
   await event('Create App Success', { projectName, dbType: options.dbType });
   logStage(`${chalk.green(projectName)} app has been created 🎉`);
@@ -255,7 +227,8 @@ program
 
 program
   .command('create <name>')
-  .option('-d, --db-type <db-type>', 'Preconfigure for selected database (options: postgres, mysql)')
+  .option('-d, --db-type <db-type>', 'Preconfigure for selected database. Options: postgres, mysql')
+  .option('-t, --template <template>', 'App template. Options: express (default), serverless.')
   .description('Create new Cube.js app')
   .action((projectName, options) => createApp(projectName, options)
     .catch(e => displayError(e.stack || e, { projectName, dbType: options.dbType }))

packages/cubejs-cli/package.json

@@ -2,7 +2,7 @@
   "name": "cubejs-cli",
   "description": "Cube.js Command Line Interface",
   "author": "Statsbot, Inc.",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "engines": {
     "node": ">=8.11.1"
   },

packages/cubejs-cli/templates.js

@@ -0,0 +1,120 @@
+const indexJs = `const CubejsServer = require('@cubejs-backend/server');
+
+const server = new CubejsServer();
+
+server.listen().then(({ port }) => {
+  console.log(\`🚀 Cube.js server is listening on \${port}\`);
+});
+`;
+
+const appJs = `const express = require('serverless-express/express');
+const app = express();
+app.use(require('cors')());
+const serverCore = require('@cubejs-backend/server-core').create();
+
+serverCore.initApp(app);
+
+module.exports = app;
+`;
+
+const handlerJs = `const handler = require('serverless-express/handler');
+const app = require('./app');
+
+exports.api = handler(app);
+`;
+
+const dotEnv = (env) => `CUBEJS_DB_HOST=<YOUR_DB_HOST_HERE>
+CUBEJS_DB_NAME=<YOUR_DB_NAME_HERE>
+CUBEJS_DB_USER=<YOUR_DB_USER_HERE>
+CUBEJS_DB_PASS=<YOUR_DB_PASS_HERE>
+CUBEJS_DB_TYPE=${env.dbType}
+CUBEJS_API_SECRET=${env.apiSecret}
+`;
+
+const serverlessYml = (env) => `service: ${env.projectName}
+
+provider:
+  name: aws
+  runtime: nodejs8.10
+  environment:
+    CUBEJS_DB_HOST: <YOUR_DB_HOST_HERE>
+    CUBEJS_DB_NAME: <YOUR_DB_NAME_HERE>
+    CUBEJS_DB_USER: <YOUR_DB_USER_HERE>
+    CUBEJS_DB_PASS: <YOUR_DB_PASS_HERE>
+    CUBEJS_DB_PORT: <YOUR_DB_PORT_HERE>
+    CUBEJS_DB_TYPE: ${env.dbType}
+    CUBEJS_API_SECRET: ${env.apiSecret}
+    REDIS_URL: <YOUR_REDIS_URL_HERE>
+
+functions:
+  cubejs:
+    handler: handler.api
+    timeout: 30
+#   vpc:
+#     securityGroupIds:
+#       - sg-12345678901234567 # Your DB and Redis security groups here
+#     subnetIds:
+#       - subnet-12345678901234567 # Your DB and Redis subnets here
+    events:
+      - http:
+          path: /
+          method: GET
+      - http:
+          path: /{proxy+}
+          method: ANY
+
+plugins:
+  - serverless-express
+`;
+
+const ordersJs = `cube(\`Orders\`, {
+  sql: \`
+  select 1 as id, 100 as amount, 'new' status
+  UNION ALL
+  select 2 as id, 200 as amount, 'new' status
+  UNION ALL
+  select 3 as id, 300 as amount, 'processed' status
+  UNION ALL
+  select 4 as id, 500 as amount, 'processed' status
+  UNION ALL
+  select 5 as id, 600 as amount, 'shipped' status
+  \`,
+
+  measures: {
+    count: {
+      type: \`count\`
+    },
+
+    totalAmount: {
+      sql: \`amount\`,
+      type: \`sum\`
+    }
+  },
+
+  dimensions: {
+    status: {
+      sql: \`status\`,
+      type: \`string\`
+    }
+  }
+});
+`;
+
+exports.express = {
+  files: {
+    'index.js': () => indexJs,
+    '.env': dotEnv,
+    'schema/Orders.js': () => ordersJs
+  }
+};
+
+exports.serverless = {
+  files: {
+    'handler.js': () => handlerJs,
+    'app.js': () => appJs,
+    'serverless.yml': serverlessYml,
+    '.env': dotEnv,
+    'schema/Orders.js': () => ordersJs
+  },
+  dependencies: ['serverless-express']
+};

packages/cubejs-client-core/dist/cubejs-client-core.js

@@ -516,7 +516,7 @@ function () {
       var _this = this;
 
       return this.loadMethod(function () {
-        return _this.request("/load?query=".concat(JSON.stringify(query)));
+        return _this.request("/load?query=".concat(encodeURIComponent(JSON.stringify(query))));
       }, function (body) {
         return new ResultSet(body);
       }, options, callback);

packages/cubejs-client-core/dist/cubejs-client-core.umd.js

@@ -14798,7 +14798,7 @@
 	      var _this = this;
 
 	      return this.loadMethod(function () {
-	        return _this.request("/load?query=".concat(JSON.stringify(query)));
+	        return _this.request("/load?query=".concat(encodeURIComponent(JSON.stringify(query))));
 	      }, function (body) {
 	        return new ResultSet(body);
 	      }, options, callback);

packages/cubejs-client-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/core",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "cube.js client",
   "main": "dist/cubejs-client-core.js",
   "author": "Statsbot, Inc.",

packages/cubejs-client-core/src/ResultSet.js

@@ -60,13 +60,13 @@ export default class ResultSet {
   normalizePivotConfig(pivotConfig) {
     const query = this.loadResponse.query;
     let timeDimensions = (query.timeDimensions || []).filter(td => !!td.granularity);
-    pivotConfig = pivotConfig || timeDimensions.length ? {
+    pivotConfig = pivotConfig || (timeDimensions.length ? {
       x: timeDimensions.map(td => td.dimension),
       y: query.dimensions || []
     } : {
       x: query.dimensions || [],
       y: []
-    };
+    });
     if (!pivotConfig.x.concat(pivotConfig.y).find(d => d === 'measures')) {
       pivotConfig.y = pivotConfig.y.concat(['measures']);
     }
@@ -208,4 +208,4 @@ export default class ResultSet {
   rawData() {
     return this.loadResponse.data;
   }
-}
+}

packages/cubejs-client-core/src/index.js

@@ -54,7 +54,7 @@ class CubejsApi {
 
   load(query, options, callback) {
     return this.loadMethod(
-      () => this.request(`/load?query=${JSON.stringify(query)}`),
+      () => this.request(`/load?query=${encodeURIComponent(JSON.stringify(query))}`),
       (body) => new ResultSet(body),
       options,
       callback

packages/cubejs-mysql-driver/driver/MySqlDriver.js

@@ -87,8 +87,13 @@ class MySqlDriver extends BaseDriver {
     return promise;
   }
 
-  testConnection() {
-    return this.withConnection((conn) => conn.execute('SELECT 1'));
+  async testConnection() {
+    const conn = await this.pool._factory.create();
+    try {
+      return await conn.execute('SELECT 1');
+    } finally {
+      await this.pool._factory.destroy(conn);
+    }
   }
 
   query(query, values) {

packages/cubejs-mysql-driver/package.json

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/mysql-driver",
   "description": "Cube.js Mysql database driver",
   "author": "Statsbot, Inc.",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "engines": {
     "node": ">=8.11.1"
   },
@@ -11,7 +11,7 @@
     "test": "mocha"
   },
   "dependencies": {
-    "@cubejs-backend/query-orchestrator": "^0.0.7",
+    "@cubejs-backend/query-orchestrator": "^0.0.21",
     "generic-pool": "^3.6.0",
     "mysql": "^2.16.0"
   },

packages/cubejs-mysql-driver/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@cubejs-backend/query-orchestrator@^0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@cubejs-backend/query-orchestrator/-/query-orchestrator-0.0.7.tgz#5c6a5d95e7e17d26a1dfd8a6bb1068607df681a7"
-  integrity sha512-bC5ohIyALcgYzyuO3Z0olN9hr5RFbRPv8eEtQAYnbXouS1Se+hiculMj3olbx6eeCEj98ZXLrMdLAQMPrZtCOg==
+"@cubejs-backend/query-orchestrator@^0.0.21":
+  version "0.0.21"
+  resolved "https://registry.yarnpkg.com/@cubejs-backend/query-orchestrator/-/query-orchestrator-0.0.21.tgz#b5a0422a34931a834f4429280679460d08dc6112"
+  integrity sha512-jQS5F2D9PzKEJ4guzba6S2PymruA5pTIFu4DnOnM7Y3sFQkjVDcl7KYEr5VmpX6+Hu1u+naApuCQo2l6PtOXKg==
   dependencies:
     ramda "^0.24.1"
     redis "^2.8.0"