From 7332f129729450e814e2f993080c62029bffad12 Mon Sep 17 00:00:00 2001
From: Raymond Feng <raymond@strongloop.com>
Date: Thu, 15 May 2014 10:32:31 -0700
Subject: [PATCH] Fix buildWhere

---
 lib/mysql.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/mysql.js b/lib/mysql.js
index 502e6be..7033a80 100644
--- a/lib/mysql.js
+++ b/lib/mysql.js
@@ -389,6 +389,11 @@ MySQL.prototype.getColumns = function (model, props) {
 };
 
 MySQL.prototype.buildWhere = function (model, conds) {
+  var where = this._buildWhere(model, conds);
+  return where? 'WHERE ' + where : '';
+};
+
+MySQL.prototype._buildWhere = function (model, conds) {
   var self = this;
   var props = self._models[model].properties;
 
@@ -398,9 +403,9 @@ MySQL.prototype.buildWhere = function (model, conds) {
       var clauses = conds[key];
       if (Array.isArray(clauses)) {
         clauses = clauses.map(function (c) {
-          return '(' + self.buildWhere(model, c) + ')';
+          return '(' + self._buildWhere(model, c) + ')';
         });
-        return clauses.join(' ' + key.toUpperCase() + ' ');
+        return cs.push(clauses.join(' ' + key.toUpperCase() + ' '));
       }
       // The value is not an array, fall back to regular fields
     }
@@ -450,7 +455,7 @@ MySQL.prototype.buildWhere = function (model, conds) {
   if (cs.length === 0) {
     return '';
   }
-  return 'WHERE ' + cs.join(' AND ');
+  return cs.join(' AND ');
 }
 
 function buildOrderBy(self, model, order) {