groupcore-utils 3.0.0 → 3.0.1

package/database/crud.js

@@ -55,8 +55,10 @@ module.exports = class {
       where.fields.forEach((field, i) => {
         if (_.last(where.fields) === field) {
           whereClause += `${field.field} = '${field.value}'`;
-        } else {
+        } else if (where.conditions) {
           whereClause += `${field.field} = '${field.value}' ${where.conditions[i]} `;
+        } else {
+          whereClause += `${field.field} = '${field.value}' ${where.condition} `;
         }
       });
     }

package/database/crud.spec.js

@@ -96,6 +96,26 @@ describe('read()', () => {
     expect(querySpy).toHaveBeenCalledWith("select * from test where id = '10' or tag = 'test' and slug = 'testslug'");
   });
 
+  it('should work when "where" is an array of objects with one condition', async () => {
+    expect.hasAssertions();
+
+    const querySpy = jest.spyOn(Init.prototype, 'query').mockImplementation(() => {
+      console.log('query called');
+    });
+    await new Crud({ dbTable: 'test', db }).read({
+      where: {
+        condition: 'and',
+        fields: [
+          { field: 'id', value: '10' },
+          { field: 'tag', value: 'test' },
+          { field: 'slug', value: 'testslug' },
+        ],
+      },
+      orderBy: null,
+    });
+    expect(querySpy).toHaveBeenCalledWith("select * from test where id = '10' and tag = 'test' and slug = 'testslug'");
+  });
+
   it('should work without any conditions', async () => {
     expect.hasAssertions();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "groupcore-utils",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Utilities for working with some core features",
   "main": "Utils.js",
   "scripts": {