Fix issue thomas4019#14 by supporting array matching

Author: thomas4019

index.js

@@ -93,6 +93,9 @@ function createElementOrArrayQuery(path, op, value, parent, arrayPathStr) {
  */
 function convertOp(path, op, value, parent, arrayPaths) {
   const arrayPath = getMatchingArrayPath(op, arrayPaths)
+  // It seems like direct matches shouldn't be array fields, but 2D arrays are possible in MongoDB
+  // I will need to do more testing to see if we should handle this case differently.
+  // const arrayDirectMatch = !isSpecialOp(op) && Array.isArray(value)
   if (arrayPath) {
     return createElementOrArrayQuery(path, op, value, parent, arrayPath)
   }
@@ -209,13 +212,19 @@ function convertOp(path, op, value, parent, arrayPaths) {
       return 'cast(' + text + ' AS numeric) % ' + value[0] + '=' + value[1]
     }
     default:
+      // this is likely a top level field, recurse
       return convert(path.concat(op.split('.')), value)
   }
 }
 
+function isSpecialOp(op) {
+  return op in OPS || op in OTHER_OPS
+}
+
+// top level keys are always special, since you never exact match the whole object
 function getSpecialKeys(path, query, forceExact) {
   return Object.keys(query).filter(function (key) {
-    return (path.length === 1 && !forceExact) || key in OPS || key in OTHER_OPS
+    return (path.length === 1 && !forceExact) || isSpecialOp(key)
   })
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongo-query-to-postgres-jsonb",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "Converts MongoDB queries to postgresql queries for jsonb fields.",
   "main": "index.js",
   "directories": {

test/filter.js

@@ -17,8 +17,14 @@ describe('string equality', function () {
 })
 
 describe('array equality', function () {
+  it('array match', function () {
+    assert.equal('data @> \'{ "roles": ["Admin"] }\'', convert('data', {'roles': ['Admin']}))
+  })
+  it('array match', function () {
+    assert.equal('data @> \'{ "roles": ["Admin","2"] }\'', convert('data', {'roles': ['Admin', '2']}))
+  })
   it('should use =', function () {
-    assert.equal('data @> \'{ "roles": Admin }\'', convert('data', {'roles': ['Admin']}))
+    assert.equal('data @> \'{ "roles": "Admin" }\'', convert('data', {'roles': 'Admin'}))
   })
   it('should matching numeric indexes', function() {
     assert.equal('data->\'roles\'->>0=\'Admin\'', convert('data', {'roles.0': 'Admin'}))
@@ -215,6 +221,17 @@ describe('Match a Field Without Specifying Array Index', function () {
         'data->\'roles\') WHERE jsonb_typeof(data->\'roles\')=\'array\' AND value #>>\'{}\' IN (\'Test\', \'Admin\')))',
     convert('data', { 'roles': { $in: ['Test', 'Admin'] } }, ['roles']))
   })
+  it('$all', function() {
+    assert.equal('(data @> \'{ "roles": { "$all": ["Test","Admin"] } }\' OR (EXISTS (SELECT * ' +
+        'FROM jsonb_array_elements(data->\'roles\') WHERE jsonb_typeof(data->\'roles\')=\'array\' ' +
+        'AND value @> \'"Test"\') AND EXISTS (SELECT * FROM jsonb_array_elements(data->\'roles\') ' +
+        'WHERE jsonb_typeof(data->\'roles\')=\'array\' AND value @> \'"Admin"\')))',
+    convert('data', { 'roles': { $all: ['Test', 'Admin'] } }, ['roles']))
+  })
+  it('with another array', function() {
+    assert.equal('(data @> \'{ "roles": ["Test","Admin"] }\' OR EXISTS (SELECT * FROM jsonb_array_elements(data->\'roles\') WHERE jsonb_typeof(data->\'roles\')=\'array\' AND value @> \'["Test","Admin"]\'::jsonb))',
+      convert('data', { 'roles': ['Test', 'Admin'] }, ['roles']))
+  })
 })
 describe('special cases', function () {
   it('should return true when passed no parameters', function() {

util.js

@@ -49,7 +49,7 @@ exports.pathToObjectHelper = function(path) {
     if (typeof path[0] == 'string') {
       return `"${path[0]}"`
     } else {
-      return path[0]
+      return JSON.stringify(path[0])
     }
   }
   const [head, ...tail] = path