@syncfusion/ej2-querybuilder 20.3.56 → 20.3.59

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.3.56
+*  version : 20.3.59
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-querybuilder@*",
-  "_id": "@syncfusion/ej2-querybuilder@20.3.50",
+  "_id": "@syncfusion/ej2-querybuilder@20.3.56",
   "_inBundle": false,
-  "_integrity": "sha512-3OBXo+cCitWtbaMykLrf8k0UvXOdLMUG9LhU29msBrMkZM3Nz/gLaf7YSSuPP+qGNMnSzAVDrBxBkOC8aQAFHQ==",
+  "_integrity": "sha512-UpTk3wTJ6b5nI2lhpbgaRlJZfJo+EyUxC605a5LCffg1z+wk3J1gv+qovJop6E6UsXw+p37bJ+L/LqvwjNk0PA==",
   "_location": "/@syncfusion/ej2-querybuilder",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-querybuilder",
     "/@syncfusion/ej2-vue-querybuilder"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-20.3.50.tgz",
-  "_shasum": "cd04589809573dc0b02f538658db49a1e7116897",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-20.3.56.tgz",
+  "_shasum": "ccbedceaec28eb6619c6ddcd040915c4a6379e20",
   "_spec": "@syncfusion/ej2-querybuilder@*",
   "_where": "/jenkins/workspace/ease-automation_release_19.1.0.1/packages/included",
   "author": {
@@ -33,10 +33,10 @@
   "bundleDependencies": false,
   "dependencies": {
     "@syncfusion/ej2-base": "~20.3.56",
-    "@syncfusion/ej2-buttons": "~20.3.56",
-    "@syncfusion/ej2-calendars": "~20.3.56",
-    "@syncfusion/ej2-dropdowns": "~20.3.56",
-    "@syncfusion/ej2-inputs": "~20.3.56",
+    "@syncfusion/ej2-buttons": "~20.3.58",
+    "@syncfusion/ej2-calendars": "~20.3.59",
+    "@syncfusion/ej2-dropdowns": "~20.3.59",
+    "@syncfusion/ej2-inputs": "~20.3.57",
     "@syncfusion/ej2-splitbuttons": "~20.3.56"
   },
   "deprecated": false,
@@ -69,6 +69,6 @@
     "url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/querybuilder"
   },
   "typings": "index.d.ts",
-  "version": "20.3.56",
+  "version": "20.3.59",
   "sideEffects": false
 }

package/src/query-builder/query-builder.d.ts

@@ -260,6 +260,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
     private items;
     private customOperators;
     private operators;
+    private sqlOperators;
     private ruleElem;
     private groupElem;
     private dataColl;
@@ -726,24 +727,27 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
      * Sets the rules from the sql query.
      *
      * @param {string} sqlString - 'sql String' to be passed to set the rule.
+     * @param {boolean} sqlLocale -  Set `true` if Localization for Sql query.
      * @returns {void}
      */
-    setRulesFromSql(sqlString: string): void;
+    setRulesFromSql(sqlString: string, sqlLocale?: boolean): void;
     /**
      * Get the rules from SQL query.
      *
      * @param {string} sqlString - 'sql String' to be passed to get the rule.
+     * @param {boolean} sqlLocale - Set `true` if Localization for Sql query.
      * @returns {object} - Rules from SQL query
      */
-    getRulesFromSql(sqlString: string): RuleModel;
+    getRulesFromSql(sqlString: string, sqlLocale?: boolean): RuleModel;
     /**
      * Gets the sql query from rules.
      *
      * @param {RuleModel} rule - 'rule' to be passed to get the sql.
      * @param {boolean} allowEscape - Set `true` if it exclude the escape character.
+     * @param {boolean} sqlLocale - Set `true` if Localization for Sql query.
      * @returns {object} - Sql query from rules.
      */
-    getSqlFromRules(rule?: RuleModel, allowEscape?: boolean): string;
+    getSqlFromRules(rule?: RuleModel, allowEscape?: boolean, sqlLocale?: boolean): string;
     private sqlParser;
     private parseSqlStrings;
     private checkLiteral;

package/src/query-builder/query-builder.js

