fix: where with empty object (#15)

ali-sdk · Jan 20, 2017 · db0b90e · db0b90e
1 parent 74bce55
commit db0b90e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/operator.js b/lib/operator.js
@@ -185,10 +185,10 @@ proto._where = function (where) {
     return '';
   }
 
-  let wheres = [];
-  let values = [];
+  const wheres = [];
+  const values = [];
   for (let key in where) {
-    let value = where[key];
+    const value = where[key];
     if (Array.isArray(value)) {
       wheres.push('?? IN (?)');
     } else {
@@ -197,7 +197,11 @@ proto._where = function (where) {
     values.push(key);
     values.push(value);
   }
-  return this.format(' WHERE ' + wheres.join(' AND '), values);
+  if (wheres.length > 0) {
+    return this.format(' WHERE ' + wheres.join(' AND '), values);
+  } else {
+    return '';
+  }
 };
 
 proto._selectColumns = function (table, columns) {

diff --git a/test/operator.test.js b/test/operator.test.js
@@ -11,6 +11,8 @@ describe('operator.test.js', function () {
   describe('_where(where)', function () {
     it('should get where sql', function () {
       let op = new Operator();
+      assert.equal(op._where(), '');
+      assert.equal(op._where({}), '');
       assert.equal(op._where({ id: 1 }), ' WHERE `id` = 1');
       assert.equal(op._where({ id: 1, name: 'foo' }), ' WHERE `id` = 1 AND `name` = \'foo\'');
       assert.equal(op._where({ id: 1, name2: null }), ' WHERE `id` = 1 AND `name2` = NULL');