Release 2.6.2

mistic100 · Oct 9, 2021 · 75b61f2 · 75b61f2
2 parents d3603cb + 4649d1a
commit 75b61f2
Show file tree

Hide file tree

Showing 47 changed files with 154 additions and 82 deletions.
diff --git a/dist/css/query-builder.dark.css b/dist/css/query-builder.dark.css
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Copyright 2014-2021 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (https://opensource.org/licenses/MIT)
  */

diff --git a/dist/css/query-builder.dark.min.css b/dist/css/query-builder.dark.min.css
diff --git a/dist/css/query-builder.default.css b/dist/css/query-builder.default.css
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Copyright 2014-2021 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (https://opensource.org/licenses/MIT)
  */

diff --git a/dist/css/query-builder.default.min.css b/dist/css/query-builder.default.min.css
diff --git a/dist/i18n/query-builder.ar.js b/dist/i18n/query-builder.ar.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Arabic (ar)
  * Author: Mohamed YOUNES, https://github.com/MedYOUNES
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.az.js b/dist/i18n/query-builder.az.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Azerbaijan (az)
  * Author: Megaplan, mborisv <bm@megaplan.ru>
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.bg.js b/dist/i18n/query-builder.bg.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Bulgarian (bg)
  * Author: Valentin Hristov
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.cs.js b/dist/i18n/query-builder.cs.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Čeština (cs)
  * Author: Megaplan, mborisv <bm@megaplan.ru>
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.da.js b/dist/i18n/query-builder.da.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Danish (da)
  * Author: Jna Borup Coyle, github@coyle.dk
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.de.js b/dist/i18n/query-builder.de.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: German (de)
  * Author: "raimu"
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.el.js b/dist/i18n/query-builder.el.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Greek (el)
  * Author: Stelios Patsatzis, https://www.linkedin.com/in/stelios-patsatzis-89841561
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.en.js b/dist/i18n/query-builder.en.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: English (en)
  * Author: Damien "Mistic" Sorel, http://www.strangeplanet.fr
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.eo.js b/dist/i18n/query-builder.eo.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Esperanto (eo)
  * Author: Robin van der Vliet, https://robinvandervliet.com/
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.es.js b/dist/i18n/query-builder.es.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Spanish (es)
  * Author: "pyarza", "kddlb"
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.fa-IR.js b/dist/i18n/query-builder.fa-IR.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Farsi (fa-ir)
  * Author: Behzad Sedighzade, behzad.sedighzade@gmail.com
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.fr.js b/dist/i18n/query-builder.fr.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: French (fr)
  * Author: Damien "Mistic" Sorel, http://www.strangeplanet.fr
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.he.js b/dist/i18n/query-builder.he.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Hebrew (he)
  * Author: Kfir Stri https://github.com/kfirstri
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.hu.js b/dist/i18n/query-builder.hu.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Hungarian - Magyar (hu)
  * Author: Szabó Attila "Tailor993", https://www.tailor993.hu
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.it.js b/dist/i18n/query-builder.it.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Italian (it)
  * Author: davegraziosi, Giuseppe Lodi Rizzini
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.lt.js b/dist/i18n/query-builder.lt.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Lithuanian (lt)
  * Author: Dalius Guzauskas (aka Tichij), https://lt.linkedin.com/in/daliusg
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.nl.js b/dist/i18n/query-builder.nl.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Dutch (nl)
  * Author: "Roywcm"
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.no.js b/dist/i18n/query-builder.no.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Norwegian (no)
  * Author: Jna Borup Coyle, github@coyle.dk
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.pl.js b/dist/i18n/query-builder.pl.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Polish (pl)
  * Author: Artur Smolarek
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.pt-BR.js b/dist/i18n/query-builder.pt-BR.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Brazilian Portuguese (pr-BR)
  * Author: Leandro Gehlen, leandrogehlen@gmail.com; Marcos Ferretti, marcosvferretti@gmail.com
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.pt-PT.js b/dist/i18n/query-builder.pt-PT.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Portuguese (pt-PT)
  * Author: Miguel Guerreiro, migas.csi@gmail.com
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.ro.js b/dist/i18n/query-builder.ro.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Romanian (ro)
  * Author: ArianServ
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.ru.js b/dist/i18n/query-builder.ru.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Russian (ru)
  * Licensed under MIT (https://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/query-builder.sk.js b/dist/i18n/query-builder.sk.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Slovensky (sk)
  * Author: k2s
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.sq.js b/dist/i18n/query-builder.sq.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Albanian (sq)
  * Author: Tomor Pupovci
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.sv.js b/dist/i18n/query-builder.sv.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Svenska (sv)
  * Author: hekin1
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.sw.js b/dist/i18n/query-builder.sw.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Swahili (sw)
  * Author: Timothy Anyona
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.tr.js b/dist/i18n/query-builder.tr.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Turkish (tr)
  * Author: Aykut Alpgiray Ateş
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.ua.js b/dist/i18n/query-builder.ua.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Ukrainian (ua)
  * Author: Megaplan, mborisv <bm@megaplan.ru>
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/i18n/query-builder.zh-CN.js b/dist/i18n/query-builder.zh-CN.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: Simplified Chinese (zh_CN)
  * Author: shadowwind, shatteredwindgo@gmail.com
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/js/query-builder.js b/dist/js/query-builder.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Copyright 2014-2021 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (https://opensource.org/licenses/MIT)
  */
@@ -1812,7 +1812,7 @@ QueryBuilder.prototype.getRules = function(options) {
             };
 
             if (rule.filter && rule.filter.data || rule.data) {
-                ruleData.data = $.extendext(true, 'replace', {}, rule.filter.data, rule.data);
+                ruleData.data = $.extendext(true, 'replace', {}, rule.filter ? rule.filter.data : {}, rule.data);
             }
 
             if (options.get_flags) {
@@ -3154,28 +3154,39 @@ Utils.changeType = function(value, type) {
 /**
  * Escapes a string like PHP's mysql_real_escape_string does
  * @param {string} value
+ * @param {string} [additionalEscape] additionnal chars to escape
  * @returns {string}
  */
-Utils.escapeString = function(value) {
+Utils.escapeString = function(value, additionalEscape) {
     if (typeof value != 'string') {
         return value;
     }
 
-    return value
+    var escaped = value
         .replace(/[\0\n\r\b\\\'\"]/g, function(s) {
             switch (s) {
                 // @formatter:off
                 case '\0': return '\\0';
                 case '\n': return '\\n';
                 case '\r': return '\\r';
                 case '\b': return '\\b';
+                case '\'': return '\'\'';
                 default:   return '\\' + s;
                 // @formatter:off
             }
         })
         // uglify compliant
         .replace(/\t/g, '\\t')
         .replace(/\x1a/g, '\\Z');
+
+    if (additionalEscape) {
+        escaped = escaped
+            .replace(new RegExp('[' + additionalEscape + ']', 'g'), function(s) {
+                return '\\' + s;
+            });
+    }
+
+    return escaped;
 };
 
 /**
@@ -5374,12 +5385,12 @@ QueryBuilder.defaults({
         greater_or_equal: { op: '>= ?' },
         between: { op: 'BETWEEN ?', sep: ' AND ' },
         not_between: { op: 'NOT BETWEEN ?', sep: ' AND ' },
-        begins_with: { op: 'LIKE(?)', mod: '{0}%' },
-        not_begins_with: { op: 'NOT LIKE(?)', mod: '{0}%' },
-        contains: { op: 'LIKE(?)', mod: '%{0}%' },
-        not_contains: { op: 'NOT LIKE(?)', mod: '%{0}%' },
-        ends_with: { op: 'LIKE(?)', mod: '%{0}' },
-        not_ends_with: { op: 'NOT LIKE(?)', mod: '%{0}' },
+        begins_with: { op: 'LIKE ?', mod: '{0}%', escape: '%_' },
+        not_begins_with: { op: 'NOT LIKE ?', mod: '{0}%', escape: '%_' },
+        contains: { op: 'LIKE ?', mod: '%{0}%', escape: '%_' },
+        not_contains: { op: 'NOT LIKE ?', mod: '%{0}%', escape: '%_' },
+        ends_with: { op: 'LIKE ?', mod: '%{0}', escape: '%_' },
+        not_ends_with: { op: 'NOT LIKE ?', mod: '%{0}', escape: '%_' },
         is_empty: { op: '= \'\'' },
         is_not_empty: { op: '!= \'\'' },
         is_null: { op: 'IS NULL' },
@@ -5657,7 +5668,7 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
                                 v = v ? 1 : 0;
                             }
                             else if (!stmt && rule.type !== 'integer' && rule.type !== 'double' && rule.type !== 'boolean') {
-                                v = Utils.escapeString(v);
+                                v = Utils.escapeString(v, sql.escape);
                             }
 
                             if (sql.mod) {
@@ -5929,6 +5940,19 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
                     Utils.error('SQLParse', 'Cannot find field name in {0}', JSON.stringify(data.left));
                 }
 
+                // unescape chars declared by the operator
+                var finalValue = opVal.val;
+                var sql = self.settings.sqlOperators[opVal.op];
+                if (!stmt && sql && sql.escape) {
+                    var searchChars = sql.escape.split('').map(function(c) {
+                        return '\\\\' + c;
+                    }).join('|');
+                    finalValue = finalValue
+                        .replace(new RegExp('(' + searchChars + ')', 'g'), function(s) {
+                            return s[1];
+                        });
+                }
+
                 var id = self.getSQLFieldID(field, value);
 
                 /**
@@ -5943,7 +5967,7 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
                     id: id,
                     field: field,
                     operator: opVal.op,
-                    value: opVal.val
+                    value: finalValue
                 }, data);
 
                 curr.rules.push(rule);
@@ -6126,7 +6150,7 @@ QueryBuilder.extend(/** @lends module:plugins.UniqueFilter.prototype */ {
 
 
 /*!
- * jQuery QueryBuilder 2.6.1
+ * jQuery QueryBuilder 2.6.2
  * Locale: English (en)
  * Author: Damien "Mistic" Sorel, http://www.strangeplanet.fr
  * Licensed under MIT (https://opensource.org/licenses/MIT)

diff --git a/dist/js/query-builder.min.js b/dist/js/query-builder.min.js
diff --git a/dist/js/query-builder.min.js.map b/dist/js/query-builder.min.js.map