@sap/xsodata 8.3.0 → 8.3.1

package/lib/sql/createPutPostLinksStatements.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var linksSQL = require ("./createLinksSQLStatements_1_n");
-var sql = require('./sqlStatement');
+const linksSQL = require ("./createLinksSQLStatements_1_n");
+const sql = require('./sqlStatement');
 
 exports.createPutPostLinksStatementsCreateTmpTables = function (context, asyncDone) {
 	linksSQL.createLinksStatementsCreateTmpTables (context);
@@ -16,7 +16,7 @@ exports.createPutPostLinksStatementsInsert = function (context, asyncDone) {
 
 exports.createPutPostLinksMNStatementsCreateTmpTables  = function (context, asyncDone) {
     try {
-        var dbSegLast = context.oData.dbSegmentLast,
+        const dbSegLast = context.oData.dbSegmentLast,
 	        sqlContext = linksSQL.createMNSQLContext(context, dbSegLast);
 
         context.sql = sqlContext;
@@ -46,7 +46,7 @@ function createMNPutPostLinksStatementContainerCreateTmpTables(sqlContext) {
 }
 
 function createMNPutPostLinksStatementContainerInsert(sqlContext) {
-    var dbSeg = sqlContext.dbSegLast;
+    const dbSeg = sqlContext.dbSegLast;
 
     linksSQL.createMNStatementContainerInsert(sqlContext);
 
@@ -59,9 +59,9 @@ function createMNPutPostLinksStatementContainerInsert(sqlContext) {
 
 function masterMNTableInsertTmp(sqlContext, rId) {
     sqlContext.context.logger.debug('createPutPostLinksStatements', 'masterMNTableInsertTmp');
-    var dbSeg = sqlContext.dbSegLast;
+    const dbSeg = sqlContext.dbSegLast;
 
-    var stm = new sql.Insert();
+    const stm = new sql.Insert();
     stm.setTableName({table: rId});
     //SELECT
     stm.addNames(dbSeg.getSelectFragmentsForOverProperties(rId));
@@ -70,14 +70,14 @@ function masterMNTableInsertTmp(sqlContext, rId) {
 }
 
 function masterMNTableInsert(sqlContext, rId) {
-    var dbSeg = sqlContext.dbSegLast;
+    const dbSeg = sqlContext.dbSegLast;
 
     //subselect
-    var subSelect = new sql.Select();
+    const subSelect = new sql.Select();
     subSelect.addSelects(new sql.SelectFormula(null, '*'));
     subSelect.setFrom({schema: null, table: rId, alias: null});
 
-    var stm = new sql.Upsert();
+    const stm = new sql.Upsert();
 
     stm.setTable({table: dbSeg.getOver().object});
     stm.addNames(dbSeg.getSelectFragmentsForOverProperties(rId));

package/lib/sql/createPutStatements.js

@@ -189,7 +189,6 @@ function masterTableUpdate(sqlContext, rId) {
     const update = new sql.Update();
     update.setTable(dbSeg.getAliasedTableName('PERM')); //overwrite alias
 
-    //update.addSetCopyProperties(dbSeg.getQKeyProperties(), 'TEMP');
     const copyPropertiesOrig = dbSeg.getQNonKeyProperties();
     const copyProperties = [];
 

package/lib/sql/dataCollectorDelete.js

@@ -1,21 +1,21 @@
 'use strict';
 
 //Include
-var dataCollector2 = require('./dataCollector2');
-var statementProcessor = require('./statementProcessor');
+const dataCollector2 = require('./dataCollector2');
+const statementProcessor = require('./statementProcessor');
 
 
 exports.createTmpTables = function (context, asyncDone) {
     context.logger.silly('dataCollectorDelete', 'createTmpTables');
-    var dbSeg = context.oData.dbSegmentLast;
-    var stm = dbSeg.sql.stmContainer.createTmpDel;
+    const dbSeg = context.oData.dbSegmentLast;
+    const stm = dbSeg.sql.stmContainer.createTmpDel;
     return statementProcessor.execStmsDirectlyNoResult(context,stm, asyncDone);
 };
 
 
 exports.insertDataToDelTable = function (context, asyncDone) {
     context.logger.silly('dataCollectorDelete', 'insertDataToDelTable');
-    var dbSeg = context.oData.dbSegmentLast;
+    const dbSeg = context.oData.dbSegmentLast;
     statementProcessor.execStmsAsPrepared(context,[dbSeg.sql.stmContainer.insertTmpDel],  (err, context, resultset) => {
         if (err) {
             return asyncDone(err, context);
@@ -27,14 +27,14 @@ exports.insertDataToDelTable = function (context, asyncDone) {
 
 exports.deleteTable = function (context, asyncDone) {
     context.logger.silly('dataCollectorDelete', 'deleteTable');
-    var dbSeg = context.oData.dbSegmentLast;
+    const dbSeg = context.oData.dbSegmentLast;
     statementProcessor.execStmsAsPreparedNoResult(context,dbSeg.sql.stmContainer.delete,  asyncDone);
 };
 
 
 exports.commit = function (context, asyncDone) {
     context.logger.silly('dataCollectorDelete', 'commit');
-    var client = context.db.client;
+    const client = context.db.client;
     client.commit(function (err) {
         if (err) {
             context.logger.info('SQL Exec', 'Commit Error: \n' + JSON.stringify(err));
@@ -51,7 +51,7 @@ exports.commit = function (context, asyncDone) {
  * @param {Function} asyncDone async waterfall callback
  */
 exports.truncateTempTables = function (context, asyncDone) {
-    var statements;
+    let statements;
     context.logger.silly('dataCollectorDelete', 'truncateTempTables');
 
     statements = [context.sql.container.createTmpDelTruncate];
@@ -70,7 +70,7 @@ exports.truncateTempTables = function (context, asyncDone) {
  * @param {Function} asyncDone async waterfall callback
  */
 exports.dropTempTables = function (context, asyncDone) {
-    var statements;
+    let statements;
     context.logger.silly('dataCollectorDelete', 'dropTempTables');
 
     statements = [context.sql.container.createTmpDelDrop];

package/lib/sql/dataCollectorDeleteLinks.js

@@ -1,18 +1,18 @@
 'use strict';
 
 //Include
-var statementProcessor = require('./statementProcessor');
+const statementProcessor = require('./statementProcessor');
 
 exports.insertDataToDelTable = function (context, asyncDone) {
     context.logger.silly('dataCollectorDeleteLinks', 'insertDataToDelTable');
-    var dbSeg = context.oData.dbSegmentLast;
+    const dbSeg = context.oData.dbSegmentLast;
     statementProcessor.execStmsAsPreparedNoResult(context, dbSeg.sql.stmContainer.insertTmp, asyncDone);
 
 };
 
 exports.deleteTable = function (context, asyncDone) {
     context.logger.silly('dataCollectorDeleteLinks', 'deleteTable');
-    var dbSeg = context.oData.dbSegmentLast;
+    const dbSeg = context.oData.dbSegmentLast;
     statementProcessor.execStmsAsPreparedNoResult(context, dbSeg.sql.stmContainer.delete, asyncDone);
 };
 

package/lib/sql/dataCollectorGet.js

@@ -7,9 +7,6 @@ const statementProcessor = require('./statementProcessor');
 const utils = require('../utils/utils');
 const SqlError = require('../utils/errors/sqlError');
 const BadRequest = require('../utils/errors/http/badRequest');
-// const { createNewContentIdFromDbSegSelectedRows } = require('../processor/contentIdHelper');
-// const { call } = require('../../test/utils');
-
 
 const saveTmpTableCreate = function(item, context, asyncDone) {
     const dropTmpTableCallback = (err, context) => {
@@ -51,8 +48,8 @@ exports.createTmpTables = function (context, asyncDone) {
 exports.insertFillTmpTables = function (context, asyncDone) {
     context.logger.silly('dataCollectorGet', 'insertFillTmpTables');
 
-    var container = context.sql.container;
-    var stms = container.getInsertTmpStms();
+    const container = context.sql.container;
+    const stms = container.getInsertTmpStms();
 
     return statementProcessor.execStmsAsPreparedNoResult(context, stms, asyncDone);
 };
@@ -61,8 +58,8 @@ exports.insertFillTmpTables = function (context, asyncDone) {
 exports.select = function (context, asyncDone) {
     context.logger.silly('dataCollectorGet', 'select');
 
-    var container = context.sql.container;
-    var stms = container.select.concat(container.selectTmp);
+    const container = context.sql.container;
+    const stms = container.select.concat(container.selectTmp);
 
     async.mapSeries(
         stms,
@@ -145,22 +142,17 @@ exports.select = function (context, asyncDone) {
             }
 
             // Add byPassInputs to rows
-            let conv = [];
             if (byPassInputs) {
-                for (let i = 0; i < byPassInputs.length; i++) {
-                    const input = byPassInputs[i];
+                for (const input of byPassInputs) {
                     let param = [];
                     input.toSqlHana(context, param, { useDbType: input._dbType });
-                    conv.push(param[0]);
 
-                    for (let r = 0; r < rows.length; r++) {
-                        let row = rows[r];
+                    for (const row of rows) {
                         row[input.property] = param[0];
                     }
                 }
             }
             context.logger.silly('GET dataCollector - row count', JSON.stringify(rows.length));
-            // context.logger.silly('dataCollector', JSON.stringify(rows, null, 2));
             return cb(null, rows);
 
         });
@@ -220,8 +212,8 @@ let CalcViewCallback = function (item, context, cb) {
  * @param {Function} callback - callback, which should be called once the operation is completed
  */
 exports.executeSelect = function executeSelect(context, selectStmt, callback) {
-    var parameters = [];
-    var sql;
+    const parameters = [];
+    let sql;
 
     try {
         sql = selectStmt.toSqlHana(new sqlStatement.SqlBuildHanaContext(context), parameters);
@@ -253,7 +245,7 @@ exports.dropTempTables = function (context, asyncDone) {
 
 exports.commit = function (context, asyncDone) {
     context.logger.debug('dataCollectorGet', 'commit');
-    var client = context.db.client;
+    const client = context.db.client;
     client.commit(function (err) {
         if (err) {
             context.logger.info('SQL Exec', 'Commit Error: \n' + JSON.stringify(err));

package/lib/sql/dataCollectorLinks.js

@@ -1,23 +1,23 @@
 'use strict';
 
 //Include
-var dataCollector2 = require('./dataCollector2');
-var statementProcessor = require('./statementProcessor');
+const dataCollector2 = require('./dataCollector2');
+const statementProcessor = require('./statementProcessor');
 
 exports.moveRecordNV_ToSelectStm = function (context, asyncDone) {
     context.logger.silly('dataCollectorLinks', 'moveRecordNV_ToSelectStm');
     //get dbSegment to be updated, for inserting the payload
-    var dbSeg = context.oData.links.toBeUpdated;
-    var stm = dbSeg.sql.stmContainer.insertTmp;
+    const dbSeg = context.oData.links.toBeUpdated;
+    const stm = dbSeg.sql.stmContainer.insertTmp;
 
     if (!stm) {
         return asyncDone(new Error("An error occurred."), context);
     }
 
-    var max = dbSeg._recordNV.length;
-    var i;
+    const max = dbSeg._recordNV.length;
+    let i;
     for (i = 0; i < max; i++) {
-        var nv = dbSeg._recordNV[i];
+        const nv = dbSeg._recordNV[i];
         stm.setValue(nv.name, nv.value);
     }
     return asyncDone(null, context);
@@ -25,8 +25,8 @@ exports.moveRecordNV_ToSelectStm = function (context, asyncDone) {
 
 exports.movePayloadFromMNSegmentToSelectStm = function (context, asyncDone) {
     //get dbSegment for inserting the payload
-    var dbSeg = context.oData.dbSegmentLast;
-    var stm = dbSeg.sql.stmContainer.insertTmp;
+    const dbSeg = context.oData.dbSegmentLast;
+    const stm = dbSeg.sql.stmContainer.insertTmp;
     if (!stm) {
         return asyncDone(new Error("An error occurred."), context);
     }
@@ -48,10 +48,6 @@ exports.movePayloadFromMNSegmentToSelectStm = function (context, asyncDone) {
         }
     }
 
-    //stm.setValue(over.principal[0], context.oData.dbSegment._KeyValues[0].value);
-    //stm.setValue(over.dependent[0], context.oData.dbSegmentLast._KeyValues[0].value);
-
-
     for (let i = 0; i < to.joinproperties.length; i++) {
         for (let kv of context.oData.dbSegmentLast._KeyValues) {
             if (kv.name === to.joinproperties[i]) {
@@ -64,8 +60,8 @@ exports.movePayloadFromMNSegmentToSelectStm = function (context, asyncDone) {
 };
 
 exports.createTmpTables = function (context, asyncDone) {
-    var dbSeg = context.oData.links.toBeUpdated;
-    var stms = [
+    const dbSeg = context.oData.links.toBeUpdated;
+    const stms = [
         dbSeg.sql.stmContainer.createTmpOld,
         dbSeg.sql.stmContainer.createTmp,
         dbSeg.sql.stmContainer.createPrincipal,
@@ -76,8 +72,8 @@ exports.createTmpTables = function (context, asyncDone) {
 };
 
 exports.createTmpTableMN = function (context, asyncDone) {
-    var dbSeg = context.oData.dbSegmentLast;
-    var stms = [
+    const dbSeg = context.oData.dbSegmentLast;
+    const stms = [
         dbSeg.sql.stmContainer.createTmp,
         dbSeg.sql.stmContainer.createPrincipal,
         dbSeg.sql.stmContainer.createDependent
@@ -86,7 +82,7 @@ exports.createTmpTableMN = function (context, asyncDone) {
 };
 
 exports.insertOldDataToOldTable = function (context, asyncDone) {
-    var dbSeg = context.oData.links.toBeUpdated;
+    const dbSeg = context.oData.links.toBeUpdated;
 
     statementProcessor.execStmsAsPrepared(context, [dbSeg.sql.stmContainer.insertTmpOld], (err, context, resultset) => {
         if (err) {
@@ -101,8 +97,8 @@ exports.insertOldDataToOldTable = function (context, asyncDone) {
  * insert corresponding data to the temp principal|dependent tables
  * */
 exports.insertOldDataToPrincipalDependentTables = function (context, asyncDone) {
-    var dbSeg = context.oData.links.toBeUpdated;
-    var stms = [
+    const dbSeg = context.oData.links.toBeUpdated;
+    const stms = [
         dbSeg.sql.stmContainer.insertPrincipal,
         dbSeg.sql.stmContainer.insertDependent
     ];
@@ -111,7 +107,7 @@ exports.insertOldDataToPrincipalDependentTables = function (context, asyncDone)
 };
 
 exports.insertPayloadIntoTempTable = function (context, asyncDone) {
-    var dbSeg = context.oData.links.toBeUpdated;
+    const dbSeg = context.oData.links.toBeUpdated;
 
     context.logger.silly('dataCollectorLinks', 'insertPayloadIntoTempTable');
 
@@ -126,7 +122,7 @@ exports.insertPayloadIntoTempTable = function (context, asyncDone) {
 exports.insertTmpTableToRealTable = function (context, asyncDone) {
     context.logger.silly('dataCollectorLinks', 'insertTmpTableToRealTable');
 
-    var dbSeg = context.oData.links.toBeUpdated;
+    const dbSeg = context.oData.links.toBeUpdated;
     statementProcessor.execStmsAsPrepared(context, [dbSeg.sql.stmContainer.updateReal], (err, context, resultset) => {
         if (err) {
             return asyncDone(err, context);
@@ -142,7 +138,7 @@ exports.commit = function (context, asyncDone) {
         return asyncDone(null, context);
     }
 
-    var client = context.db.client;
+    const client = context.db.client;
     context.logger.debug('dataCollectorLinks', 'commit');
     client.commit(function (err) {
         if (err) {
@@ -160,7 +156,7 @@ exports.commit = function (context, asyncDone) {
  * @param {Function} asyncDone async waterfall callback
  */
 exports.truncateTempTablesMN = function (context, asyncDone) {
-    var statements;
+    let statements;
     context.logger.silly('dataCollectorLinks', 'truncateTempTablesMN');
 
     statements = [
@@ -184,7 +180,7 @@ exports.truncateTempTablesMN = function (context, asyncDone) {
  * @param {Function} asyncDone async waterfall callback
  */
 exports.dropTempTablesMN = function (context, asyncDone) {
-    var statements;
+    let statements;
     context.logger.silly('dataCollectorLinks', 'dropTempTablesMN');
 
     statements = [
@@ -208,7 +204,7 @@ exports.dropTempTablesMN = function (context, asyncDone) {
  * @param {Function} asyncDone async waterfall callback
  */
 exports.truncateTempTables = function (context, asyncDone) {
-    var statements;
+    let statements;
     context.logger.silly('dataCollectorLinks', 'truncateTempTables');
 
     // Special hack for $batch.
@@ -240,7 +236,7 @@ exports.truncateTempTables = function (context, asyncDone) {
  * @param {Function} asyncDone async waterfall callback
  */
 exports.dropTempTables = function (context, asyncDone) {
-    var statements;
+    let statements;
     context.logger.silly('dataCollectorLinks', 'dropTempTables');
 
     // Special hack for $batch.

package/lib/sql/dataCollectorPost.js

@@ -9,17 +9,17 @@ const SqlError = require('../utils/errors/sqlError');
 exports.moveRecordNV_ToSelectStm = function (context, asyncDone) {
     context.logger.silly('dataCollectorPost', 'moveRecordNV_ToSelectStm');
     //get dbSegment for inserting the payload
-    var dbSeg = context.oData.dbSegmentLast;
+    const dbSeg = context.oData.dbSegmentLast;
 
-    var stm = dbSeg.sql.stmContainer.insertTmp;
+    const stm = dbSeg.sql.stmContainer.insertTmp;
     if (!stm) {
         return asyncDone("Internal server error", context);
     }
 
-    var max = dbSeg._recordNV.length;
-    var i;
+    const max = dbSeg._recordNV.length;
+    let i;
     for (i = 0; i < max; i++) {
-        var nv = dbSeg._recordNV[i];
+        const nv = dbSeg._recordNV[i];
         stm.setValue(nv.name, nv.value, dbSeg.entityType.propertiesMap[nv.name].DATA_TYPE_NAME); // OK
     }
     return asyncDone(null, context);
@@ -28,7 +28,7 @@ exports.moveRecordNV_ToSelectStm = function (context, asyncDone) {
 
 exports.createTmpTables = function (context, asyncDone) {
     context.logger.silly('dataCollectorPost', 'createTmpTables');
-    var stm = context.oData.dbSegmentLast.sql.stmContainer.createTmp;
+    const stm = context.oData.dbSegmentLast.sql.stmContainer.createTmp;
     return statementProcessor.execStmsDirectlyNoResult(context, stm, asyncDone);
 };
 
@@ -37,20 +37,20 @@ exports.checkAutoValues = null;
 exports.checkForAutoKeyGenUsage = function (context, asyncDone) {
     context.logger.silly('dataCollectorPost', 'checkForAutoKeyGenUsage');
 
-    var dbSeg = context.oData.dbSegmentLast;
+    const dbSeg = context.oData.dbSegmentLast;
     if (!exports.checkAutoValues && !dbSeg.entityType.hasAdmindata()) {
         return asyncDone(null, context);
     }
 
 
-    var stm = dbSeg.sql.stmContainer.insertTmp;
+    const stm = dbSeg.sql.stmContainer.insertTmp;
 
-    var table = dbSeg._DB_TableName;
+    const table = dbSeg._DB_TableName;
 
-    var appData = {};
-    var i;
-    var nv = stm.nv;
-    var name = '';
+    const appData = {};
+    let i;
+    const nv = stm.nv;
+    let name = '';
 
     const createBy = dbSeg.entityType.getAddAdmindata('create', 'by');
     const createAt = dbSeg.entityType.getAddAdmindata('create', 'at');
@@ -61,7 +61,7 @@ exports.checkForAutoKeyGenUsage = function (context, asyncDone) {
     for (i = 0; i < nv.length; i++) {
 
         name = nv[i].name.toSqlHana(null, null, { withoutTable: true });
-        name = name.substr(1, name.length - 2);
+        name = name.slice(1, -1);
 
         if (createBy && name === 'CREATED_BY') {
             nv[i].overwriteValue = new sqlStatement.Value(context.userName);
@@ -90,7 +90,7 @@ exports.checkForAutoKeyGenUsage = function (context, asyncDone) {
     }
 
     return exports.checkAutoValues(table, appData, function (err) {
-        var name;
+        let name;
         for (i = 0; i < nv.length; i++) {
             name = nv[i].name.toSqlHana(null, null, { withoutTable: true });
             name = name.substr(1, name.length - 2);
@@ -104,21 +104,21 @@ exports.checkForAutoKeyGenUsage = function (context, asyncDone) {
 
 exports.insertPayloadIntoTempTable = function (context, asyncDone) {
     context.logger.silly('dataCollectorPost', 'insertPayloadIntoTempTable');
-    var dbSeg = context.oData.dbSegmentLast;
+    const dbSeg = context.oData.dbSegmentLast;
 
     statementProcessor.execStmsAsPreparedNoResult(context, dbSeg.sql.stmContainer.insertTmp, asyncDone);
 };
 
 exports.insertTmpTableToRealTable = function (context, asyncDone) {
     context.logger.silly('dataCollectorPost', 'insertTmpTableToRealTable');
-    var dbSeg = context.oData.dbSegmentLast;
+    const dbSeg = context.oData.dbSegmentLast;
     statementProcessor.execStmsAsPreparedNoResult(context, dbSeg.sql.stmContainer.insertReal, asyncDone);
 };
 
 exports.selectData = function (context, asyncDone) {
     context.logger.silly('dataCollectorPost', 'selectData');
-    var dbSeg = context.oData.dbSegmentLast;
-    var stm = dbSeg.sql.stmContainer.select;
+    const dbSeg = context.oData.dbSegmentLast;
+    const stm = dbSeg.sql.stmContainer.select;
 
     return statementProcessor.execStmsAsPrepared(context, stm, (err,context, resultSet) => {
         const rows = resultSet[0];
@@ -137,7 +137,7 @@ exports.selectData = function (context, asyncDone) {
 
 exports.commit = function (context, asyncDone) {
     context.logger.debug('dataCollectorPost', 'commit');
-    var client = context.db.client;
+    const client = context.db.client;
     client.commit(function (err) {
         if (err) {
             context.logger.info('SQL Exec', 'Commit Error: \n' + JSON.stringify(err));