@@ -3236,6 +3236,8 @@ var QueryBuilder = /** @class */ (function (_super) {
             StartsWith: 'Starts With',
             EndsWith: 'Ends With',
             Contains: 'Contains',
+            NotLike: 'Not Like',
+            Like: 'Like',
             Equal: 'Equal',
             NotEqual: 'Not Equal',
             LessThan: 'Less Than',
@@ -3320,6 +3322,16 @@ var QueryBuilder = /** @class */ (function (_super) {
             isnull: 'IS NULL', isnotnull: 'IS NOT NULL', isempty: 'IS EMPTY', isnotempty: 'IS NOT EMPTY', notstartswith: 'NOT LIKE',
             notendswith: 'NOT LIKE', notcontains: 'NOT LIKE'
         };
+        this.sqlOperators = {
+            equal: '=', notequal: '!=', greaterthan: '>', greaterthanorequal: '>=', lessthan: '<', in: this.l10n.getConstant('In').toUpperCase(),
+            notin: this.l10n.getConstant('NotIn').toUpperCase(), lessthanorequal: '<=', startswith: this.l10n.getConstant('Like').toUpperCase(),
+            endswith: this.l10n.getConstant('Like').toUpperCase(), between: this.l10n.getConstant('Between').toUpperCase(),
+            notbetween: this.l10n.getConstant('NotBetween').toUpperCase(), contains: this.l10n.getConstant('Like').toUpperCase(),
+            isnull: this.l10n.getConstant('IsNull').toUpperCase(), isnotnull: this.l10n.getConstant('IsNotNull').toUpperCase(),
+            isempty: this.l10n.getConstant('IsEmpty').toUpperCase(), isnotempty: this.l10n.getConstant('IsNotEmpty').toUpperCase(),
+            notstartswith: this.l10n.getConstant('NotLike').toUpperCase(), notendswith: this.l10n.getConstant('NotLike').toUpperCase(),
+            notcontains: this.l10n.getConstant('NotLike').toUpperCase()
+        };
         if (!this.fields) {
             this.fields = { text: 'label', value: 'field' };
         }
@@ -4405,7 +4417,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         return false;
     };
-    QueryBuilder.prototype.getSqlString = function (rules, enableEscape, queryStr) {
+    QueryBuilder.prototype.getSqlString = function (rules, enableEscape, queryStr, sqlLocale) {
         var isRoot = false;
         if (!queryStr && queryStr !== '') {
             queryStr = '';
@@ -4416,27 +4428,33 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         var condition = rules.condition;
         if (rules.not) {
+            var rulesNotCondition = void 0;
             if (isRoot) {
-                queryStr += 'NOT (';
+                rulesNotCondition = sqlLocale ? this.l10n.getConstant('NOT').toUpperCase() + ' (' : 'NOT (';
+                queryStr += rulesNotCondition;
             }
             else {
-                queryStr += ' NOT (';
+                rulesNotCondition = sqlLocale ? ' ' + this.l10n.getConstant('NOT').toUpperCase() + ' (' : ' NOT (';
+                queryStr += rulesNotCondition;
             }
         }
         for (var j = 0, jLen = rules.rules.length; j < jLen; j++) {
             if (rules.rules[j].rules) {
-                queryStr = this.getSqlString(rules.rules[j], enableEscape, queryStr);
+                queryStr = this.getSqlString(rules.rules[j], enableEscape, queryStr, sqlLocale);
             }
             else {
                 var rule = rules.rules[j];
                 var valueStr = '';
+                var ruleOpertor = void 0;
+                ruleOpertor = sqlLocale ? this.sqlOperators[rule.operator] : this.operators[rule.operator];
                 if (rule.value instanceof Array) {
                     if (rule.operator.toString().indexOf('between') > -1) {
+                        var ruleCondition = sqlLocale ? ' ' + this.l10n.getConstant('AND').toUpperCase() + ' ' : ' ' + 'AND' + ' ';
                         if (rule.type === 'date' && !this.isDateFunction(rule.value[0])) {
-                            valueStr += '"' + rule.value[0] + '" AND "' + rule.value[1] + '"';
+                            valueStr += '"' + rule.value[0] + '"' + ruleCondition + '"' + rule.value[1] + '"';
                         }
                         else {
-                            valueStr += rule.value[0] + ' AND ' + rule.value[1];
+                            valueStr += rule.value[0] + ruleCondition + rule.value[1];
                         }
                     }
                     else {
@@ -4480,7 +4498,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                             rule.field = '"' + rule.field + '"';
                         }
                     }
-                    queryStr += rule.field + ' ' + this.operators[rule.operator];
+                    queryStr += rule.field + ' ' + ruleOpertor;
                 }
                 else {
                     if (enableEscape) {
@@ -4491,7 +4509,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                             rule.field = '"' + rule.field + '"';
                         }
                     }
-                    queryStr += rule.field + ' ' + this.operators[rule.operator] + ' ' + valueStr;
+                    queryStr += rule.field + ' ' + ruleOpertor + ' ' + valueStr;
                 }
                 if (rule.condition && rule.condition !== '') {
                     condition = rule.condition;
@@ -4501,7 +4519,8 @@ var QueryBuilder = /** @class */ (function (_super) {
                 if (condition === '') {
                     condition = rules.rules[j].condition;
                 }
-                queryStr += ' ' + condition.toUpperCase() + ' ';
+                condition = sqlLocale ? this.l10n.getConstant(condition.toUpperCase()).toUpperCase() : condition.toUpperCase();
+                queryStr += ' ' + condition + ' ';
             }
         }
         if (!isRoot) {
@@ -4516,24 +4535,26 @@ var QueryBuilder = /** @class */ (function (_super) {
      * Sets the rules from the sql query.
      *
      * @param {string} sqlString - 'sql String' to be passed to set the rule.
+     * @param {boolean} sqlLocale -  Set `true` if Localization for Sql query.
      * @returns {void}
      */
-    QueryBuilder.prototype.setRulesFromSql = function (sqlString) {
+    QueryBuilder.prototype.setRulesFromSql = function (sqlString, sqlLocale) {
         sqlString = sqlString.replace(/`/g, '');
-        var ruleModel = this.getRulesFromSql(sqlString);
+        var ruleModel = this.getRulesFromSql(sqlString, sqlLocale);
         this.setRules({ condition: ruleModel.condition, not: ruleModel.not, rules: ruleModel.rules });
     };
     /**
      * Get the rules from SQL query.
      *
      * @param {string} sqlString - 'sql String' to be passed to get the rule.
+     * @param {boolean} sqlLocale - Set `true` if Localization for Sql query.
      * @returns {object} - Rules from SQL query
      */
-    QueryBuilder.prototype.getRulesFromSql = function (sqlString) {
+    QueryBuilder.prototype.getRulesFromSql = function (sqlString, sqlLocale) {
         this.parser = [];
-        this.sqlParser(sqlString);
+        this.sqlParser(sqlString, sqlLocale);
         this.rule = { condition: 'and', not: false, rules: [] };
-        var rule = this.processParser(this.parser, this.rule, [0]);
+        var rule = this.processParser(this.parser, this.rule, [0], sqlLocale);
         if (this.enableNotCondition) {
             return { condition: rule.condition, not: rule.not, rules: rule.rules };
         }
@@ -4546,28 +4567,45 @@ var QueryBuilder = /** @class */ (function (_super) {
      *
      * @param {RuleModel} rule - 'rule' to be passed to get the sql.
      * @param {boolean} allowEscape - Set `true` if it exclude the escape character.
+     * @param {boolean} sqlLocale - Set `true` if Localization for Sql query.
      * @returns {object} - Sql query from rules.
      */
-    QueryBuilder.prototype.getSqlFromRules = function (rule, allowEscape) {
+    QueryBuilder.prototype.getSqlFromRules = function (rule, allowEscape, sqlLocale) {
         if (!rule) {
             rule = this.getValidRules();
         }
         rule = this.getRuleCollection(rule, false);
-        return this.getSqlString(this.getValidRules(rule), allowEscape).replace(/"/g, '\'');
+        return this.getSqlString(this.getValidRules(rule), allowEscape, null, sqlLocale).replace(/"/g, '\'');
     };
-    QueryBuilder.prototype.sqlParser = function (sqlString) {
+    QueryBuilder.prototype.sqlParser = function (sqlString, sqlLocale) {
         var st = 0;
         var str;
         do {
             str = sqlString.slice(st);
-            st += this.parseSqlStrings(str);
+            st += this.parseSqlStrings(str, sqlLocale);
         } while (str !== '');
         return this.parser;
     };
-    QueryBuilder.prototype.parseSqlStrings = function (sqlString) {
+    QueryBuilder.prototype.parseSqlStrings = function (sqlString, sqlLocale) {
         var operators = ['=', '!=', '<=', '>=', '<', '>'];
-        var conditions = ['AND', 'OR', 'NOT'];
-        var subOp = ['IN', 'NOT IN', 'LIKE', 'NOT LIKE', 'BETWEEN', 'NOT BETWEEN', 'IS NULL', 'IS NOT NULL', 'IS EMPTY', 'IS NOT EMPTY'];
+        var conditions;
+        if (sqlLocale) {
+            conditions = [this.l10n.getConstant('AND').toUpperCase(), this.l10n.getConstant('OR').toUpperCase(), this.l10n.getConstant('NOT').toUpperCase()];
+        }
+        else {
+            conditions = ['AND', 'OR', 'NOT'];
+        }
+        var subOp;
+        if (sqlLocale) {
+            subOp = [this.l10n.getConstant('In').toUpperCase(), this.l10n.getConstant('NotIn').toUpperCase(),
+                this.l10n.getConstant('Like').toUpperCase(), this.l10n.getConstant('NotLike').toUpperCase(),
+                this.l10n.getConstant('Between').toUpperCase(), this.l10n.getConstant('NotBetween').toUpperCase(),
+                this.l10n.getConstant('IsNull').toUpperCase(), this.l10n.getConstant('IsNotNull').toUpperCase(),
+                this.l10n.getConstant('IsEmpty').toUpperCase(), this.l10n.getConstant('IsNotEmpty').toUpperCase()];
+        }
+        else {
+            subOp = ['IN', 'NOT IN', 'LIKE', 'NOT LIKE', 'BETWEEN', 'NOT BETWEEN', 'IS NULL', 'IS NOT NULL', 'IS EMPTY', 'IS NOT EMPTY'];
+        }
         var regexStr;
         var regex;
         var matchValue;
@@ -4634,7 +4672,7 @@ var QueryBuilder = /** @class */ (function (_super) {
             this.parser.push(['Literal', matchValue]);
             return matchValue.length + 2;
         }
-        if (this.checkNumberLiteral(sqlString)) {
+        if (this.checkNumberLiteral(sqlString, sqlLocale)) {
             matchValue = /^[0-9]+(\.[0-9]+)?/.exec(sqlString)[0];
             this.parser.push(['Literal', matchValue]);
             return matchValue.length;
@@ -4678,7 +4716,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         return false;
     };
-    QueryBuilder.prototype.checkNumberLiteral = function (sqlString) {
+    QueryBuilder.prototype.checkNumberLiteral = function (sqlString, sqlLocale) {
         var lastParser = this.parser[this.parser.length - 1];
         if (!lastParser) {
             return true;
@@ -4690,19 +4728,38 @@ var QueryBuilder = /** @class */ (function (_super) {
                 if (lastParser[0] === 'Left' && (secParser && secParser[0] === 'Conditions')) {
                     return true;
                 }
-                if (lastParser[0] === 'Conditions' && (betweenParser && betweenParser[1].indexOf('between') < 0)) {
+                var betweenOperator = sqlLocale ? this.l10n.getConstant('Between').toLowerCase() : 'between';
+                if (lastParser[0] === 'Conditions' && (betweenParser && betweenParser[1].indexOf(betweenOperator) < 0)) {
                     return true;
                 }
             }
         }
         return false;
     };
-    QueryBuilder.prototype.getOperator = function (value, operator) {
+    QueryBuilder.prototype.getOperator = function (value, operator, sqlLocale) {
         var operators = {
             '=': 'equal', '!=': 'notequal', '<': 'lessthan', '>': 'greaterthan', '<=': 'lessthanorequal',
             '>=': 'greaterthanorequal', 'in': 'in', 'not in': 'notin', 'between': 'between', 'not between': 'notbetween',
             'is empty': 'isempty', 'is null': 'isnull', 'is not null': 'isnotnull', 'is not empty': 'isnotempty'
         };
+        if (sqlLocale) {
+            var localeOperator = Object.keys(this.sqlOperators);
+            for (var i = 0; i < localeOperator.length; i++) {
+                if (this.sqlOperators[localeOperator[i]] === operator.toUpperCase()) {
+                    if (value && value.indexOf('%') === 0 && value[value.length - 1] === '%') {
+                        return (localeOperator[i] === 'notcontains') ? 'notcontains' : 'contains';
+                    }
+                    else if (value && value.indexOf('%') !== 0 && value.indexOf('%') === value.length - 1) {
+                        return (localeOperator[i] === 'notstartswith') ? 'notstartswith' : 'startswith';
+                    }
+                    else if (value && value.indexOf('%') === 0 && value.indexOf('%') !== value.length - 1) {
+                        return (localeOperator[i] === 'notendswith') ? 'notendswith' : 'endswith';
+                    }
+                    return localeOperator[i];
+                }
+            }
+            return null;
+        }
         if (value) {
             if (value.indexOf('%') === 0 && value[value.length - 1] === '%') {
                 return (operator === 'not like') ? 'notcontains' : 'contains';
@@ -4726,7 +4783,10 @@ var QueryBuilder = /** @class */ (function (_super) {
     };
     QueryBuilder.prototype.getTypeFromColumn = function (rules) {
         var columnData = this.getColumn(rules.field);
-        return columnData.type;
+        if (!isNullOrUndefined(columnData)) {
+            return columnData.type;
+        }
+        return null;
     };
     QueryBuilder.prototype.getLabelFromColumn = function (field) {
         var label = '';
@@ -4759,7 +4819,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         return this.getColumn(fieldName).label;
     };
-    QueryBuilder.prototype.processParser = function (parser, rules, levelColl) {
+    QueryBuilder.prototype.processParser = function (parser, rules, levelColl, sqlLocale) {
         var j;
         var jLen;
         var rule;
@@ -4778,18 +4838,27 @@ var QueryBuilder = /** @class */ (function (_super) {
                 rule = { label: parser[i][1], field: parser[i][1] };
                 if (parser[i + 1][0] === 'SubOperators') {
                     if (parser[i + 1][1].indexOf('null') > -1 || parser[i + 1][1].indexOf('empty') > -1) {
-                        rule.operator = this.getOperator(' ', parser[i + 1][1]);
+                        rule.operator = this.getOperator(' ', parser[i + 1][1], sqlLocale);
                         rule.value = null;
                         rule.type = this.getTypeFromColumn(rule);
                     }
                     else {
                         var oper = parser[i + 3][1] ? parser[i + 3][1].replace(/'/g, '') : parser[i + 3][1];
-                        rule.operator = this.getOperator(oper, parser[i + 1][1]);
+                        rule.operator = this.getOperator(oper, parser[i + 1][1], sqlLocale);
                     }
                     operator = parser[i + 1][1];
                     i++;
                     j = i + 1;
                     jLen = iLen;
+                    if (sqlLocale && rule.operator === 'contains' || rule.operator === 'startswith' || rule.operator === 'endswith') {
+                        operator = 'like';
+                    }
+                    else if (sqlLocale && rule.operator === 'notcontains' || rule.operator === 'notstartswith' || rule.operator === 'notendswith') {
+                        operator = 'not like';
+                    }
+                    else if (sqlLocale) {
+                        operator = rule.operator;
+                    }
                     for (j = i + 1; j < jLen; j++) {
                         if (operator.indexOf('between') < 0 && parser[j][0] === 'Left') {
                             isLeftOpened = true;
@@ -4855,7 +4924,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                     }
                 }
                 else if (parser[i + 1][0] === 'Operators') {
-                    rule.operator = this.getOperator(parser[i + 2][1], parser[i + 1][1]);
+                    rule.operator = this.getOperator(parser[i + 2][1], parser[i + 1][1], sqlLocale);
                     if (parser[i + 2][0] === 'Number') {
                         rule.type = 'number';
                         rule.value = Number(parser[i + 2][1]);
@@ -4869,7 +4938,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                 rules.rules.push(rule);
             }
             else if (parser[i][0] === 'Left') {
-                if (!(parser[0][0] === 'Left') && parser[i - 1][1] === 'not') {
+                if (!(parser[0][0] === 'Left') && (parser[i - 1][1] === 'not' || sqlLocale && this.l10n.getConstant('NOT').toLowerCase() === parser[i - 1][1])) {
                     continue;
                 }
                 this.parser = parser.splice(i + 1, iLen - (i + 1));
@@ -4888,11 +4957,11 @@ var QueryBuilder = /** @class */ (function (_super) {
                 }
                 levelColl.push(grpCount);
                 rules.rules.push(subRules);
-                subRules = this.processParser(this.parser, subRules, levelColl);
+                subRules = this.processParser(this.parser, subRules, levelColl, sqlLocale);
                 return rules;
             }
             else if (parser[i][0] === 'Conditions') {
-                if (parser[i][1] === 'not') {
+                if (parser[i][1] === 'not' || (sqlLocale && this.l10n.getConstant('NOT').toLowerCase() === parser[i][1])) {
                     rules.not = true;
                 }
                 else {
@@ -4907,7 +4976,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                 for (l = 0; l < lLen; l++) {
                     rules = this.findGroupByIdx(levelColl[l], rules, l === 0);
                 }
-                return this.processParser(this.parser, rules, levelColl);
+                return this.processParser(this.parser, rules, levelColl, sqlLocale);
             }
         }
         return rules;