@sap/xsodata 8.2.1 → 8.3.1

package/lib/sql/createGetStatements.js

@@ -24,7 +24,7 @@ exports._masterTableInsert = masterTableInsert;
  */
 exports.createGetSqlStatements = function (context, asyncDone) {
 
-    var sqlContext = context.sql = {
+    const sqlContext = context.sql = {
         netId: context.uniqueNetworkRequestID,
         reqId: context.uniqueRequestID,
         rId: 1,
@@ -42,7 +42,7 @@ exports.createGetSqlStatements = function (context, asyncDone) {
     context.sql.cleanSessionDropContainer = [];
 
     masterTable(sqlContext);
-    expandedTables(sqlContext, sqlContext.dbSegLast, '', []);
+    expandedTables(sqlContext, sqlContext.dbSegLast, '');
     context.sql.container = sqlTools.collectSqls(context, sqlContext);
 
     return asyncDone(null, context);
@@ -57,19 +57,7 @@ function masterTable(sqlContext) {
 
     sqlContext.context.logger.debug('createGetStatements', 'masterTable');
 
-    //dbSeg.sql.stmContainer = new sql.GetContainer();
-
-    if (dbSeg.restriction.onlyCount === true) {
-        //no expand, avoid temporary tables
-        dbSeg.sql.stmContainer.select = exports._masterTableSimpleSelect(sqlContext);
-        dbSeg.sql.stmContainer.select.setAddCalcViewHint();
-        dbSeg.sql.stmContainer.select.setHints(sqlContext.context.gModel.getHints());
-    } else if (dbSeg.restriction.onlyValue === true) {
-        //no expand, avoid temporary tables
-        dbSeg.sql.stmContainer.select = exports._masterTableSimpleSelect(sqlContext);
-        dbSeg.sql.stmContainer.select.setAddCalcViewHint();
-        dbSeg.sql.stmContainer.select.setHints(sqlContext.context.gModel.getHints());
-    } else if (dbSeg._ExpandedNavigations.length === 0) {
+    if (dbSeg.restriction.onlyCount === true || dbSeg.restriction.onlyValue === true || dbSeg._ExpandedNavigations.length === 0) {
         //no expand, avoid temporary tables
         dbSeg.sql.stmContainer.select = exports._masterTableSimpleSelect(sqlContext);
         dbSeg.sql.stmContainer.select.setAddCalcViewHint();
@@ -130,26 +118,18 @@ function getLimit(sqlContext, name) {
             return 1000;
         }
     }
-    return null;
 }
 
-
 function masterTableSimpleSelect(sqlContext, countFallback) {
     // SAPINFO A simple odata GET request without and expand is processed without using temporary tables.
     // Count fallback it true if a SELECT is created which is used to obtain the max count for all records, even
     // if the result set is empty. (If the result is not empty there would be a count column)
-
-    var dbSeg, isCount, select, orderBy, selectCount;
-
+    let dbSeg, isCount, select, orderBy, selectCount;
     sqlContext.context.logger.debug('createGetStatements', 'masterTableSimpleSelect');
-
     dbSeg = sqlContext.dbSegLast;
     isCount = dbSeg.restriction.onlyCount || countFallback;
-
-
     //create select statement
     select = simpleSelectJoins(dbSeg, sqlContext);
-
     //add Query $filter
     if (sqlContext.systemQueryParameters.filter) {
         if (!checkConditionsProps(sqlContext.systemQueryParameters.filter, dbSeg.entityType.propertiesMap)) {
@@ -162,7 +142,6 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
         }
         select.addWhereAnded(sqlContext.systemQueryParameters.filter);
     }
-
     //add Query $orderby
     if (!isCount) {
         if (sqlContext.systemQueryParameters.orderby) {
@@ -173,15 +152,12 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
             if (orderBy.setAlias) { // Add WHERE statement from uri
                 orderBy.setAlias(dbSeg.getAlias());
             }
-
             if (orderBy.applyConverter) {
                 orderBy.applyConverter(replaceEdmPropertiesWithSqlProperties.bind(null, dbSeg));
             }
-
             select.addOrderBy(orderBy);
         }
     }
-
     // group by & order by
     if (dbSeg.entityType.hasAggregates()) {
         select.addGroupBys(dbSeg.getAllSelectedNonAggregateIncludingJoinPropertiesForGroupBy());
@@ -196,10 +172,10 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
                 select.addSortOrders(dbSeg.getKeyProperties0123ForOrderBy(true));
             } else {
                 let orderByProperties = dbSeg.getKeyProperties0123ForOrderByCalcView(true);
-                for (let i= 0; i < select.select.length; i++) {
-                    for (let j= 0; j < orderByProperties.length; j++) {
-                        if (orderByProperties[j].getPropertyName() === select.select[i].property) {
-                            select.select[i].alias = orderByProperties[j].expression.property;
+                for (const sel of select.select) {
+                    for (const orderByProperty of orderByProperties) {
+                        if (orderByProperty.getPropertyName() === sel.property) {
+                            sel.alias = orderByProperty.expression.property;
                         }
                     }
                 }
@@ -207,17 +183,14 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
             }
         }
     }
-
     //add $skip --> Offset
     if (sqlContext.systemQueryParameters.skip && !countFallback) {
         select.addOffset(sqlContext.systemQueryParameters.skip);
     }
-
     //add $top --> Limit
     if (!isCount) {
         const maxRecords = getLimit(sqlContext, 'max_records');
         const top = sqlContext.systemQueryParameters.top;
-
         if (maxRecords) {
             select.setCustomData('maxRecords', maxRecords);
             if (top >= 0) {
@@ -239,7 +212,6 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
             }
         }
     }
-
     if (!countFallback) {
         if (sqlContext.systemQueryParameters.inlinecount) {
             select.addFallbackStatement(masterTableSimpleSelect(sqlContext, true));
@@ -252,13 +224,9 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
         selectCount.addSelects([new sql.SelectFormula(null, 'count(*)', 'c')]);
     } else if (!sqlContext.systemQueryParameters.expand && !countFallback &&
         utils.isETagRequired(sqlContext.context, dbSeg)) {
-
         addETagToSelect(dbSeg, select);
     }
-
     return selectCount || select;
-
-
     /**
      * scan the tree of conditions, and check that every given property exist in the corresponding entityType
      * @param {object} tree - the conditions tree. It consists of an object with further objects, arrays or properties
@@ -266,9 +234,8 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
      * @return {boolean}
      * */
     function checkConditionsProps(tree, props) {
-        var objpr;
         // loop over all properties
-        for (objpr in tree) {
+        for (let objpr in tree) {
             if (tree.hasOwnProperty(objpr)) {
                 // if the property is an object itself, then recursively call the check
                 if (typeof tree[objpr] === 'object') {
@@ -280,10 +247,8 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
                 }
             }
         }
-
         return true;
     }
-
     /**
      * scan the array of $orderby orders, and check that every given property exist in the corresponding entityType
      * @param {object} tree - the conditions tree. It consists of an object with the array of orders
@@ -291,33 +256,28 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
      * @return {boolean}
      * */
     function checkOrderbyProps(tree, props) {
-        var expression, i;
+        let expression;
         // loop over all orders
-        for (i = 0; i < tree.orders.length; i++) {
-            expression = tree.orders[i].expression;
+        for (const treeOrder of tree.orders) {
+            expression = treeOrder.expression;
             // loop over all properties
             if (!checkConditionsProps(expression, props)) {
                 return false;
             }
         }
-
         return true;
     }
-
     /**
      * handle the MxN properties in the associative 'over' table
      * */
     function handleKeyPropertiesInOverTable(inner, dbSeg) {
-        var seg1overProp, seg1parentsJoinProp, seg1childsJoinProp;
-        var seg2overProp, seg2parentsJoinProp, seg2childsJoinProp;
-        var i;
-
+        let seg1overProp, seg1parentsJoinProp, seg1childsJoinProp;
+        let seg2overProp, seg2parentsJoinProp, seg2childsJoinProp;
         //create join property list from the first end ('dependent' | 'principal')
         seg1overProp = (dbSeg.isPrincipal() ? 'dependent' : 'principal'); // seg1 is on the contrary to dbSeg (that referes to dbSegmentLast
         seg1parentsJoinProp = dbSeg.getFrom().joinproperties;
         seg1childsJoinProp = dbSeg.getOver()[seg1overProp];
-
-        for (i = 0; i < seg1parentsJoinProp.length; i++) {
+        for (let i = 0; i < seg1parentsJoinProp.length; i++) {
             inner.addWhereAnded(new edm.BinaryOperator(edm.EQ,
                 /* no dbType required as the binary operator compares to properties, not property and value */
                 new edm.Property(seg1parentsJoinProp[i], dbSeg.previousDBSegment.getAlias()),
@@ -330,8 +290,7 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
         seg2overProp = (dbSeg.isPrincipal() ? 'principal' : 'dependent');
         seg2parentsJoinProp = dbSeg.getOver()[seg2overProp];
         seg2childsJoinProp = dbSeg.getTo().joinproperties;
-        for (i = 0; i < seg2parentsJoinProp.length; i++) {
-
+        for (let i = 0; i < seg2parentsJoinProp.length; i++) {
             inner.addWhereAnded(new edm.BinaryOperator(edm.EQ,
                 /* no dbType required as the binary operator compares to properties, not property and value */
                 new edm.Property(seg2childsJoinProp[i], dbSeg.getAlias()),
@@ -341,7 +300,6 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
             ));
         }
     }
-
     /**
      * handle the 1xN properties in the corresponding table
      * */
@@ -349,9 +307,7 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
         //create join property list
         const parentsJoinProp = dbSeg.getFrom().joinproperties;
         const childsJoinProp = dbSeg.getTo().joinproperties;
-        var i;
-
-        for (i = 0; i < parentsJoinProp.length; i++) {
+        for (let i = 0; i < parentsJoinProp.length; i++) {
             inner.addWhereAnded(new edm.BinaryOperator(edm.EQ,
                 /* no dbType required as the binary operator compares to properties, not property and value */
                 new edm.Property(parentsJoinProp[i], dbSeg.previousDBSegment.getAlias()),
@@ -361,8 +317,6 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
             ));
         }
     }
-
-
     /**
      * Creates a sql command to select data to which the resource path points to, all segments of the resource path with their dbSeg equivalents are joined
      * Sample: select "FromEntity1"."KEY_1" "0", "FromEntity1"."KEY_1", "FromEntity1"."INTEGER_1", "FromEntity1"."NVARCHAR_1" from "xsodata.test.tables::calc_nav__entity_from" as "FromEntity1"
@@ -372,21 +326,17 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
      */
     function simpleSelectJoins(dbSeg, sqlContext) {
         sqlContext.context.logger.debug('createGetStatements', 'simpleSelectJoins');
-
         //create select statement
-        var stm = new sql.Select();
-        var inner = null;
-
+        const stm = new sql.Select();
+        let inner = null;
         if (dbSeg.previousDBSegment) { //end of recursion
             inner = simpleSelectJoins(dbSeg.previousDBSegment, sqlContext);
-
             if (dbSeg.getOver()) {
                 handleKeyPropertiesInOverTable(inner, dbSeg);
             } else {
                 handleKeyProperties(inner, dbSeg);
             }
         }
-
         //SELECT
         if (dbSeg.nextDBSegment) {
             stm.addSelects([new sql.SelectFormula(null, '1')]);
@@ -399,14 +349,11 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
                     // if (in future) an association via input parameter is used then the input parameter values must be added via ? into the sql command
                     // that's because calcview don't return their input parameter in the result set
                     let tmp = dbSeg.getPropertiesForSelectCollectInputParameters();
-
                     // since the input parameters may not be returned from the calcview the parameters are merged after the select
                     // from "calcview2" into the result.  // Q: What does that mean: "calcview2"?
                     stm.byPassInputs = tmp.input;
                     stm.addSelects(tmp.selects);
-
                     stm.addSelects(dbSeg.getKeyPropertiesNotSelectedForSelect(undefined, dbSeg.entityType.inputParameters));
-
                     // keep aliased key properties
                     let selectProperties = dbSeg.getKeyProperties0123ForSelectOnCalcViewAs0123();
                     dbSeg.setAliasedKeyPropertiesOnCalcView(selectProperties);
@@ -415,20 +362,14 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
                     stm.addSelects(dbSeg.getPropertiesForSelect());
                     stm.addSelects(dbSeg.getKeyPropertiesNotSelectedForSelect());
                 }
-                //}
-                //stm.addSelects(dbSeg.getAllSelectedPropertiesConsideringAggregates());
             }
-
             if (dbSeg._ExpandedNavigations.length > 0 || dbSeg._SelectedNavigations.length > 0) {
                 stm.addSelects(dbSeg.getNavPropertiesForSelect());
             }
-            //stm.addSelects(dbSeg.getQNonKeyProperties());
             if (sqlContext.systemQueryParameters.inlinecount && !countFallback) {
                 stm.addSelects(new sql.SelectFormula(null, 'count(*) over () as ', '0count'));
             }
-
         }
-
         //FROM
         if (dbSeg.nextDBSegment && dbSeg.nextDBSegment.getOver()) {
             stm.addFrom({
@@ -437,8 +378,7 @@ function masterTableSimpleSelect(sqlContext, countFallback) {
                 alias: dbSeg.getAssocAlias()
             });
         }
-        var fromSource = dbSeg.getAliasedTableName();
-        //fromSource.parameters = dbSeg.inputParams;
+        const fromSource = dbSeg.getAliasedTableName();
         stm.addFrom(fromSource, dbSeg.getInputParameters());
         if (inner) {
             //WHERE set Exists first
@@ -460,10 +400,10 @@ function replaceEdmPropertiesWithSqlProperties(dbSeg, expression) {
 
 function masterTableCreate(sqlContext, rId) {
     sqlContext.context.logger.debug('createGetStatements', 'masterTableCreate');
-    var dbSeg = sqlContext.dbSegLast;
-    var isCount = sqlContext.systemQueryParameters.inlinecount;
+    const dbSeg = sqlContext.dbSegLast;
+    const isCount = sqlContext.systemQueryParameters.inlinecount;
 
-    var stmCreate = new sql.Create();
+    const stmCreate = new sql.Create();
     stmCreate.setModifiers(['local', 'temporary', dbSeg.entityType.tableStoreType]);
     stmCreate.setTableName(rId);
 
@@ -494,17 +434,17 @@ function masterTableInsert(sqlContext) {
 
     //SystemQuery option order: $format, $inlinecount, $filter, $orderby, $skiptoken, $skip, $top,  $expand.
 
-    var dbSeg = sqlContext.dbSegLast;
+    const dbSeg = sqlContext.dbSegLast;
 
-    var stmInsert = new sql.Insert();
+    const stmInsert = new sql.Insert();
     stmInsert.setTableName({ table: dbSeg.sql.rId });
 
-    var selectRow = new sql.Select();
+    const selectRow = new sql.Select();
     selectRow.addSelects(new sql.SelectFormula(null, '*'));
     selectRow.addSelects(new sql.OverFormula('1row'));
 
 
-    var subSelect = exports._masterTableSimpleSelect(sqlContext);
+    const subSelect = exports._masterTableSimpleSelect(sqlContext);
 
     selectRow.setFromBySubQuery(subSelect);
     stmInsert.setSubSelect(selectRow);
@@ -514,9 +454,9 @@ function masterTableInsert(sqlContext) {
 
 function masterTableSelect(sqlContext) {
     sqlContext.context.logger.debug('createGetStatements', 'masterTableSelect');
-    var dbSeg = sqlContext.dbSegLast;
-    var stmSelect = new sql.Select();
-    var isCount = sqlContext.systemQueryParameters.inlinecount;
+    const dbSeg = sqlContext.dbSegLast;
+    const stmSelect = new sql.Select();
+    const isCount = sqlContext.systemQueryParameters.inlinecount;
 
     addSelectsForSelectFromTmp(stmSelect, dbSeg);
 
@@ -547,13 +487,15 @@ function masterTableSelect(sqlContext) {
 }
 
 function expandedTables(sqlContext, parentSeg, path) {
-    var navigationNames = parentSeg._ExpandedNavigations, truncateStmt, dropStmt,
+    const navigationNames = parentSeg._ExpandedNavigations,
         truncateContainer = sqlContext.context.sql.cleanSessionTruncateContainer,
         dropContainer = sqlContext.context.sql.cleanSessionDropContainer;
+    let truncateStmt;
+    let dropStmt;
 
     //loop thought expanded tables
-    for (var i = 0; i < navigationNames.length; i++) {
-        var dbSegExpanded = parentSeg.getRelevantNavigationSegments()[navigationNames[i]];
+    for (const navigationName of navigationNames) {
+        const dbSegExpanded = parentSeg.getRelevantNavigationSegments()[navigationName];
 
         dbSegExpanded.sql.stmContainer = new sql.GetContainer();
 
@@ -599,7 +541,7 @@ function expandedTables(sqlContext, parentSeg, path) {
 }
 
 function expandCreate(dbSeg) {
-    var stmCreate = new sql.Create();
+    const stmCreate = new sql.Create();
 
     stmCreate.setModifiers(['local', 'temporary', dbSeg.entityType.tableStoreType]);
     stmCreate.setTableName(dbSeg.sql.rId);
@@ -623,9 +565,9 @@ function expandCreate(dbSeg) {
 }
 
 function expandInsert(dbSeg, sqlContext) {
-    var subSelect = exports._expandSimpleSelect(dbSeg, undefined, sqlContext);
+    const subSelect = exports._expandSimpleSelect(dbSeg, undefined, sqlContext);
 
-    var stmInsert = new sql.Insert();
+    const stmInsert = new sql.Insert();
     stmInsert.setTableName({ table: dbSeg.sql.rId });
     stmInsert.setSubSelect(subSelect);
     return stmInsert;
@@ -640,13 +582,13 @@ function expandInsert(dbSeg, sqlContext) {
  * @returns {Select}
  */
 function expandSimpleSelect(dbSeg, addEtag, sqlContext) {
-    var subSelect = new sql.Select();
+    const subSelect = new sql.Select();
 
     //SELECT
     //this adds the 1row index from the parent table.
     subSelect.addSelects(new sql.SelectProperty(dbSeg.previousDBSegment.getAlias(), '1row', null, '0row'));
 
-    var over = createOverWithOrderBys(dbSeg); //this ensure the
+    const over = createOverWithOrderBys(dbSeg); //this ensure the
     subSelect.addSelects(over);
 
     //Over with 1row is not required here because this dbSeg has no expands
@@ -663,7 +605,7 @@ function expandSimpleSelect(dbSeg, addEtag, sqlContext) {
         alias: dbSeg.previousDBSegment.getAlias()
     });
 
-    var onStatements = createOnStatements(dbSeg);
+    const onStatements = createOnStatements(dbSeg);
 
     if (onStatements.first.length > 0) {
         subSelect.addJoin({
@@ -672,7 +614,7 @@ function expandSimpleSelect(dbSeg, addEtag, sqlContext) {
         }, onStatements.first);
     }
 
-    var joinSelect = new sql.Select();
+    const joinSelect = new sql.Select();
     if (dbSeg.entityType.hasGeneratedKey()) {
         joinSelect.addSelects(dbSeg.getAllSelectedIncludingJoinPropertiesConsideringAggregates());
     } else {
@@ -690,7 +632,7 @@ function expandSimpleSelect(dbSeg, addEtag, sqlContext) {
 
     // group bys
     if (dbSeg.entityType.hasAggregates()) {
-        var groupBys = dbSeg.getAllSelectedNonAggregateIncludingJoinPropertiesForGroupBy();
+        const groupBys = dbSeg.getAllSelectedNonAggregateIncludingJoinPropertiesForGroupBy();
         joinSelect.addGroupBys(groupBys);
     }
 
@@ -714,7 +656,7 @@ function expandSimpleSelect(dbSeg, addEtag, sqlContext) {
 }
 
 function createOverWithOrderBys(dbSeg) {
-    var over = new sql.OverFormula('1row'); //this ensure the
+    const over = new sql.OverFormula('1row'); //this ensure the
 
     /* no dbType required as property is used only for SortOrder */
     over.addSortOrder(new edm.SortOrder(new edm.Property('1row', dbSeg.previousDBSegment.getAlias()), 'ASC'));
@@ -729,11 +671,11 @@ function createOverWithOrderBys(dbSeg) {
 }
 
 function createOnStatements(dbSeg) {
-    var parentsJoinProps = dbSeg.getFrom().joinproperties;
-    var childJoinProps = dbSeg.getTo().joinproperties;
-    var overJoinProps = dbSeg.getOver();
+    const parentsJoinProps = dbSeg.getFrom().joinproperties;
+    const childJoinProps = dbSeg.getTo().joinproperties;
+    const overJoinProps = dbSeg.getOver();
 
-    var onStatements = {
+    const onStatements = {
         first: [],
         second: []
     };
@@ -776,7 +718,7 @@ function createOnStatements(dbSeg) {
 }
 
 function expandSelect(dbSeg, sqlContext) {
-    var subSelect = new sql.Select();
+    const subSelect = new sql.Select();
 
     subSelect.addSelects([new sql.SelectProperty(null, '0row')]);
     subSelect.addSelects([new sql.SelectProperty(null, '1row')]);

package/lib/sql/createLinksSQLStatements_1_n.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var sql = require('./sqlStatement');
-var sqlTools = require('./sqlTools');
+const sql = require('./sqlStatement');
+const sqlTools = require('./sqlTools');
 
 function masterTableCreate(sqlContext, rId) {
     return createSQLCreateStmt(sqlContext.dbSegToBeUpdated, rId, true);
@@ -17,7 +17,7 @@ function masterTableCreate(sqlContext, rId) {
  * @returns {Create} SQL CREATE statement
  */
 function createSQLCreateForAssocTable(sqlContext, rId, from) {
-    var dbSeg = (from === 'principal' ? sqlContext.dbSegPrincipal : sqlContext.dbSegDependent);
+    const dbSeg = (from === 'principal' ? sqlContext.dbSegPrincipal : sqlContext.dbSegDependent);
 
     return createSQLCreateStmt(dbSeg, rId, false);
 }
@@ -31,7 +31,7 @@ function createSQLCreateForAssocTable(sqlContext, rId, from) {
  * @returns {Create} SQL CREATE TEMPORARY TABLE statement
  */
 function createSQLCreateStmt(dbSeg, rId, withForeignKeyProperties) {
-    var stmCreate = new sql.Create();
+    const stmCreate = new sql.Create();
 
     stmCreate.setModifiers(['local', 'temporary', dbSeg.entityType.tableStoreType]);
     stmCreate.setTableName(rId);
@@ -62,7 +62,7 @@ function createSQLCreateStmt(dbSeg, rId, withForeignKeyProperties) {
  * @returns {Select} SQL SELECT statement.
  */
 function createSelectTemplate(dbSeg, withForeignKeyProperties) {
-    var stm = new sql.Select();
+    const stm = new sql.Select();
 
     stm.addSelects(dbSeg.getQKeyProperties());
     if (dbSeg._ExpandedNavigations.length > 0) {
@@ -82,9 +82,9 @@ function createSelectTemplate(dbSeg, withForeignKeyProperties) {
 exports.createLinksStatementsCreateTmpTables = function (context, isDeleteScenario) {
     context.logger.silly('createLinksSQLStatements', 'createLinksStatements');
 
-    var dbSegToBeUpdated = context.oData.links.toBeUpdated;
+    const dbSegToBeUpdated = context.oData.links.toBeUpdated;
 
-    var sqlContext = {
+    const sqlContext = {
         context: context,                                               // sqlContext gets parent context (includes "isHanaCloudDb")
         netId: context.uniqueNetworkRequestID,
         reqId: context.uniqueRequestID,
@@ -102,7 +102,7 @@ exports.createLinksStatementsCreateTmpTables = function (context, isDeleteScenar
 
     dbSegToBeUpdated.sql.stmContainer = new sql.PutContainer();
 
-    createStatementContainerCreateTmpTables(sqlContext, isDeleteScenario);
+    createStatementContainerCreateTmpTables(sqlContext);
 };
 
 exports.createLinksStatementsInsert = function (context, isDeleteScenario) {
@@ -115,7 +115,7 @@ exports.createLinksStatementsInsert = function (context, isDeleteScenario) {
 
 function createStatementContainerCreateTmpTables(sqlContext/*, isDeleteScenario*/) {
     sqlContext.context.logger.debug('createLinksSQLStatements', 'createStatementContainer');
-    var dbSeg = sqlContext.dbSegToBeUpdated;
+    const dbSeg = sqlContext.dbSegToBeUpdated;
 
     // This is to have same 'context.sql.container' property in all tests
     sqlContext.context.sql.container = dbSeg.sql.stmContainer;
@@ -159,7 +159,7 @@ function createStatementContainerCreateTmpTables(sqlContext/*, isDeleteScenario*
 
 function createStatementContainerInsert(sqlContext, isDeleteScenario) {
     sqlContext.context.logger.debug('createLinksSQLStatements', 'createStatementContainer');
-    var dbSeg = sqlContext.dbSegToBeUpdated;
+    const dbSeg = sqlContext.dbSegToBeUpdated;
 
     //create insert statement for master table
     dbSeg.sql.stmContainer.insertTmp = masterTableInsertToNew(sqlContext, dbSeg.sql.rIdNew, isDeleteScenario);
@@ -176,9 +176,9 @@ function createStatementContainerInsert(sqlContext, isDeleteScenario) {
 }
 
 function masterTableInsertToNew(sqlContext, rId, isDeleteScenario) {
-    var dbSeg = sqlContext.dbSegToBeUpdated,
-        linkDbSeg = sqlContext.context.oData.links.keySource,
-        subSelect,
+    const dbSeg = sqlContext.dbSegToBeUpdated,
+        linkDbSeg = sqlContext.context.oData.links.keySource;
+    let subSelect,
         dbValues,
         insertStmt;
 
@@ -209,9 +209,9 @@ function masterTableInsertToNew(sqlContext, rId, isDeleteScenario) {
 
 function masterTableInsertToOld(sqlContext, rId) {
     sqlContext.context.logger.debug('createLinksSQLStatements', 'masterTableInsertToOld');
-    var dbSeg = sqlContext.dbSegToBeUpdated;
+    const dbSeg = sqlContext.dbSegToBeUpdated;
 
-    var subSelect = new sql.Select();
+    const subSelect = new sql.Select();
     subSelect.addSelects(dbSeg.getQKeyProperties());
     subSelect.addSelects(dbSeg.getQForeignKeyProperties());
     subSelect.setFrom(dbSeg.getAliasedTableName());
@@ -220,7 +220,7 @@ function masterTableInsertToOld(sqlContext, rId) {
         subSelect.addWhereKeyValuePairs(dbSeg.getQForeignKeyWithValues());
     }
 
-    var stm = new sql.Insert();
+    const stm = new sql.Insert();
     stm.setTableName({ table: rId });
     stm.setSubSelect(subSelect);
 
@@ -236,10 +236,10 @@ function masterTableInsertToOld(sqlContext, rId) {
  * @returns {Insert} SQL INSERT statement
  */
 function createInsertStmtForAssocTable(sqlContext, rId, from) {
-    var dbSeg = (from === 'principal' ? sqlContext.dbSegPrincipal : sqlContext.dbSegDependent);
+    const dbSeg = (from === 'principal' ? sqlContext.dbSegPrincipal : sqlContext.dbSegDependent);
 
-    var stm = new sql.Insert();
-    var subSelect = new sql.Select();
+    const stm = new sql.Insert();
+    const subSelect = new sql.Select();
 
     subSelect.addSelects(dbSeg.getQKeyProperties());
     subSelect.addSelects(dbSeg.getQNonKeyProperties());
@@ -260,9 +260,9 @@ function createInsertStmtForAssocTable(sqlContext, rId, from) {
  */
 function masterTableUpdate(sqlContext, rId) {
     sqlContext.context.logger.debug('createLinksSQLStatements', 'masterTableUpdate');
-    var dbSeg = sqlContext.dbSegToBeUpdated;
+    const dbSeg = sqlContext.dbSegToBeUpdated;
 
-    var update = new sql.Update();
+    const update = new sql.Update();
     update.setTable(dbSeg.getAliasedTableName('PERM')); //overwrite alias
 
     update.addSetCopyProperties(dbSeg.getQForeignKeyProperties(), 'TEMP');
@@ -296,14 +296,14 @@ exports.createMNSQLContext = function createMNSQLContext(context, dbSegment) {
 
 exports.createMNStatementContainerCreateTmpTables = function createMNStatementContainerCreateTmpTable(sqlContext) {
     sqlContext.context.logger.debug('createLinksSQLStatements', 'createMNStatementContainer');
-    var dbSeg = sqlContext.dbSegLast;
+    const dbSeg = sqlContext.dbSegLast;
 
     // This is to have same 'context.sql.container' property in all tests
     sqlContext.context.sql.container = dbSeg.sql.stmContainer;
 
 
-    var over = dbSeg.getOver().object; // e.g. "xsodata.test.tables::complex_assoc_atob"
-    var alias = over.substring(over.indexOf('::') + 2, over.length);
+    const over = dbSeg.getOver().object; // e.g. "xsodata.test.tables::complex_assoc_atob"
+    const alias = over.substring(over.indexOf('::') + 2, over.length);
     dbSeg.sql.rId = sqlTools.rIdToNewTableName(alias, sqlContext.netId, sqlContext.reqId, sqlContext.rId++);
     // principal and dependent (temp) tables, to be used in custom exits
     dbSeg.sql.rIdPrincipal = sqlTools.rIdToAlteredTableName('#p', sqlContext.dbSegPrincipal._AliasName, sqlContext.netId, sqlContext.reqId, sqlContext.rId++);
@@ -336,7 +336,7 @@ exports.createMNStatementContainerCreateTmpTables = function createMNStatementCo
 };
 exports.createMNStatementContainerInsert = function createMNStatementContainerInsert(sqlContext) {
     sqlContext.context.logger.debug('createLinksSQLStatements', 'createMNStatementContainer');
-    var dbSeg = sqlContext.dbSegLast;
+    const dbSeg = sqlContext.dbSegLast;
 
     //create insert statements for principal/dependent tables
     dbSeg.sql.stmContainer.insertPrincipal = createInsertStmtForAssocTable(sqlContext, dbSeg.sql.rIdPrincipal, 'principal');
@@ -346,8 +346,8 @@ exports.createMNStatementContainerInsert = function createMNStatementContainerIn
 
 function masterMNTableCreate(sqlContext, rId) {
     sqlContext.context.logger.debug('createLinksSQLStatements', 'masterMNTableCreate');
-    var dbSeg = sqlContext.dbSegLast;
-    var stmCreate = new sql.Create();
+    const dbSeg = sqlContext.dbSegLast;
+    const stmCreate = new sql.Create();
     stmCreate.setModifiers(['local', 'temporary', dbSeg.entityType.tableStoreType]);
     stmCreate.setTableName(rId);