Fix #684 : getSQL issue with consecutive dollar signs

Author: mistic100

package.json

@@ -50,7 +50,7 @@
     "jit-grunt": "^0.10.0",
     "qunit": "^2.5.1",
     "selectize": "^0.12.4",
-    "sql-parser-mistic": "^1.2.0",
+    "sql-parser-mistic": "^1.2.2",
     "time-grunt": "^1.3.0"
   },
   "keywords": [
@@ -69,6 +69,7 @@
     "url": "https://github.com/mistic100/jQuery-QueryBuilder/issues"
   },
   "scripts": {
+    "serve": "grunt serve",
     "test": "grunt test"
   }
 }

src/plugins/sql-support/plugin.js

@@ -328,7 +328,9 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
                     }
 
                     var sqlFn = function(v) {
-                        return sql.op.replace('?', v);
+                        return sql.op.replace('?', function() {
+                            return v;
+                        });
                     };
 
                     /**

tests/plugins.sql-support.module.js

@@ -131,6 +131,35 @@ $(function() {
         );
     });
 
+    QUnit.test('Special chars', function(assert) {
+        // PhantomJS is broken https://github.com/ariya/phantomjs/issues/14921
+        if (!!window._phantom) {
+            assert.ok(true, 'Test ignore in PhantomJS');
+            return;
+        }
+
+        var chars = ['\'', '"', '$1', '$$', '$&', '$`', '$\''];
+
+        var sql = "name = '\\'' AND name = '\\\"' AND name = '$1' AND " +
+            "name = '$$' AND name = '$&' AND name = '$`' AND name = '$\\''";
+
+        $b.queryBuilder({
+            filters: basic_filters,
+            rules: chars.map(function(char) {
+                return {
+                    id: 'name',
+                    value: char
+                };
+            })
+        });
+
+        assert.equal(
+            $b.queryBuilder('getSQL').sql,
+            sql,
+            'Should output SQL with escaped special chars'
+        );
+    });
+
     QUnit.test('All operators', function(assert) {
         $b.queryBuilder({
             filters: basic_filters,