Close #334 sql-support compatible with custom methods

Author: mistic100

.editorconfig

@@ -13,3 +13,6 @@ insert_final_newline = false
 
 [*.scss]
 indent_size = 2
+
+[*.html]
+indent_size = 2

bower.json

@@ -25,7 +25,7 @@
     "bootstrap-select": "^1.10.0",
     "bootbox": "^4.4.0",
     "awesome-bootstrap-checkbox": "^0.3.0",
-    "sql-parser": "^1.0.0",
+    "sql-parser": "^1.1.0",
     "bind-polyfill": "~1.0.0",
     "interact": "^1.2.6"
   },

src/plugins/mongodb-support/plugin.js

@@ -7,6 +7,7 @@
 // ===============================
 QueryBuilder.defaults({
     mongoOperators: {
+        // @formatter:off
         equal:            function(v) { return v[0]; },
         not_equal:        function(v) { return { '$ne': v[0] }; },
         in:               function(v) { return { '$in': v }; },
@@ -27,6 +28,7 @@ QueryBuilder.defaults({
         is_not_empty:     function(v) { return { '$ne': '' }; },
         is_null:          function(v) { return null; },
         is_not_null:      function(v) { return { '$ne': null }; }
+        // @formatter:on
     },
 
     mongoRuleOperators: {
@@ -130,7 +132,7 @@ QueryBuilder.extend({
                     var ruleExpression = {};
                     var field = self.change('getMongoDBField', rule.field, rule);
                     ruleExpression[field] = mdb.call(self, values);
-                    parts.push(self.change('ruleToMongo', ruleExpression, rule));
+                    parts.push(self.change('ruleToMongo', ruleExpression, rule, values, mdb));
                 }
             });
 

src/plugins/sql-support/plugin.js

@@ -290,8 +290,12 @@ QueryBuilder.extend({
                         });
                     }
 
-                    var ruleExpression = self.change('getSQLField', rule.field, rule) + ' ' + sql.op.replace(/\?/, value);
-                    parts.push(self.change('ruleToSQL', ruleExpression, rule));
+                    var sqlFn = function(v) {
+                        return sql.op.replace(/\?/, v);
+                    };
+
+                    var ruleExpression = self.change('getSQLField', rule.field, rule) + ' ' + sqlFn(value);
+                    parts.push(self.change('ruleToSQL', ruleExpression, rule, value, sqlFn));
                 }
             });
 
@@ -413,10 +417,6 @@ QueryBuilder.extend({
             }
             // it's a leaf
             else {
-                if (data.left.value === undefined || data.right.value === undefined) {
-                    Utils.error('SQLParse', 'Missing field and/or value');
-                }
-
                 if ($.isPlainObject(data.right.value)) {
                     Utils.error('SQLParse', 'Value format not supported for {0}.', data.left.value);
                 }

tests/plugins.sql-support.module.js

@@ -191,6 +191,84 @@ $(function () {
         );
     });
 
+    QUnit.test('Custom export/parsing', function (assert) {
+        var rules = {
+            condition: 'AND',
+            rules: [
+                {
+                    id: 'name',
+                    operator: 'equal',
+                    value: 'Mistic'
+                },
+                {
+                    id: 'last_days',
+                    operator: 'greater',
+                    value: 5
+                }
+            ]
+        };
+
+        var sql = 'name = \'Mistic\' AND display_date > DATE_SUB(NOW(), INTERVAL 5 DAY)';
+
+        $b.queryBuilder({
+            filters: [
+                {
+                    id: 'name',
+                    type: 'string'
+                },
+                {
+                    id: 'last_days',
+                    field: 'display_date',
+                    type: 'integer',
+                    operators: ['greater']
+                }
+            ]
+        });
+
+        $b.on('ruleToSQL.queryBuilder.filter', function (e, rule, sqlValue, sqlOperator) {
+            if (rule.id === 'last_days') {
+                e.value = rule.field + ' ' + sqlOperator('DATE_SUB(NOW(), INTERVAL ' + sqlValue + ' DAY)');
+            }
+        });
+
+        $b.on('parseSQLNode.queryBuilder.filter', function (e) {
+            var data = e.value;
+            // left must be the field name and right must be the date_sub function
+            if (data.left && data.left.value == 'display_date' && data.operation == '>' && data.right && data.right.name == 'DATE_SUB') {
+                var right = data.right;
+                // 1st argument is "NOW()" and 2nd argument is a list
+                if (right.arguments.value.length === 2 && right.arguments.value[1].value.length === 3) {
+                    var params = right.arguments.value[1].value;
+                    // 1st item is "INTERVAL", 2nd item is the value, 3rd item is "DAY"
+                    if (params[0].value == 'INTERVAL' && params[2].value == 'DAY') {
+                        e.value = {
+                            id: 'last_days',
+                            operator: 'greater',
+                            value: params[1].value
+                        };
+                    }
+                }
+            }
+        });
+
+        $b.queryBuilder('setRules', rules);
+
+        assert.equal(
+            $b.queryBuilder('getSQL').sql,
+            sql,
+            'Should export custom date_sub function'
+        );
+
+        $b.queryBuilder('reset');
+        $b.queryBuilder('setRulesFromSQL', sql);
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            rules,
+            'Should parse date_sub function'
+        );
+    });
+
 
     var basic_rules_sql_raw = {
         sql: 'price < 10.25 AND name IS NULL AND ( category IN(\'mo\', \'mu\') OR id != \'1234-azer-5678\' ) '