Merge branch 'master' into one-redis-mpool

2014-10-14 18:23:17 +02:00
parent 3dad6e96e3 30dd0604ca
commit 711c1a89ee
10 changed files with 1065 additions and 409 deletions
@@ -93,6 +93,7 @@ function runQuery(username, options, query, queryHandler, callback) {
    if (shouldQueryPostgresDirectly()) {
        var psql = new PSQL(options);
        psql.query(query, function(err, resultSet) {
+            resultSet = resultSet || {};
            var rows = resultSet.rows || [];
            queryHandler(err, rows, callback);
        });