Fix mistic100#544 Always convert int, float and bool values

Author: mistic100

src/core.js

@@ -682,7 +682,7 @@ QueryBuilder.prototype.createRuleInput = function(rule) {
     $valueContainer.show();
 
     $inputs.on('change ' + (filter.input_event || ''), function() {
-        if (!this._updating_input) {
+        if (!rule._updating_input) {
             rule._updating_value = true;
             rule.value = self.getRuleInputValue(rule);
             rule._updating_value = false;
@@ -770,6 +770,9 @@ QueryBuilder.prototype.updateRuleOperator = function(rule, previousOperator) {
 
     if (rule.operator) {
         rule.$el.find(QueryBuilder.selectors.rule_operator).val(rule.operator.type);
+
+        // refresh value if the format changed for this operator
+        rule.__.value = this.getRuleInputValue(rule);
     }
 
     /**
@@ -782,9 +785,6 @@ QueryBuilder.prototype.updateRuleOperator = function(rule, previousOperator) {
     this.trigger('afterUpdateRuleOperator', rule, previousOperator);
 
     this.trigger('rulesChanged');
-
-    // FIXME is it necessary ?
-    this.updateRuleValue(rule, ruleValue);
 };
 
 /**

src/data.js

@@ -417,11 +417,20 @@ QueryBuilder.prototype.getRuleInputValue = function(rule) {
             }
         }
 
-        if (operator.multiple && filter.value_separator) {
-            value = value.map(function(val) {
-                return val.split(filter.value_separator);
-            });
-        }
+        value = value.map(function(val) {
+            if (operator.multiple && filter.value_separator && typeof val == 'string') {
+                val = val.split(filter.value_separator);
+            }
+
+            if ($.isArray(val)) {
+                return val.map(function(subval) {
+                    return Utils.changeType(subval, filter.type);
+                });
+            }
+            else {
+                return Utils.changeType(val, filter.type);
+            }
+        });
 
         if (operator.nb_inputs === 1) {
             value = value[0];
@@ -458,7 +467,7 @@ QueryBuilder.prototype.setRuleInputValue = function(rule, value) {
         return;
     }
 
-    this._updating_input = true;
+    rule._updating_input = true;
 
     if (filter.valueSetter) {
         filter.valueSetter.call(this, rule, value);
@@ -499,7 +508,7 @@ QueryBuilder.prototype.setRuleInputValue = function(rule, value) {
         }
     }
 
-    this._updating_input = false;
+    rule._updating_input = false;
 };
 
 /**

src/plugins/mongodb-support/plugin.js

@@ -132,7 +132,6 @@ QueryBuilder.extend(/** @lends module:plugins.MongoDbSupport.prototype */ {
                 else {
                     var mdb = self.settings.mongoOperators[rule.operator];
                     var ope = self.getOperatorByType(rule.operator);
-                    var values = [];
 
                     if (mdb === undefined) {
                         Utils.error('UndefinedMongoOperator', 'Unknown MongoDB operation for operator "{0}"', rule.operator);
@@ -142,10 +141,6 @@ QueryBuilder.extend(/** @lends module:plugins.MongoDbSupport.prototype */ {
                         if (!(rule.value instanceof Array)) {
                             rule.value = [rule.value];
                         }
-
-                        rule.value.forEach(function(v) {
-                            values.push(Utils.changeType(v, rule.type, false));
-                        });
                     }
 
                     /**
@@ -159,7 +154,7 @@ QueryBuilder.extend(/** @lends module:plugins.MongoDbSupport.prototype */ {
                     var field = self.change('getMongoDBField', rule.field, rule);
 
                     var ruleExpression = {};
-                    ruleExpression[field] = mdb.call(self, values);
+                    ruleExpression[field] = mdb.call(self, rule.value);
 
                     /**
                      * Modifies the MongoDB expression generated for a rul
@@ -171,7 +166,7 @@ QueryBuilder.extend(/** @lends module:plugins.MongoDbSupport.prototype */ {
                      * @param {function} valueWrapper - function that takes the value and adds the operator
                      * @returns {object}
                      */
-                    parts.push(self.change('ruleToMongo', ruleExpression, rule, values, mdb));
+                    parts.push(self.change('ruleToMongo', ruleExpression, rule, rule.value, mdb));
                 }
             });
 

src/plugins/sql-support/plugin.js

@@ -256,7 +256,9 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
         nl = !!nl ? '\n' : ' ';
         var boolean_as_integer = this.getPluginOptions('sql-support', 'boolean_as_integer');
 
-        if (stmt === true) stmt = 'question_mark';
+        if (stmt === true) {
+            stmt = 'question_mark';
+        }
         if (typeof stmt == 'string') {
             var config = getStmtConfig(stmt);
             stmt = this.settings.sqlStatements[config[1]](config[2]);
@@ -301,10 +303,10 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
                                 value += sql.sep;
                             }
 
-                            if (rule.type == 'integer' || rule.type == 'double' || rule.type == 'boolean') {
-                                v = Utils.changeType(v, rule.type, boolean_as_integer);
+                            if (rule.type == 'boolean' && boolean_as_integer) {
+                                v = v ? 1 : 0;
                             }
-                            else if (!stmt) {
+                            else if (!stmt && rule.type !== 'integer' && rule.type !== 'double' && rule.type !== 'boolean') {
                                 v = Utils.escapeString(v);
                             }
 

src/utils.js

@@ -103,17 +103,30 @@ Utils.error = function() {
  * Changes the type of a value to int, float or bool
  * @param {*} value
  * @param {string} type - 'integer', 'double', 'boolean' or anything else (passthrough)
- * @param {boolean} [boolAsInt=false] - return 0 or 1 for booleans
  * @returns {*}
  */
-Utils.changeType = function(value, type, boolAsInt) {
+Utils.changeType = function(value, type) {
+    if (value === '' || value === undefined) {
+        return undefined;
+    }
+
     switch (type) {
-        // @formatter:off
-    case 'integer': return parseInt(value);
-    case 'double': return parseFloat(value);
+    // @formatter:off
+    case 'integer':
+        if (typeof value === 'string' && !/^-?\d+$/.test(value)) {
+            return value;
+        }
+        return parseInt(value);
+    case 'double':
+        if (typeof value === 'string' && !/^-?\d+\.?\d*$/.test(value)) {
+            return value;
+        }
+        return parseFloat(value);
     case 'boolean':
-        var bool = value.trim().toLowerCase() === 'true' || value.trim() === '1' || value === 1;
-        return boolAsInt ? (bool ? 1 : 0) : bool;
+        if (typeof value === 'string' && !/^(0|1|true|false){1}$/i.test(value)) {
+            return value;
+        }
+        return value === true || value === 1 || value.toLowerCase() === 'true' || value === '1';
     default: return value;
     // @formatter:on
     }

tests/data.module.js

@@ -414,7 +414,7 @@ $(function() {
                 }, {
                     id: 'age',
                     operator: 'not_in',
-                    value: ['16', '17', '18']
+                    value: [16, 17, 18]
                 }]
             },
             'Should split values on comma and pipe'

tests/plugins.mongo-support.module.js

@@ -126,27 +126,27 @@ $(function(){
         }, {
             id: 'price',
             operator: 'less',
-            value: '5'
+            value: 5
         }, {
             id: 'price',
             operator: 'less_or_equal',
-            value: '5'
+            value: 5
         }, {
             id: 'price',
             operator: 'greater',
-            value: '4'
+            value: 4
         }, {
             id: 'price',
             operator: 'greater_or_equal',
-            value: '4'
+            value: 4
         }, {
             id: 'price',
             operator: 'between',
-            value: ['4','5']
+            value: [4,5]
         }, {
             id: 'price',
             operator: 'not_between',
-            value: ['4','5']
+            value: [4,5]
         }, {
             id: 'name',
             operator: 'begins_with',

tests/plugins.sql-support.module.js

@@ -406,27 +406,27 @@ $(function() {
         }, {
             id: 'price',
             operator: 'less',
-            value: '5'
+            value: 5
         }, {
             id: 'price',
             operator: 'less_or_equal',
-            value: '5'
+            value: 5
         }, {
             id: 'price',
             operator: 'greater',
-            value: '4'
+            value: 4
         }, {
             id: 'price',
             operator: 'greater_or_equal',
-            value: '4'
+            value: 4
         }, {
             id: 'price',
             operator: 'between',
-            value: ['4', '5']
+            value: [4,5]
         }, {
             id: 'price',
             operator: 'not_between',
-            value: ['4', '5']
+            value: [4,5]
         }, {
             id: 'name',
             operator: 'begins_with',

tests/utils.module.js

@@ -95,11 +95,6 @@ $(function () {
             '"10" should be parsed as integer'
         );
 
-        assert.ok(
-            Utils.changeType('10.5', 'integer') === 10,
-            '"10.5" should be parsed as integer'
-        );
-
         assert.ok(
             Utils.changeType('10.5', 'double') === 10.5,
             '"10.5" should be parsed as double'
@@ -109,11 +104,6 @@ $(function () {
             Utils.changeType('true', 'boolean') === true,
             '"true" should be parsed as boolean'
         );
-
-        assert.ok(
-            Utils.changeType('false', 'boolean', true) === 0,
-            '"false" should be parsed as integer'
-        );
     });
 
     /**