Merge pull request sailshq#2 from treelinehq/fixes

Fixes to parse

Author: particlebanana

machines/compile-statement.js

@@ -1,3 +1,9 @@
+// Build up a SQLBuilder instance when the file is required rather than when the
+// function is run.
+var SQLBuilder = require('waterline-sql-builder')({
+  dialect: 'mysql'
+});
+
 module.exports = {
 
 
@@ -70,33 +76,34 @@ module.exports = {
 
 
   fn: function compileStatement(inputs, exits) {
-    var SQLBuilder = require('waterline-query-builder');
-
-    SQLBuilder.generateSql({
-      dialect: 'mysql',
-      query: inputs.statement
-    }).exec({
-      error: function error(err) {
+    var compiledNativeQuery;
+    try {
+      compiledNativeQuery = SQLBuilder.generate(inputs.statement);
+    } catch (err) {
+      if (!err.code || err.code === 'error') {
         return exits.error(err);
-      },
-      malformed: function malformed(err) {
+      }
+
+      if (err.code === 'malformed') {
         return exits.malformed({
           error: err,
           meta: inputs.meta
         });
-      },
-      notSupported: function notSupported(err) {
+      }
+
+      if (err.code === 'notSupported') {
         return exits.notSupported({
           error: err,
           meta: inputs.meta
         });
-      },
-      success: function success(compiledNativeQuery) {
-        return exits.success({
-          nativeQuery: compiledNativeQuery,
-          meta: inputs.meta
-        });
       }
+
+      return exits.error(err);
+    }
+
+    return exits.success({
+      nativeQuery: compiledNativeQuery,
+      meta: inputs.meta
     });
   }
 

machines/create-manager.js

@@ -18,6 +18,12 @@ module.exports = {
   '(e.g. a PoolCluster from felixge\'s `mysql` package).',
 
 
+  cacheable: false,
+
+
+  sync: true,
+
+
   inputs: {
 
     connectionString: {

machines/parse-native-query-result.js

@@ -58,6 +58,7 @@ module.exports = {
 
 
   fn: function parseNativeQueryResult(inputs, exits) {
+    var _ = require('lodash');
     var normalizedResult;
 
     switch (inputs.queryType) {
@@ -83,6 +84,27 @@ module.exports = {
         };
         break;
 
+      case 'avg':
+        var avgResult = _.first(inputs.nativeQueryResult.rows);
+        var avgResultKey = _.first(_.keys(avgResult));
+        var avg = inputs.nativeQueryResult.rows[0][avgResultKey];
+        normalizedResult = Number(avg);
+        break;
+
+      case 'sum':
+        var sumResult = _.first(inputs.nativeQueryResult.rows);
+        var sumResultKey = _.first(_.keys(sumResult));
+        var sum = inputs.nativeQueryResult.rows[0][sumResultKey];
+        normalizedResult = Number(sum);
+        break;
+
+      case 'count':
+        var countResult = _.first(inputs.nativeQueryResult.rows);
+        var countResultKey = _.first(_.keys(countResult));
+        var count = inputs.nativeQueryResult.rows[0][countResultKey];
+        normalizedResult = Number(count);
+        break;
+
       default:
 
     }

machines/send-native-query.js

@@ -78,6 +78,7 @@ module.exports = {
   fn: function sendNativeQuery(inputs, exits) {
     var util = require('util');
     var _ = require('lodash');
+    var debug = require('debug')('query');
     var validateConnection = require('../helpers/validate-connection');
 
     // Validate provided connection.
@@ -105,6 +106,11 @@ module.exports = {
     }
 
 
+    debug('Running SQL Query:');
+    debug('SQL: ' + sql);
+    debug('Bindings: ' + bindings);
+    debug('Connection Id: ' + inputs.connection.id);
+
     // Send native query to the database using node-mysql.
     inputs.connection.query({
       sql: sql,

package.json

@@ -20,6 +20,7 @@
   "author": "The Treeline Company",
   "license": "MIT",
   "dependencies": {
+    "debug": "2.2.0",
     "lodash": "3.10.1",
     "machine": "12.4.0",
     "mysql": "2.10.2",