Comparing version 3.3.0 to 3.3.1
@@ -113,3 +113,13 @@ var fhdb = require('./fhmongodb.js'); | ||
} else if (fields.hasOwnProperty(field)) { | ||
query[field] = convert.queryType(fields[field], field, expression); | ||
var queryField = {}; | ||
if ('undefined' !== typeof query[field]) { | ||
queryField = query[field]; | ||
} | ||
var convertedQueryField = convert.queryType(fields[field], field, expression); | ||
var convertedQueryFieldValue = convertedQueryField[expression]; | ||
queryField[expression] = convertedQueryFieldValue; | ||
query[field] = queryField; | ||
} | ||
@@ -700,2 +710,2 @@ } | ||
exports.Ditcher = Ditcher; | ||
exports.Ditcher = Ditcher; |
@@ -6,5 +6,5 @@ { | ||
"adm-zip": { | ||
"version": "0.4.7", | ||
"from": "adm-zip@>=0.4.4 <0.5.0", | ||
"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz" | ||
"version": "0.4.11", | ||
"from": "adm-zip@0.4.11", | ||
"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz" | ||
}, | ||
@@ -11,0 +11,0 @@ "archiver": { |
{ | ||
"name": "fh-db", | ||
"description": "FeedHenry Database Library", | ||
"version": "3.3.0", | ||
"version": "3.3.1", | ||
"repository": { | ||
@@ -22,3 +22,3 @@ "type": "git", | ||
"dependencies": { | ||
"adm-zip": "~0.4.4", | ||
"adm-zip": "0.4.11", | ||
"archiver": "1.0.0", | ||
@@ -36,4 +36,4 @@ "async": "1.5.2", | ||
"devDependencies": { | ||
"grunt": "^0.4.5", | ||
"grunt-fh-build": "~1.0.2", | ||
"grunt": "^1.0.2", | ||
"grunt-fh-build": "^2.0.0", | ||
"istanbul": "^0.3.17", | ||
@@ -40,0 +40,0 @@ "mocha": "^3.2.0", |
@@ -620,4 +620,4 @@ // Copyright (c) FeedHenry 2011 | ||
ditch.doList(doListRequest, function (err, listNeqRes) { | ||
assert.equal(listNeqRes.length, 3); | ||
ditch.doList(doListRequest, function (err, listNeRes) { | ||
assert.equal(listNeRes.length, 3); | ||
cb(); | ||
@@ -642,4 +642,4 @@ }); | ||
ditch.doList(doListRequest, function (err, listNeqRes) { | ||
assert.equal(listNeqRes.length, 2); | ||
ditch.doList(doListRequest, function (err, listGtRes) { | ||
assert.equal(listGtRes.length, 2); | ||
cb(); | ||
@@ -664,4 +664,4 @@ }); | ||
ditch.doList(doListRequest, function (err, listNeqRes) { | ||
assert.equal(listNeqRes.length, 3); | ||
ditch.doList(doListRequest, function (err, listGeRes) { | ||
assert.equal(listGeRes.length, 3); | ||
cb(); | ||
@@ -686,4 +686,4 @@ }); | ||
ditch.doList(doListRequest, function (err, listNeqRes) { | ||
assert.equal(listNeqRes.length, 2); | ||
ditch.doList(doListRequest, function (err, listLtRes) { | ||
assert.equal(listLtRes.length, 2); | ||
cb(); | ||
@@ -709,4 +709,4 @@ }); | ||
ditch.doList(doListRequest, function (err, listNeqRes) { | ||
assert.equal(listNeqRes.length, 3); | ||
ditch.doList(doListRequest, function (err, listLeRes) { | ||
assert.equal(listLeRes.length, 3); | ||
cb(); | ||
@@ -732,5 +732,5 @@ }); | ||
ditch.doList(doListRequest, function (err, listNeqRes) { | ||
assert.equal(listNeqRes.length, 1); | ||
listNeqRes[0].idx = 1; | ||
ditch.doList(doListRequest, function (err, listLikeRes) { | ||
assert.equal(listLikeRes.length, 1); | ||
listLikeRes[0].idx = 1; | ||
cb(); | ||
@@ -755,5 +755,5 @@ }); | ||
ditch.doList(doListRequest, function (err, listNeqRes) { | ||
assert.equal(listNeqRes.length, 4); | ||
listNeqRes[0].idx = 1; | ||
ditch.doList(doListRequest, function (err, listLikeRes) { | ||
assert.equal(listLikeRes.length, 4); | ||
listLikeRes[0].idx = 1; | ||
cb(); | ||
@@ -778,5 +778,5 @@ }); | ||
ditch.doList(doListRequest, function (err, listNeqRes) { | ||
assert.equal(listNeqRes.length, 4); | ||
listNeqRes[0].idx = 1; | ||
ditch.doList(doListRequest, function (err, listLikeRes) { | ||
assert.equal(listLikeRes.length, 4); | ||
listLikeRes[0].idx = 1; | ||
cb(); | ||
@@ -801,5 +801,5 @@ }); | ||
ditch.doList(doListRequest, function (err, listNeqRes) { | ||
assert.equal(listNeqRes.length, 3); | ||
listNeqRes[0].idx = 1; | ||
ditch.doList(doListRequest, function (err, listLikeRes) { | ||
assert.equal(listLikeRes.length, 3); | ||
listLikeRes[0].idx = 1; | ||
cb(); | ||
@@ -827,6 +827,6 @@ }); | ||
ditch.doList(doListRequest, function (err, listGtltRes) { | ||
assert.equal(listGtltRes.length, 2); | ||
assert.equal(listGtltRes[0].fields.idx, 2); | ||
assert.equal(listGtltRes[1].fields.idx, 4); | ||
ditch.doList(doListRequest, function (err, listMultiGtRes) { | ||
assert.equal(listMultiGtRes.length, 2); | ||
assert.equal(listMultiGtRes[0].fields.idx, 2); | ||
assert.equal(listMultiGtRes[1].fields.idx, 4); | ||
cb(); | ||
@@ -859,2 +859,109 @@ }); | ||
var testList13 = function (cb) { | ||
logger.info("test testList13()"); | ||
var doListRequest = { | ||
"__fhdb": test_fhdb_name, | ||
"type": "fh_test_list", | ||
"gt": { | ||
"num1": { value: 110, type: "Number" } | ||
}, | ||
"le": { | ||
"num1": { value: 130, type: "Number" } | ||
} | ||
}; | ||
if (useOwnDatabase) { | ||
doListRequest.__dbperapp = true; | ||
} | ||
ditch.doList(doListRequest, function (err, listGtLeRes) { | ||
assert.equal(listGtLeRes.length, 2); | ||
assert.equal(listGtLeRes[0].fields.idx, 3); | ||
assert.equal(listGtLeRes[1].fields.idx, 4); | ||
cb(); | ||
}); | ||
}; | ||
var testList14 = function (cb) { | ||
logger.info("test testList14()"); | ||
var doListRequest = { | ||
"__fhdb": test_fhdb_name, | ||
"type": "fh_test_list", | ||
"eq": { | ||
"foo": { value: "bar", type: "String" }, | ||
"num1": { value: 130, type: "Number" }, | ||
"num2": { value: 500, type: "Number" } | ||
} | ||
}; | ||
if (useOwnDatabase) { | ||
doListRequest.__dbperapp = true; | ||
} | ||
ditch.doList(doListRequest, function (err, listMultiEqRes) { | ||
assert.equal(listMultiEqRes.length, 1); | ||
assert.equal(listMultiEqRes[0].fields.idx, 4); | ||
cb(); | ||
}); | ||
}; | ||
var testList15 = function (cb) { | ||
logger.info("test testList15()"); | ||
var doListRequest = { | ||
"__fhdb": test_fhdb_name, | ||
"type": "fh_test_list", | ||
"eq": { | ||
"foo": { value: "bar", type: "String" }, | ||
}, | ||
"lt": { | ||
"num1": { value: 130, type: "Number" } | ||
}, | ||
"gt": { | ||
"num2": { value: 500, type: "Number" } | ||
} | ||
}; | ||
if (useOwnDatabase) { | ||
doListRequest.__dbperapp = true; | ||
} | ||
ditch.doList(doListRequest, function (err, listEqLtGtRes) { | ||
assert.equal(listEqLtGtRes.length, 1); | ||
assert.equal(listEqLtGtRes[0].fields.idx, 2); | ||
cb(); | ||
}); | ||
}; | ||
var testList16 = function (cb) { | ||
logger.info("test testList16()"); | ||
var doListRequest = { | ||
"__fhdb": test_fhdb_name, | ||
"type": "fh_test_list", | ||
"ne": { | ||
"foo": { value: "foo", type: "String" }, | ||
}, | ||
"lt": { | ||
"num1": { value: 130, type: "Number" } | ||
}, | ||
"gt": { | ||
"num2": { value: 500, type: "Number" } | ||
} | ||
}; | ||
if (useOwnDatabase) { | ||
doListRequest.__dbperapp = true; | ||
} | ||
ditch.doList(doListRequest, function (err, listNeLtGtRes) { | ||
assert.equal(listNeLtGtRes.length, 1); | ||
assert.equal(listNeLtGtRes[0].fields.idx, 2); | ||
cb(); | ||
}); | ||
}; | ||
var testListLimit = function (cb) { | ||
@@ -1385,2 +1492,6 @@ logger.info("test testListLimit()"); | ||
testList12, | ||
testList13, | ||
testList14, | ||
testList15, | ||
testList16, | ||
testBadCreate, | ||
@@ -1410,2 +1521,2 @@ testBadCreateNoFields, | ||
}); | ||
}; | ||
}; |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
New author
Supply chain riskA new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
New author
Supply chain riskA new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.
Found 1 instance in 1 package
198430
4544
1
35
+ Addedadm-zip@0.4.11(transitive)
- Removedadm-zip@0.4.16(transitive)
Updatedadm-zip@0.4.11