\ \ @@ -37,7 +37,7 @@ QueryBuilder.templates.rule = '\ \ diff --git a/src/utils.js b/src/utils.js index ef9c81b7..0353170d 100644 --- a/src/utils.js +++ b/src/utils.js @@ -142,6 +142,127 @@ Utils.changeType = function(value, type) { } }; +/* +Utils.escapeUnderscore = function(sql) { + if (typeof sql != 'string') { + return sql; + } + var regexp = /LIKE ('([^']+)')/g; + var regexp2 = /LIKE([(]'([^']+)'[)])/g; + + var contains = /^%[^%]*%$/g; + var starts = /^[^%]*%$/g; + var ends = /^%[^%]*$/g; + + var contains_unescaped = /^%([^\\]+)([_%])(.*)%$/g; + var starts_unescaped = /^([^%\\]+)([_%])(.*)%$/g; + var ends_unescaped = /^%([^\\]+)([_%])([^%]*)$/g; + + //var modified = false; + var match =null; + while ((match = regexp.exec(sql))) { + + console.log(match[1]); + var m1,m2,m3 = null; + var ma1,ma2,ma3 = null; + // match[1]; + + if (match[2].match(contains)) { + while((m1 = contains_unescaped.exec(match[2])) !== null) { + console.log(match[2]+" contains"); + console.log(m1); + ma1 = '%' + m1[1] + '\\' + m1[2] + (m1[3] ? m1[3] : "") + '%'; + console.log("ma1 ="+ ma1); + if (ma1) { + sql = sql.replace(match[1], match[1] + " ESCAPE '\\'"); + console.log("replace "+match[2]+" with "+ma1 ); + sql = sql.replace(match[2], ma1); + //modified = true; + } + } + + } else if (match[2].match(starts)) { + while((m2 = starts_unescaped.exec(match[2])) !== null) { + console.log(match[2]+" starts"); + console.log(m2); + ma2 = m2[1] + '\\' + m2[2] + (m2[3] ? m2[3] : "") + '%'; + console.log("ma2 ="+ ma2); + if (ma2) { + sql = sql.replace(match[1], match[1] + " ESCAPE '\\'"); + console.log("replace "+match[2]+" with "+ma2 ); + sql = sql.replace(match[2], ma2); + //modified = true; + } + } + } else if (match[2].match(ends)) { + while((m3 = ends_unescaped.exec(match[2])) !== null) { + console.log(match[2]+" ends"); + console.log(m3); + ma3 = '%' + m3[1] + '\\' + m3[2] + (m3[3] ? m3[3] : ""); + console.log("ma3 ="+ ma3); + if (ma3) { + sql = sql.replace(match[1], match[1] + " ESCAPE '\\'"); + console.log("replace "+match[2]+" with "+ma3 ); + sql = sql.replace(match[2], ma3); + //modified = true; + } + } + } + } + + while ((match = regexp2.exec(sql))) { + console.log(match[1]); + var m1,m2,m3 = null; + var ma1,ma2,ma3 = null; + // match[1]; + + if (match[2].match(contains)) { + while((m1 = contains_unescaped.exec(match[2])) !== null) { + console.log(match[2]+" contains"); + console.log(m1); + ma1 = '%' + m1[1] + '\\' + m1[2] + (m1[3] ? m1[3] : "") + '%'; + console.log("ma1 ="+ ma1); + if (ma1) { + sql = sql.replace(match[1], match[1] + " ESCAPE '\\'"); + console.log("replace "+match[2]+" with "+ma1 ); + sql = sql.replace(match[2], ma1); + //modified = true; + } + } + + } else if (match[2].match(starts)) { + while((m2 = starts_unescaped.exec(match[2])) !== null) { + console.log(match[2]+" starts"); + console.log(m2); + ma2 = m2[1] + '\\' + m2[2] + (m2[3] ? m2[3] : "") + '%'; + console.log("ma2 ="+ ma2); + if (ma2) { + sql = sql.replace(match[1], match[1] + " ESCAPE '\\'"); + console.log("replace "+match[2]+" with "+ma2 ); + sql = sql.replace(match[2], ma2); + //modified = true; + } + } + } else if (match[2].match(ends)) { + while((m3 = ends_unescaped.exec(match[2])) !== null) { + console.log(match[2]+" ends"); + console.log(m3); + ma3 = '%' + m3[1] + '\\' + m3[2] + (m3[3] ? m3[3] : ""); + console.log("ma3 ="+ ma3); + if (ma3) { + sql = sql.replace(match[1], match[1] + " ESCAPE '\\'"); + console.log("replace "+match[2]+" with "+ma3 ); + sql = sql.replace(match[2], ma3); + //modified = true; + } + } + } + } + + return sql; +} +*/ + /** * Escapes a string like PHP's mysql_real_escape_string does * @param {string} value @@ -153,15 +274,16 @@ Utils.escapeString = function(value) { } return value - .replace(/[\0\n\r\b\\\'\"]/g, function(s) { + .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'; - default: return '\\' + 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 @@ -175,7 +297,14 @@ Utils.escapeString = function(value) { * @returns {string} */ Utils.escapeRegExp = function(str) { - return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'); + return str.replace(/[\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'); +}; + +Utils.doubleEscapeRegExp = function(str) { + str = str.replace(/[\\]/g, '\x01'); + str = str.replace(/[\[\]\/\{\}\(\)\*\+\?\.\^\$\|]/g, '\\\\$&'); + str = str.replace(/[\x01]/g, '[\\\\\\\\]'); + return str; }; /** diff --git a/tests/index.html b/tests/index.html index c1e719e0..ba19543e 100644 --- a/tests/index.html +++ b/tests/index.html @@ -47,6 +47,7 @@ + diff --git a/tests/plugins-gui.module.js b/tests/plugins-gui.module.js index 00a131a1..4fa0317b 100644 --- a/tests/plugins-gui.module.js +++ b/tests/plugins-gui.module.js @@ -143,6 +143,101 @@ $(function(){ ); }); + /** + * Test Collapse Groups + */ + QUnit.test('collapse-groups', function(assert) { + $b.queryBuilder({ + plugins: ['collapse-groups'], + filters: basic_filters, + rules: basic_rules + }); + + var $collapseButton = $('#builder_group_0 .rules-group-header .btn[data-collapse="group"]'); + var $groupNameInput = $('#builder_group_0 .rules-group-header .group-name'); + + assert.ok( + $collapseButton.length > 0, + 'Should have added button with data-collapse=group in the rules header with ' + ); + + assert.ok( + $collapseButton.find('i').hasClass('glyphicon-chevron-up'), + 'Should have chevron up icon inside the collapse button' + ); + + assert.ok( + $('#builder_group_0 .rules-group-header .group-name').length > 0, + 'Should have a group name field' + ); + + $collapseButton.trigger('click', [$collapseButton, $b.queryBuilder.options]); + + assert.ok( + $collapseButton.find('i').hasClass('glyphicon-chevron-down'), + 'Should have chevron down icon inside the collapse button after collapsing' + ); + + assert.ok( + $collapseButton.closest('#builder_group_0 .rules_list').not(':visible'), + 'Should hide the rules list' + ); + + $b.queryBuilder('destroy'); + $b.queryBuilder({ + plugins: { + 'collapse-groups': { + namedGroups: false + } + }, + filters: basic_filters, + rules: basic_rules + }); + + assert.ok( + $('#builder_group_0 .rules-group-header .group-name').length === 0, + 'Should not have a group name field when named groups option is false' + ); + + $b.queryBuilder('destroy'); + $b.queryBuilder({ + plugins: ['collapse-groups'], + filters: basic_filters, + rules: { + condition: 'AND', + rules: [ + { + id: 'age', + field: 'age', + type: 'integer', + input: 'text', + operator: 'equal', + value: '24' + } + ], + collapsed: true, + name: 'foo', + not: false, + valid: true + } + }); + + assert.ok( + $collapseButton.closest('#builder_group_0 .rules_list').not(':visible'), + 'Should hide rules list when loading a group with collapse === true' + ); + + assert.ok( + $collapseButton.find('i').hasClass('glyphicon-chevron-down'), + 'Should have chevron down icon inside the collapse button after collapsing' + ); + + assert.ok( + $groupNameInput.length > 0, + 'Should have a group name field' + ); + }); + /** * Test filter-description */ diff --git a/tests/plugins.module.js b/tests/plugins.module.js index c0b4fbf6..7aed43d7 100644 --- a/tests/plugins.module.js +++ b/tests/plugins.module.js @@ -225,4 +225,37 @@ $(function(){ 'Should have added filter "a" after "c"' ); }); + + + /** + * Test collapse groups & group names + */ + QUnit.test('collapse-groups', function(assert) { + $b.queryBuilder({ + plugins: ['collapse-groups'], + filters: basic_filters, + rules: basic_rules + }); + + var $collapseButton = $('#builder_group_0 .rules-group-header .btn[data-collapse="group"]'); + var $groupNameInput = $('#builder_group_0 .rules-group-header .group-name'); + + $groupNameInput.val('foo').trigger('change', [$groupNameInput]); + $collapseButton.trigger('click', [$collapseButton, $b.queryBuilder.options]); + + var rules = $b.queryBuilder('getRules'); + + assert.equal( + rules.name, + 'foo', + 'Should have set the group name field to foo' + ); + + assert.equal( + rules.collapsed, + true, + 'Should have set the group name field to foo' + ); + + }); });