@sap/xsodata 8.2.1 → 8.3.1

package/lib/sql/sqlStatement.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var edm = require('./../utils/typedObjects');
-var cloneContextWithNoAlias = edm.cloneContextWithNoAlias;
-var InternalError = require('./../utils/errors/internalError');
-var util = require('util');
+const edm = require('./../utils/typedObjects');
+const cloneContextWithNoAlias = edm.cloneContextWithNoAlias;
+const InternalError = require('./../utils/errors/internalError');
+const util = require('util');
 
 /**
  * Create a new SqlBuildHanaContext
@@ -15,7 +15,7 @@ var util = require('util');
 exports.SqlBuildHanaContext = function (context) {
     if (context) {
         this.oDataNullSupport = context.gModel.isNullSupported();
-        var dbSeg = context.oData.dbSegmentLast;
+        const dbSeg = context.oData.dbSegmentLast;
         this.isNav = function (string) {
             return dbSeg._SelectedNavigations.indexOf(string) > -1;
         };
@@ -45,7 +45,7 @@ function getHanaCloudDbSetting(context) {
 }
 
 exports.SqlBuildHanaContext.prototype.clone = function () {
-    var c = new exports.SqlBuildHanaContext();
+    const c = new exports.SqlBuildHanaContext();
     c.oDataNullSupport = this.oDataNullSupport;
     c.isNav = this.isNav;
     c.table = this.table; // used in Property.prototype.toSqlHana
@@ -126,25 +126,6 @@ exports.DeleteContainer = class DeleteContainer {
     }
 };
 
-/**
- * @Class Eq
- * @constructor
- * @param left
- * @param right
- */
-
-/*
- function Eq(left, right) {
- this.left = left;
- this.right = right;
- }
- exports.Eq = Eq;
- Eq.prototype.toSqlHana = function (context,parameter) {
- var ret = '';
- ret += '(' + this.left.toSqlHana(context,parameter) + ' = ' + this.right.toSqlHana(context,parameter) + ')';
- return ret;
- };*/
-
 /**
  * @Class Value
  * @constructor
@@ -174,7 +155,7 @@ function Exists(select) {
 exports.Exists = Exists;
 
 Exists.prototype.toSqlHana = function (context, parameter) {
-    var ret = '';
+    let ret = '';
     ret += 'exists (' + this.exists.toSqlHana(context, parameter) + ')';
     return ret;
 };
@@ -198,8 +179,8 @@ function SelectProperty(table, property, propertyType, alias) {
 exports.SelectProperty = SelectProperty;
 
 SelectProperty.prototype.toSqlHana = function (context, parameter, hint) {
-    var sql = [];
-    var conversionFunction;
+    let sql = [];
+    let conversionFunction;
 
     if (!context.inOrderBy) {
         conversionFunction = getConversionFunction(this.propertyType);
@@ -253,7 +234,7 @@ exports.AggregateSelectProperty = AggregateSelectProperty;
 
 
 AggregateSelectProperty.prototype.toSqlHana = function (context, parameters) {
-    var sql = this.aggregation +
+    let sql = this.aggregation +
         '(' +
         this.selectProperty.toSqlHana(context, parameters) +
         ')';
@@ -271,16 +252,7 @@ function ParameterSelectProperty(table, property, alias, value) {
 }
 
 ParameterSelectProperty.prototype.toSqlHana = function (context, parameter, hint) {
-    var _alias = this.alias || this.property;
-    /*
-     if(!_alias){
-     if (!withoutTable && this.table) {
-     _alias =  this.table + '.';
-     }else{
-     _alias = '';
-     }
-     _alias = this.property;
-     }*/
+    const _alias = this.alias || this.property;
     if (this.value) {
         this.value.toSqlHana(context, parameter, hint);
         return util.format('? "%s"', _alias);
@@ -321,7 +293,7 @@ function SelectFormula(table, formula, alias) {
 exports.SelectFormula = SelectFormula;
 
 SelectFormula.prototype.toSqlHana = function () {
-    var ret = '';
+    let ret = '';
     if (this.table) {
         ret += '"' + this.table + '".';
     }
@@ -350,18 +322,18 @@ OverFormula.prototype.addSortOrder = function (order) {
 };
 
 OverFormula.prototype.addSortOrders = function (orders) {
-    for (var i = 0; i < orders.length; i++) {
-        this.orders.push(orders[i]);
+    for (const order of orders) {
+        this.orders.push(order);
     }
 };
 
 
 OverFormula.prototype.toSqlHana = function (context, parameter) {
-    var clonedContext = null;
-    var sql = '';
+    let clonedContext = null;
+    let sql = '';
     sql += 'row_number() over(';
 
-    var i;
+    let i;
     if (this.orders.length > 0) {
 
         clonedContext = cloneContextWithNoAlias(context);
@@ -453,9 +425,9 @@ Create.prototype.setAs = function (as) {
 };
 
 Create.prototype.toSqlHana = function (context, parameter) {
-    var i;
+    let i;
 
-    var sql = '';
+    let sql = '';
 
 
     sql += 'create ';
@@ -521,10 +493,10 @@ Insert.prototype.setSubSelect = function (subSelect) {
 };
 
 Insert.prototype.toSqlHana = function (context, parameter) {
-    var sql = '';
+    let sql = '';
     sql += 'insert into ';
 
-    if (this.intoTable.table.substr(0, 1) === '#') {
+    if (this.intoTable.table.substring(0, 1) === '#') {
         sql += ' "' + this.intoTable.table + '" ';
         if (this.intoTable.alias) {
             sql += ' as "' + this.intoTable.alias + '" ';
@@ -540,8 +512,8 @@ Insert.prototype.toSqlHana = function (context, parameter) {
         }
     }
 
-    var i;
-    var tmp = '';
+    let i;
+    let tmp = '';
     //sql += this.table + ' ';
     //collect names
     if (this.nv.length > 0) {
@@ -582,7 +554,6 @@ Insert.prototype.toSqlHana = function (context, parameter) {
                         useDbType: this.nv[i].dbType
                     }); // Ok
                 } else {
-                    //console.log('--------------'+JSON.stringify(this.nv[i].value,null,4));
                     tmp += '?';
                     parameter.push(this.nv[i].value);
                 }
@@ -599,8 +570,7 @@ Insert.prototype.toSqlHana = function (context, parameter) {
  * @param {(exports.Property)} names
  */
 Insert.prototype.addNames = function (names) {
-    for (var i = 0; i < names.length; i++) {
-        var n = names[i];
+    for (const n of names) {
         this.nv.push({
             name: n,
             value: undefined //null would be a valid OData value
@@ -609,8 +579,7 @@ Insert.prototype.addNames = function (names) {
 };
 
 Insert.prototype.setValue = function (name, value, dbType) {
-    for (var i = 0; i < this.nv.length; i++) {
-        var nv = this.nv[i];
+    for (const nv of this.nv) {
         if (nv.name.property === name) {
             nv.value = value;
             if (dbType) {
@@ -666,10 +635,10 @@ Select.prototype.addJoinTable = function (select, on, alias) {
 };
 
 Select.prototype.toSqlHana = function (context, parameter) {
-    var i = 0;
-    var clonedContext = null;
+    let i = 0;
+    let clonedContext = null;
 
-    var sql = '';
+    let sql = '';
     sql += 'select ';
 
     for (i = 0; i < this.select.length; i++) {
@@ -687,7 +656,7 @@ Select.prototype.toSqlHana = function (context, parameter) {
             return '(' + from.subQuery.toSqlHana(context, parameter) + ')';
         }
 
-        var fromString = '';
+        let fromString = '';
         if (from.table.substr(0, 1) !== '#' && from.schema) {
             fromString += '"' + from.schema + '".';
         }
@@ -695,7 +664,7 @@ Select.prototype.toSqlHana = function (context, parameter) {
         fromString += '"' + from.table + '"';
 
         if (from.placeholders) {
-            var sql_placeholders = from.placeholders.map(function (ph) {
+            const sql_placeholders = from.placeholders.map(function (ph) {
                 return ph.toSqlHana(context, parameter);
             });
             fromString += '(';
@@ -712,7 +681,7 @@ Select.prototype.toSqlHana = function (context, parameter) {
 
     this.joins.forEach(function (join) {
         if (join.table) {
-            var table = join.table;
+            const table = join.table;
             sql += ' join ';
             if (table.schema) {
                 sql += '"' + table.schema + '".';
@@ -789,7 +758,7 @@ Select.prototype.toSqlHana = function (context, parameter) {
         parameter.push(this.limit);
     }
 
-    var hints = this.hints;
+    const hints = this.hints;
     if (hints) {
         if (hints.length > 0) {
             sql += ' with hint (' + hints.join(',') + ')';
@@ -840,7 +809,6 @@ Select.prototype.addFrom = function (from, inputParams) {
                 return defaultResult;
             }
 
-            //let localValue = value.substr(1, value.length - 2);     // surrounding quotes from URI already removed by 'toSqlHana'
             let localValue = value;
 
             let stringArray = [];
@@ -906,9 +874,9 @@ Select.prototype.addFrom = function (from, inputParams) {
             key: kv.key,
             value: kv.value,
             toSqlHana: function (context, params) {
-                var sql = util.format('placeholder."$$%s$$" => ?', kv.key);         // placeholder."$$%s$$ == only for calc-views (not regular SQL)
-                var localParams = [];
-                var value;
+                let sql = util.format('placeholder."$$%s$$" => ?', kv.key);         // placeholder."$$%s$$ == only for calc-views (not regular SQL)
+                const localParams = [];
+                let value;
 
                 if (kv.value instanceof edm.EdmString) {
                     //Edm.String
@@ -944,15 +912,11 @@ Select.prototype.addFrom = function (from, inputParams) {
                     value = kv.value.value;
                     value = value.substring(2, value.length - 1);
                     params.push(value);
-                    //params.push(kv.value.value);
-                } else if (kv.value instanceof edm.DateTime) {
-                    //Edm.DateTime(DATE,SECONDDATE,TIMESTAMP)
-                    kv.value.toSqlHana(context, localParams);
-                    params.push(localParams[0]);                //e.g. "'1753-01-01'","'1753-01-01'","'1753-01-01'"
-                } else if (kv.value instanceof edm.Time) {
-                    //Edm.Time(TIME)
-                    kv.value.toSqlHana(context, localParams);
-                    params.push(localParams[0]);                //e.g. "'00:00:00'"
+                } else if (kv.value instanceof edm.DateTime || kv.value instanceof edm.Time) {
+                    //Edm.DateTime(DATE,SECONDDATE,TIMESTAMP) e.g. "'1753-01-01'","'1753-01-01'","'1753-01-01'"
+                    //Edm.Time(TIME) e.g. "'00:00:00'"
+                     kv.value.toSqlHana(context, localParams);
+                    params.push(localParams[0]);
                 } else {
                     throw new InternalError('Navigation to calc view expected after an Input path segment 3');
                 }
@@ -1036,8 +1000,7 @@ Select.prototype.addUniqueSelects = function (selects) {
  * @param {{key : exports.Property, value: string}[]} keyValuePairs
  */
 Select.prototype.addWhereKeyValuePairs = function (keyValuePairs) {
-    for (var i = 0; i < keyValuePairs.length; i++) {
-        var kv = keyValuePairs[i];
+    for (const kv of keyValuePairs) {
         this.whereAnded.push(new edm.BinaryOperator(edm.EQ, kv.key, kv.value, true /*strict*/));
     }
     return this;
@@ -1057,8 +1020,8 @@ Select.prototype.addWhereAnded = function (expression) {
  */
 Select.prototype.addSortOrders = function (orders) {
 
-    for (var i = 0; i < orders.length; i++) {
-        this.orders.push(orders[i]);
+    for (const order of orders) {
+        this.orders.push(order);
     }
     return this;
 };
@@ -1081,8 +1044,8 @@ Select.prototype.addSortOrder = function (order) {
  * @param {edm.OrderBy} orderBy
  */
 Select.prototype.addOrderBy = function (orderBy) {
-    for (var i = 0; i < orderBy.orders.length; i++) {
-        this.orders.push(orderBy.orders[i]);
+    for (const order of orderBy.orders) {
+        this.orders.push(order);
     }
     return this;
 };
@@ -1140,10 +1103,10 @@ Update.prototype.setFrom = function (from) {
 };
 
 Update.prototype.addSetCopyProperties = function (properties, fromAlias) {
-    var max = properties.length;
+    const max = properties.length;
 
-    var p;
-    for (var i = 0; i < max; i++) {
+    let p;
+    for (let i = 0; i < max; i++) {
         p = {
             from: new SelectProperty(fromAlias, properties[i].property, null),
             to: properties[i]
@@ -1154,8 +1117,7 @@ Update.prototype.addSetCopyProperties = function (properties, fromAlias) {
 
 
 Update.prototype.addWhereKeyValuePairs = function (keyValuePairs) {
-    for (var i = 0; i < keyValuePairs.length; i++) {
-        var kv = keyValuePairs[i];
+    for (const kv of keyValuePairs) {
         this.whereAnded.push(new edm.BinaryOperator(edm.EQ, kv.key, kv.value, true /*strict*/));
     }
 };
@@ -1172,7 +1134,7 @@ Update.prototype.toSqlHana = function (context, parameter) {
 
 Update.prototype.getHANACloudUpdateSql = function(context, parameter) {
 
-    var sql = '';
+    let sql = '';
 
     sql += 'MERGE INTO ';
     if (this.update.table.substr(0, 1) === '#') {
@@ -1221,7 +1183,7 @@ Update.prototype.getHANACloudUpdateSql = function(context, parameter) {
 
     sql += ' SET ';
     for (let i = 0; i < this.copyFromTo.length; i++) {
-        var cft = this.copyFromTo[i];
+        const cft = this.copyFromTo[i];
         sql += (i === 0 ? '' : ', ');
 
         sql += cft.to.toSqlHana(context, parameter, { withoutTable: true });
@@ -1234,9 +1196,9 @@ Update.prototype.getHANACloudUpdateSql = function(context, parameter) {
 
 
 Update.prototype.getHANAServiceUpdateSql = function(context, parameter) {
-    var i;
+    let i;
 
-    var sql = '';
+    let sql = '';
     sql += 'update ';
 
     if (this.update.table.substr(0, 1) === '#') {
@@ -1258,7 +1220,7 @@ Update.prototype.getHANAServiceUpdateSql = function(context, parameter) {
     sql += ' set ';
 
     for (i = 0; i < this.copyFromTo.length; i++) {
-        var cft = this.copyFromTo[i];
+        const cft = this.copyFromTo[i];
         sql += (i === 0 ? '' : ', ');
 
         sql += cft.to.toSqlHana(context, parameter, { withoutTable: true });
@@ -1328,8 +1290,7 @@ Upsert.prototype.setSubSelect = function (subSelect) {
 };
 
 Upsert.prototype.addNames = function (names) {
-    for (var i = 0; i < names.length; i++) {
-        var n = names[i];
+    for (const n of names) {
         this.nv.push({
             name: n,
             value: undefined //null would be a valid OData value
@@ -1338,8 +1299,7 @@ Upsert.prototype.addNames = function (names) {
 };
 
 Upsert.prototype.setValue = function (name, value) {
-    for (var i = 0; i < this.nv.length; i++) {
-        var nv = this.nv[i];
+    for (const nv of this.nv) {
         if (nv.name.property === name) {
             nv.value = value;
         }
@@ -1347,17 +1307,14 @@ Upsert.prototype.setValue = function (name, value) {
 };
 
 Upsert.prototype.addWhereKeyValuePairs = function (keyValuePairs) {
-    for (var i = 0; i < keyValuePairs.length; i++) {
-        var kv = keyValuePairs[i];
+    for (const kv of keyValuePairs) {
         this.whereAnded.push(new edm.BinaryOperator(edm.EQ, kv.key, kv.value, true /*strict*/));
     }
 };
 
 
 Upsert.prototype.toSqlHana = function (context, parameter) {
-    var i;
-
-    var sql = '';
+    let sql = '';
     sql += 'upsert ';
 
     if (this.upsert.table.substr(0, 1) === '#') {
@@ -1376,25 +1333,22 @@ Upsert.prototype.toSqlHana = function (context, parameter) {
         }
     }
 
-    var tmp = '';
+    let tmp = '';
     if (this.subSelect) {
-        //sql += ' (';
         sql += ' ' + this.subSelect.toSqlHana(context, parameter);
-        //sql += ') ';
     } else {
         sql += ' values ';
-        tmp = '';
-        for (i = 0; i < this.nv.length; i++) {
+        for (const element of this.nv) {
             tmp += (tmp.length > 0 ? ', ' : '');
 
-            if (this.nv[i].value && this.nv[i].value.toSqlHana) {
-                var pleaceholder = [];
-                this.nv[i].value.toSqlHana(context, pleaceholder, { withoutTable: true });
+            if (element.value && element.value.toSqlHana) {
+                const pleaceholder = [];
+                element.value.toSqlHana(context, pleaceholder, { withoutTable: true });
 
-                tmp += this.nv[i].value.toSqlHana(context, parameter, { withoutTable: true });
+                tmp += element.value.toSqlHana(context, parameter, { withoutTable: true });
             } else {
                 tmp += '?';
-                parameter.push(this.nv[i].value);
+                parameter.push(element.value);
             }
         }
         sql += '(' + tmp + ')';
@@ -1403,11 +1357,13 @@ Upsert.prototype.toSqlHana = function (context, parameter) {
 
     if (this.whereAnded.length > 0) {
         sql += '\n where ';
-        for (i = 0; i < this.whereAnded.length; i++) {
-            sql += (i === 0 ? '' : ' and ');
+        let firstStatement = true;
+        for (const elem of this.whereAnded) {
+            sql += (firstStatement ? '' : ' and ');
             sql += '(';
-            sql += this.whereAnded[i].toSqlHana(context, parameter);
+            sql += elem.toSqlHana(context, parameter);
             sql += ')';
+            firstStatement = false;
         }
     }
 
@@ -1449,7 +1405,7 @@ function initializeDDLObject(target, tableName, schema) {
  *@private
  */
 function buildSimplePrefixedSql(options) {
-    var sql = options.prefix + " TABLE ";
+    let sql = options.prefix + " TABLE ";
     if (options.schema) {
         sql += '"' + options.schema + '".';
     }
@@ -1525,16 +1481,13 @@ Delete.prototype.setFrom = function (from) {
 
 
 Delete.prototype.addWhereKeyValuePairs = function (keyValuePairs) {
-    for (var i = 0; i < keyValuePairs.length; i++) {
-        var kv = keyValuePairs[i];
+    for (const kv of keyValuePairs) {
         this.whereAnded.push(new edm.BinaryOperator(edm.EQ, kv.key, kv.value, true /*strict*/));
     }
 };
 
 Delete.prototype.toSqlHana = function (context, parameter) {
-    var i = 0;
-
-    var sql = '';
+    let sql = '';
     sql += 'delete ';
 
     sql += 'from ';
@@ -1558,7 +1511,7 @@ Delete.prototype.toSqlHana = function (context, parameter) {
 
     if (this.whereAnded.length > 0) {
         sql += '\n where ';
-        for (i = 0; i < this.whereAnded.length; i++) {
+        for (let i = 0; i < this.whereAnded.length; i++) {
             sql += (i === 0 ? '' : ' and ');
             sql += this.whereAnded[i].toSqlHana(context, parameter);
         }
@@ -1592,14 +1545,14 @@ exports._addETagToSelect = addETagToSelect;
  *  which is used in the SELECT statement is different than the Alias property of the DBSegment (i.e. default alias).
  */
 function addETagToSelect(dbSegment, selectStmt, tableAlias) {
-    var concurrentProperties = dbSegment.entityType.getConcurrentProperties(),
+    let concurrentProperties = dbSegment.entityType.getConcurrentProperties(),
         hashFunctionArguments,
         eTagExpression;
 
     tableAlias = tableAlias || dbSegment.getAlias();
 
     hashFunctionArguments = concurrentProperties.map(function (property) {
-        var dbColumnName = util.format('"%s"."%s"', tableAlias, property);
+        const dbColumnName = util.format('"%s"."%s"', tableAlias, property);
         return util.format("ifnull(to_binary(%s), to_binary('')), case when %s is null then '01' else '00' end",
             dbColumnName, dbColumnName);
     });
@@ -1618,7 +1571,7 @@ exports.createSelectStmtForETag = createSelectStmtForETag;
  * @returns {Select}
  */
 function createSelectStmtForETag(dbSegment) {
-    var selectStmt = new Select();
+    const selectStmt = new Select();
 
     addETagToSelect(dbSegment, selectStmt);
     selectStmt.addFrom(dbSegment.getAliasedTableName());
@@ -1633,9 +1586,9 @@ function createSelectStmtForETag(dbSegment) {
  * Currently supported is Truncate, Drop.
  * Examples:
  * <code>
- * var sql = require("lib/.../sqlStatement");
- * var truncate = sql.buildTableStatement(sql.Truncate, sqlContext, "yourTableName");
- * var drop = sql.buildTableStatement(sql.Drop, sqlContext, "yourTableName");
+ * let sql = require("lib/.../sqlStatement");
+ * const truncate = sql.buildTableStatement(sql.Truncate, sqlContext, "yourTableName");
+ * const drop = sql.buildTableStatement(sql.Drop, sqlContext, "yourTableName");
  * </code>
  *
  *@param  type {Function} The type of statement you wnat to create
@@ -1675,7 +1628,7 @@ function TableColumn(table, property, alias) {
 exports.TableColumn = TableColumn;
 
 TableColumn.prototype.toSqlHana = function (context, parameter, hint) {
-    var sql = [];
+    let sql = [];
 
     if (!(hint && hint.withoutTable) && this.table) {
         sql.push('"', this.table, '".');

package/lib/sql/sqlTools.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var sql = require('./sqlStatement');
+const sql = require('./sqlStatement');
 
 //Code
 exports.rIdToTableName = function (reqId, rId) {
@@ -8,12 +8,10 @@ exports.rIdToTableName = function (reqId, rId) {
 };
 
 exports.rIdToNewTableName = function (name, netId, reqId, rId) {
-    //return '#NEW_' + name + '_' + reqId + '_' + rId;
     return exports.rIdToAlteredTableName('#NEW', name, netId,  reqId, rId);
 };
 
 exports.rIdToOldTableName = function (name,  netId, reqId, rId) {
-    //return '#OLD_' + name + '_' + reqId + '_' + rId;
     return exports.rIdToAlteredTableName('#OLD', name, netId,  reqId, rId);
 };
 
@@ -30,7 +28,7 @@ exports.rIdToAlteredTableName = function (prefix, name, netId,  reqId, rId) {
 
 exports.collectSqls = function (context,sqlContext) {
     context.logger.silly('sqlCollector', 'collectSqls');
-    var containerAll = new sql.GetContainerAll();
+    const containerAll = new sql.GetContainerAll();
 
     addSqlsToContainer(sqlContext.dbSegLast, containerAll);
     return containerAll;
@@ -62,9 +60,7 @@ exports.collectSqls = function (context,sqlContext) {
         }
 
         //resource path chain
-        var i;
-        for (i = 0; i < dbSeg._ExpandedNavigations.length; i++) {
-            var name = dbSeg._ExpandedNavigations[i];
+        for (const name of dbSeg._ExpandedNavigations) {
             addSqlsToContainer(dbSeg.getRelevantNavigationSegments()[name], container);
         }
     }

package/lib/sql/statementProcessor.js

@@ -11,14 +11,12 @@ const NotFoundError = require('./../utils/errors/http/notFound');
 const execStmsDirectlyNoResult = function (context, stmsInput, asyncDone) {
     const stms = Array.isArray(stmsInput) ? stmsInput :  [stmsInput];
     context.logger.silly('dataCollector', 'execParallelNoResult');
-    //console.log('--------execStmsDirectlyNoResult----------', stms.length );
     async.mapSeries(
         stms,
         function (item, cb) {
             try {
-                var p = [];
-                var sql = item.toSqlHana(new sqlStatement.SqlBuildHanaContext(context), p);
-                //console.log('---execStmsDirectlyNoResult',sql );
+                const p = [];
+                const sql = item.toSqlHana(new sqlStatement.SqlBuildHanaContext(context), p);
                 if (p.length > 0) {
                     return cb(new InternalError('No sql parameters expected'), context);
                 }
@@ -40,12 +38,8 @@ const execStmsAsPreparedNoResult = function (context, stmsInput, asyncDone) {
         stms,
         function (item, cb) {
             try {
-                var p = [];
-                var sql = item.toSqlHana(new sqlStatement.SqlBuildHanaContext(context), p);
-                //console.log('---execStmsAsPreparedNoResult',sql );
-                //if (p.length > 0) {
-                //   return cb(new InternalError('No sql parameters expected'), context);
-                //}
+                const p = [];
+                const sql = item.toSqlHana(new sqlStatement.SqlBuildHanaContext(context), p);
                 dataCollector2.executeSqlAsPreparedStatementNoResult(context, sql, p, cb);
             } catch (ex) {
                 cb(ex);
@@ -63,8 +57,8 @@ const execStmsAsPrepared = function (context,stmsInput,  asyncDone) {
         stms,
         function (item, cb) {
             try {
-                var p = [];
-                var sql = item.toSqlHana(new sqlStatement.SqlBuildHanaContext(context), p);
+                const p = [];
+                const sql = item.toSqlHana(new sqlStatement.SqlBuildHanaContext(context), p);
                 dataCollector2.executeSqlAsPreparedStatement(context, sql, p, cb);
             } catch (ex) {
                 cb(ex);
@@ -113,7 +107,6 @@ const execCleanSessionStatements = (stms, context, asyncDone) => {
         'execCleanSessionStatements (connectionIsExternal: ' + context.db.isExternalHandledConnection + ')');
 
     if (context.db.isExternalHandledConnection === true) {
-        //return dataCollector2.executeSqlAsPreparedStatementNoResult(context,stms,  (err) => { asyncDone(err, context);});
         return module.exports.execStmsDirectlyNoResult(context, stms, asyncDone);
     }
 
@@ -131,7 +124,7 @@ const execCleanSessionStatements = (stms, context, asyncDone) => {
  */
 const execTempTableStatements = (context, stmsInput,asyncDone) => {
     const stms = Array.isArray(stmsInput) ? stmsInput :  [stmsInput];
-    var index;
+    let index;
     context.logger.silly('dataCollector', 'execTempTableStatements');
     context.logger.debug('dataCollector', 'execTempTableStatements statements', JSON.stringify(stms, null, '  '));
 

package/lib/uri/applyChecks.js

@@ -1,15 +1,15 @@
 'use strict';
 
-var async = require('async');
+const async = require('async');
 
 module.exports = function applyChecks(checks, context, callback) {
-    var checksForKind = checks[context.oData.kind];
+    const checksForKind = checks[context.oData.kind];
 
     if (!checksForKind) { //no checks for odata.kind defined
         return callback(null, context);
     }
 
-    var contextBoundChecks = checksForKind.map(function (check) {
+    const contextBoundChecks = checksForKind.map(function (check) {
         return check.bind(null, context);
     });