Merge pull request #74 from medic/uniquewithin-validation-fix

fixed uniqueWithin validation bugs.

Author: mandric

db.js

@@ -42,6 +42,8 @@ module.exports.user = settings.username;
 module.exports.fti = function(index, data, cb) {
     var path = '/_fti/local' + settings.db 
         + '/_design' + settings.db + '/' + index;
+    logger.debug('fti path: ', path);
+    logger.debug('fti query: ', data);
     client.request({
         path: path,
         query: data

lib/validation.js

@@ -33,8 +33,14 @@ var _exists = function(doc, query, callback) {
 
 var _formatParam = function(name, value) {
     name = name.replace(/"/g, '');
-    value = value.replace(/"/g, '\\"');
-    return name + ':"' + value + '"';
+    if (typeof value === 'string') {
+        value = value.replace(/"/g, '\\"');
+        return name + ':"' + value + '"';
+    }
+    if (typeof value === 'number') {
+        return name + '<int>:' + value;
+    }
+    return name + ':' + value;
 };
 
 module.exports = {
@@ -92,12 +98,15 @@ module.exports = {
             });
         },
         uniqueWithin: function(doc, validation, callback) {
-            var fields = validation.funcArgs;
+            var fields = _.clone(validation.funcArgs);
             var duration = _parseDuration(fields.pop());
             var conjunctions = _.map(fields, function(field) {
                 return _formatParam(field, doc[field]);
             });
-            var start = moment().subtract(duration).toISOString();
+            // lucene date range query bug
+            // fails: "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+            // works: "yyyy-MM-dd'T'HH:mm:ss.SSS"
+            var start = moment().subtract(duration).toISOString().replace(/Z$/,'');
             var endOfTime = '3000-01-01T00:00:00';
             conjunctions.push(
                 'reported_date<date>:[' +  start + ' TO ' + endOfTime + ']'

test/unit/reminders.js

@@ -121,9 +121,11 @@ exports['runReminder decorates options with moment if found'] = function(test) {
 };
 
 exports['does not match reminder if in next minute'] = function(test) {
-    var window = sinon.stub(reminders, 'getReminderWindow').callsArgWithAsync(1, null, moment().subtract(1, 'hour')),
+    var past = moment().subtract(1, 'hour'),
         now = moment();
 
+    var window = sinon.stub(reminders, 'getReminderWindow').callsArgWithAsync(1, null, past);
+
     reminders.matchReminder({
         reminder: {
             cron: (now.minutes() + 1) + ' ' + now.format('HH * * *') // will generate cron job matching the current hour but 1 minute into future

test/unit/validations.js

@@ -229,7 +229,11 @@ exports['pass uniqueWithin validation on old doc'] = function(test) {
         xyz: '444'
     };
     validation.validate(doc, validations, function(errors) {
-        var start = moment().subtract('weeks', 2).toISOString();
+        // lucene date range query bug:
+        // https://github.com/rnewson/couchdb-lucene/issues/225
+        // fails: "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+        // works: "yyyy-MM-dd'T'HH:mm:ss.SSS"
+        var start = moment().subtract('weeks', 2).toISOString().replace('Z','');
         test.ok(fti.calledWith('data_records', {
             q: 'xyz:"444" AND reported_date<date>:[' + start + ' TO 3000-01-01T00:00:00]',
             include_docs: true
@@ -265,6 +269,22 @@ exports['formatParam rejects quotes in field names'] = function(test) {
     test.done();
 };
 
+exports['formatParam quotes strings'] = function(test) {
+    test.same(
+        validation._formatParam('birds', 'pigeon'),
+        'birds:"pigeon"'
+    );
+    test.done();
+};
+
+exports['formatParam use <int> query on integers'] = function(test) {
+    test.same(
+        validation._formatParam('lmp', 11),
+        'lmp<int>:11'
+    );
+    test.done();
+};
+
 exports['pass exists validation when matching document'] = function(test) {
     test.expect(2);
     // simulate view results with doc attribute