Fix mistic100#641 not-group parsing errors from SQL

Author: mistic100

src/plugins/not-group/plugin.js

@@ -63,10 +63,27 @@ QueryBuilder.define('not-group', function(options) {
     this.on('parseSQLNode.filter', function(e) {
         if (e.value.name && e.value.name.toUpperCase() == 'NOT') {
             e.value = e.value.arguments.value[0];
+
+            // if the there is no sub-group, create one
+            if (['AND', 'OR'].indexOf(e.value.operation.toUpperCase()) === -1) {
+                e.value = {
+                    left: e.value,
+                    operation: self.settings.default_condition,
+                    right: null
+                };
+            }
+
             e.value.not = true;
         }
     });
 
+    // Request to create sub-group if the "not" flag is set
+    this.on('sqlGroupsDistinct.filter', function(e, group, data) {
+        if (data.not) {
+            e.value = true;
+        }
+    });
+
     // Read "not" from parsed SQL
     this.on('sqlToGroup.filter', function(e, data) {
         e.value.not = !!data.not;

src/plugins/sql-support/plugin.js

@@ -457,6 +457,10 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
         var curr = out;
 
         (function flatten(data, i) {
+            if (data === null) {
+                return;
+            }
+
             // allow plugins to manually parse or handle special cases
             data = self.change('parseSQLNode', data);
 
@@ -480,7 +484,19 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
             // it's a node
             if (['AND', 'OR'].indexOf(data.operation.toUpperCase()) !== -1) {
                 // create a sub-group if the condition is not the same and it's not the first level
-                if (i > 0 && curr.condition != data.operation.toUpperCase()) {
+
+                /**
+                 * Given an existing group and an AST node, determines if a sub-group must be created
+                 * @event changer:sqlGroupsDistinct
+                 * @memberof module:plugins.SqlSupport
+                 * @param {boolean} create - try by default if the group condition is different
+                 * @param {object} group
+                 * @param {object} AST
+                 * @returns {boolean}
+                 */
+                var createGroup = self.change('sqlGroupsDistinct', i > 0 && curr.condition != data.operation.toUpperCase(), curr, data);
+
+                if (createGroup) {
                     /**
                      * Modifies the group generated from the SQL expression (this is called before the group is filled with rules)
                      * @event changer:sqlToGroup

tests/plugins.not-group.module.js

@@ -69,6 +69,22 @@ $(function () {
             rules,
             'Should parse NOT SQL function'
         );
+
+        $b.queryBuilder('setRulesFromSQL', sql2);
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            rules2,
+            'Should parse NOT SQL function with only one rule'
+        );
+
+        $b.queryBuilder('setRulesFromSQL', sql3);
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            rules3,
+            'Should parse NOT SQL function with same operation'
+        );
     });
 
     QUnit.test('Mongo export', function (assert) {
@@ -119,6 +135,49 @@ $(function () {
 
     var sql = 'name = \'Mistic\' OR ( NOT ( price < 10.25 AND category IN(\'mo\', \'mu\') ) ) ';
 
+    var rules2 = {
+        condition: 'OR',
+        rules: [{
+            id: 'name',
+            operator: 'equal',
+            value: 'Mistic'
+        }, {
+            condition: 'AND',
+            not: true,
+            rules: [{
+                id: 'price',
+                operator: 'less',
+                value: 10.25
+            }]
+        }]
+    };
+
+    var sql2 = 'name = \'Mistic\' OR ( NOT ( price < 10.25 ) ) ';
+
+    var rules3 = {
+        condition: 'OR',
+        rules: [{
+            id: 'name',
+            operator: 'equal',
+            value: 'Mistic'
+        }, {
+            condition: 'OR',
+            not: true,
+            rules: [{
+                id: 'price',
+                operator: 'less',
+                value: 10.25
+            }, {
+                id: 'category',
+                field: 'category',
+                operator: 'in',
+                value: ['mo', 'mu']
+            }]
+        }]
+    };
+
+    var sql3 = 'name = \'Mistic\' OR ( NOT ( price < 10.25 OR category IN(\'mo\', \'mu\') ) ) ';
+
     var mongo = {
         "$or": [{
             "name": "Mistic"