Fix #687 : Negation doubled when using setRulesFromSQL

Author: mistic100

src/plugins/not-group/plugin.js

@@ -66,20 +66,20 @@ QueryBuilder.define('not-group', function(options) {
 
             // 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 = new SQLParser.nodes.Op(
+                    self.settings.default_condition,
+                    e.value,
+                    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) {
+    this.on('sqlGroupsDistinct.filter', function(e, group, data, i) {
+        if (data.not && i > 0) {
             e.value = true;
         }
     });

src/plugins/sql-support/plugin.js

@@ -491,12 +491,13 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
                  * 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 {boolean} create - true by default if the group condition is different
                  * @param {object} group
                  * @param {object} AST
+                 * @param {int} current group level
                  * @returns {boolean}
                  */
-                var createGroup = self.change('sqlGroupsDistinct', i > 0 && curr.condition != data.operation.toUpperCase(), curr, data);
+                var createGroup = self.change('sqlGroupsDistinct', i > 0 && curr.condition != data.operation.toUpperCase(), curr, data, i);
 
                 if (createGroup) {
                     /**

tests/plugins.not-group.module.js

@@ -59,8 +59,13 @@ $(function () {
             sql,
             'Should export SQL with NOT function'
         );
+    });
 
-        $b.queryBuilder('reset');
+    QUnit.test('SQL import', function (assert) {
+        $b.queryBuilder({
+            filters: basic_filters,
+            plugins: ['not-group']
+        });
 
         $b.queryBuilder('setRulesFromSQL', sql);
 
@@ -85,6 +90,22 @@ $(function () {
             rules3,
             'Should parse NOT SQL function with same operation'
         );
+
+        $b.queryBuilder('setRulesFromSQL', sql4);
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            rules4,
+            'Should parse NOT SQL function with negated root group'
+        );
+
+        $b.queryBuilder('setRulesFromSQL', sql5);
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            rules5,
+            'Should parse NOT SQL function with double negated root group'
+        );
     });
 
     QUnit.test('Mongo export', function (assert) {
@@ -113,6 +134,7 @@ $(function () {
 
     var rules = {
         condition: 'OR',
+        not: false,
         rules: [{
             id: 'name',
             operator: 'equal',
@@ -137,6 +159,7 @@ $(function () {
 
     var rules2 = {
         condition: 'OR',
+        not: false,
         rules: [{
             id: 'name',
             operator: 'equal',
@@ -156,6 +179,7 @@ $(function () {
 
     var rules3 = {
         condition: 'OR',
+        not: false,
         rules: [{
             id: 'name',
             operator: 'equal',
@@ -178,6 +202,42 @@ $(function () {
 
     var sql3 = 'name = \'Mistic\' OR ( NOT ( price < 10.25 OR category IN(\'mo\', \'mu\') ) ) ';
 
+    var rules4 = {
+        condition: 'AND',
+        not: true,
+        rules: [{
+            id: 'price',
+            operator: 'less',
+            value: 10.25
+        }]
+    };
+
+    var sql4 = 'NOT ( price < 10.25 )';
+
+    var rules5 = {
+        condition: 'AND',
+        not: false,
+        rules: [{
+            condition: 'AND',
+            not: true,
+            rules: [{
+                id: 'price',
+                operator: 'less',
+                value: 10.25
+            }]
+        }, {
+            condition: 'AND',
+            not: true,
+            rules: [{
+                id: 'price',
+                operator: 'greater',
+                value: 20.5
+            }]
+        }]
+    };
+
+    var sql5 = 'NOT ( price < 10.25 ) AND NOT ( price > 20.5 )';
+
     var mongo = {
         "$or": [{
             "name": "Mistic"