Fix tests and update dependencies.

Author: Thomas Hansen

package-lock.json

@@ -1,15 +1,15 @@
 {
   "name": "mongo-query-to-postgres-jsonb",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Converts MongoDB queries to postgresql queries for jsonb fields.",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
   "dependencies": {},
   "devDependencies": {
-    "chai": "^3.5.0",
-    "mocha": "^3.2.0"
+    "chai": "^4.2.0",
+    "mocha": "^5.2.0"
   },
   "repository": {
     "type": "git",

package.json

@@ -176,17 +176,17 @@ describe('$mod', function () {
 
 describe('Match a Field Without Specifying Array Index', function () {
   it('basic case', function() {
-    assert.equal("EXISTS (SELECT * FROM jsonb_array_elements(data->'courses') WHERE value->>'distance'='5K')", convert('data', { 'courses.distance': '5K' }, ['courses']))
+    assert.equal("(data->'courses'->>'distance'='5K' OR EXISTS (SELECT * FROM jsonb_array_elements(data->'courses') WHERE jsonb_typeof(data->'courses')='array' AND value->>'distance'='5K'))", convert('data', { 'courses.distance': '5K' }, ['courses']))
   })
   it('direct match', function() {
-    assert.equal('EXISTS (SELECT * FROM jsonb_array_elements(data->\'roles\') WHERE value #>>\'{}\'=\'Admin\')', convert('data', { 'roles': 'Admin' }, ['roles']))
+    assert.equal('(data->>\'roles\'=\'Admin\' OR EXISTS (SELECT * FROM jsonb_array_elements(data->\'roles\') WHERE jsonb_typeof(data->\'roles\')=\'array\' AND value #>>\'{}\'=\'Admin\'))', convert('data', { 'roles': 'Admin' }, ['roles']))
   })
   it('$in', function() {
-    assert.equal("EXISTS (SELECT * FROM jsonb_array_elements(data->'roles') WHERE value #>>'{}' IN ('Test', 'Admin'))", convert('data', { 'roles': { $in: ["Test", "Admin"] } }, ['roles']))
+    assert.equal("(data->>'roles' IN ('Test', 'Admin') OR EXISTS (SELECT * FROM jsonb_array_elements(data->'roles') WHERE jsonb_typeof(data->'roles')='array' AND value #>>'{}' IN ('Test', 'Admin')))", convert('data', { 'roles': { $in: ["Test", "Admin"] } }, ['roles']))
   })
 })
 describe('special cases', function () {
   it('should return true when passed no parameters', function() {
     assert.equal('TRUE', convert('data', {}))
   })
-})
+})

test/filter.js

@@ -53,7 +53,7 @@ describe('update: ', function() {
       assert.equal(convertUpdate('data', { $rename: { current: 'newN' } }), 'jsonb_set(data,\'{newN}\',data->\'current\') #- \'{current}\'')
     })
     it('$pull', function() {
-      assert.equal(convertUpdate('data', { $pull: { cities: 'LA' } }), 'array_remove(ARRAY(SELECT value FROM jsonb_array_elements(data->\'cities\')),\'"LA"\')')
+      assert.equal(convertUpdate('data', { $pull: { cities: 'LA' } }), 'jsonb_set(data,\'{cities}\',to_jsonb(ARRAY(SELECT value FROM jsonb_array_elements(data->\'cities\') WHERE NOT value #>>\'{}\'=\'LA\')))')
     })
     it('$push', function() {
       assert.equal(convertUpdate('data', { $push: { cities: 'LA' } }), 'jsonb_set(data,\'{cities}\',to_jsonb(array_append(ARRAY(SELECT value FROM jsonb_array_elements(data->\'cities\')),\'"LA"\')))')