@sap/xsodata 7.4.4 → 7.4.5

package/CHANGELOG.md

@@ -8,6 +8,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## Unreleased
 
+## [7.4.5] - 2021-12-15
+
+* Suppress $metadata annotation <code>sap:aggregation-role="dimension"</code> on calculation view property if it is used as description property referenced by annotation <code>sap:text</code> by another property of the calulation view. The annotation is only supressed if the corresponding xsodata-file has <code>settings</code> containing this: <code>noDimensionAnnoOnTextProperty true;</code>
+* Improvements on URI parsing errors:
+  * reporting URI resource path character position on parsing error, if possible
+  * Invalid navigation property on <code>$expand</code> system query option returns 400 (Bad Request) instead of 500 (Internal Server Error)
+* Removed support for NodeJS version 10
+
 ## [7.4.4] - 2021-07-20
 
 * HANA client API usage changed: 'execQuery' used for read requests, change requests remain on 'exec'

package/lib/db/connect.js

@@ -238,10 +238,10 @@ function _connectInternal(context, asyncDone) {
 exports.connect = function (context, asyncDone) {
     context.db = context.db || {};
     if (context.db.client && (context.db.connectionInitialized === true)) {
-        context.logger.debug('connect - db', 'connect already done');
+        context.logger.info('connect - db', 'connect already done');
         return asyncDone(null, context);
     }
-    context.logger.debug('connect - db', 'connect');
+    context.logger.info('connect - db', 'connect');
 
     return _connectInternal(context, function (err) {
         if (err) {
@@ -268,7 +268,12 @@ exports.disconnect = function (context, cb) {
     if (context.db.openedConnection) {
         context.logger.info('connect - db', 'disconnect done');
         if (context.db.client) {
-            context.db.client.end();
+            context.db.client.end((err) => {
+                if (err) {
+                    context.logger.error('connect - db', `disconnect failed (callback): ${err}`);
+                }
+                context.logger.info('connect - db', 'disconnect done (callback)');
+            });
         }
         context.db.openedConnection = false;
         return cb();

package/lib/db/dbSegment.js

@@ -247,7 +247,7 @@ DbSegment.prototype.setRecordFromPostPayload = function (context, record) {
                     (modifyBy && key === 'MODIFIED_BY') ||
                     (modifyAt && key === 'MODIFIED_AT'))
                 ) {
-                    throw new BadRequest('The serialized resource has an missing value for member ' + key);
+                    throw new BadRequest('The serialized resource has a missing value for member ' + key);
                 }
             }
             dbValue = null;
@@ -336,7 +336,7 @@ DbSegment.prototype.setRecordFromPutPayload = function (context, record) {
                         // skip optional calc view parameters
                         (this.entityType.propertiesMap[property] && this.entityType.propertiesMap[property].MANDATORY === 0)
                     )) {
-                        throw new BadRequest('The serialized resource has an missing value for member ' + property);
+                        throw new BadRequest('The serialized resource has a missing value for member ' + property);
                     }
 
                 }

package/lib/grammars/xsodata.peg

@@ -613,7 +613,7 @@ settingscontent          =  sl:( OWS settingsconfig OWS ";")*
                                 return ret;
                             }
 settingsconfig           = s:(settings_meta_cache / settings_content / settings_enable / settings_support /
-                            settings_hints / settings_admindata / settings_limits )
+                            settings_hints / settings_admindata / settings_limits / settings_noDimensionAnnoOnTextProperty )
                             { return s; }
 settings_meta_cache      = "metadata" MWS ( "cache.control" / "cache-control") MWS qs:quotedstring
                             { return {
@@ -635,6 +635,15 @@ settings_enable          = "enable" MWS string
                             { return { name : "enable", value : s }; }
 settings_support         = "support" MWS s:string
                             { return { name : "support", value : s }; }
+
+settings_noDimensionAnnoOnTextProperty = "noDimensionAnnoOnTextProperty" MWS s:string
+                                {
+                                    return {
+                                        name : "noDimensionAnnoOnTextProperty",
+                                        value : s
+                                    };
+                                }
+
 settings_hints           = "hints" MWS hl:("null" / hintlist)
                             {
                                 var value = hl === 'null' ? [] : hl

package/lib/model/annotationFactory.js

@@ -120,6 +120,9 @@ function setPropertyAggregationRole(entityType, property, propertyAnnotations) {
             (entityType.kind !== EntityType.entityKind.inputParameters &&
                 (entityType.hasAggregates() || entityType.hasMeasureProperties())
             ) && entityType.isInBimcDimensionView(property.COLUMN_NAME)) {
+            if (property.suppressAnnotationDimension && property.suppressAnnotationDimension === true) {
+                return;     // property is used as description text for other property: do not add annotation
+            }
             propertyAnnotations["sap:aggregation-role"] = "dimension";
         }
     }

package/lib/model/metadataReader.js

@@ -189,6 +189,19 @@ function loadCalcViewInfo(context, entityType, cb) {
         entityType.setCalculationViewDimensionData(rows, { cube: cubeName }, context.logger); // e.g. sap:label is fill with calculation view dimension data
         entityType.resolveAggregates();
 
+        entityType.properties.forEach((property) => {
+
+            // suppressing annotation "sap:aggregation-role" depends on xsodata-file "setting"
+            if (entityType._settings.noDimensionAnnoOnTextProperty && entityType._settings.noDimensionAnnoOnTextProperty === 'true') {
+                if (property.DESC_NAME &&  property.DESC_NAME !== property.COLUMN_NAME) {
+                    for (let i = 0; i < entityType.properties.length; i++) {
+                        if (entityType.properties[i].COLUMN_NAME === property.DESC_NAME) {
+                            entityType.properties[i].suppressAnnotationDimension = true;
+                        }
+                    }
+                }
+            }
+        });
 
         var parameters = entityType.getParameters();
         if (!parameters) {

package/lib/parsers/peg_xsodata_parser.js

@@ -765,11 +765,19 @@ function peg$parse(input, options) {
       peg$c216 = "support",
       peg$c217 = peg$literalExpectation("support", false),
       peg$c218 = function(s) { return { name : "support", value : s }; },
-      peg$c219 = "hints",
-      peg$c220 = peg$literalExpectation("hints", false),
-      peg$c221 = "null",
-      peg$c222 = peg$literalExpectation("null", false),
-      peg$c223 = function(hl) {
+      peg$c219 = "noDimensionAnnoOnTextProperty",
+      peg$c220 = peg$literalExpectation("noDimensionAnnoOnTextProperty", false),
+      peg$c221 = function(s) {
+                                          return {
+                                              name : "noDimensionAnnoOnTextProperty",
+                                              value : s
+                                          };
+                                      },
+      peg$c222 = "hints",
+      peg$c223 = peg$literalExpectation("hints", false),
+      peg$c224 = "null",
+      peg$c225 = peg$literalExpectation("null", false),
+      peg$c226 = function(hl) {
                                       var value = hl === 'null' ? [] : hl
 
                                       return {
@@ -777,9 +785,9 @@ function peg$parse(input, options) {
                                           value : value
                                       };
                                   },
-      peg$c224 = "limits",
-      peg$c225 = peg$literalExpectation("limits", false),
-      peg$c226 = function(qs, qsl) {
+      peg$c227 = "limits",
+      peg$c228 = peg$literalExpectation("limits", false),
+      peg$c229 = function(qs, qsl) {
                                       var value = { [qs.name] : qs.value };
                                       for (var i = 0; i < qsl.length; i++) {
                                           value[qsl[i][2].name] = qsl[i][2].value;
@@ -790,23 +798,23 @@ function peg$parse(input, options) {
                                           value : value
                                       };
                                   },
-      peg$c227 = "max_records",
-      peg$c228 = peg$literalExpectation("max_records", false),
-      peg$c229 = "max_expanded_records",
-      peg$c230 = peg$literalExpectation("max_expanded_records", false),
-      peg$c231 = "max_body_size",
-      peg$c232 = peg$literalExpectation("max_body_size", false),
-      peg$c233 = "=",
-      peg$c234 = peg$literalExpectation("=", false),
-      peg$c235 = function(as, a) {
+      peg$c230 = "max_records",
+      peg$c231 = peg$literalExpectation("max_records", false),
+      peg$c232 = "max_expanded_records",
+      peg$c233 = peg$literalExpectation("max_expanded_records", false),
+      peg$c234 = "max_body_size",
+      peg$c235 = peg$literalExpectation("max_body_size", false),
+      peg$c236 = "=",
+      peg$c237 = peg$literalExpectation("=", false),
+      peg$c238 = function(as, a) {
                                       return {
                                           name : as,
                                           value: a
                                       };
                                   },
-      peg$c236 = "admindata",
-      peg$c237 = peg$literalExpectation("admindata", false),
-      peg$c238 = function(qs, qsl) {
+      peg$c239 = "admindata",
+      peg$c240 = peg$literalExpectation("admindata", false),
+      peg$c241 = function(qs, qsl) {
                                       var value = [qs];
                                       for (var i = 0; i < qsl.length; i++) {
                                           value.push(qsl[i][2]);
@@ -817,11 +825,11 @@ function peg$parse(input, options) {
                                           value : value
                                       };
                                   },
-      peg$c239 = "add",
-      peg$c240 = peg$literalExpectation("add", false),
-      peg$c241 = "skip",
-      peg$c242 = peg$literalExpectation("skip", false),
-      peg$c243 = function(as, a) {
+      peg$c242 = "add",
+      peg$c243 = peg$literalExpectation("add", false),
+      peg$c244 = "skip",
+      peg$c245 = peg$literalExpectation("skip", false),
+      peg$c246 = function(as, a) {
                                       if ( as === "add") {
                                           a.value = 'add';
                                       } else {
@@ -830,48 +838,48 @@ function peg$parse(input, options) {
 
                                       return a;
                                   },
-      peg$c244 = "created",
-      peg$c245 = peg$literalExpectation("created", false),
-      peg$c246 = "modified",
-      peg$c247 = peg$literalExpectation("modified", false),
-      peg$c248 = "by",
-      peg$c249 = peg$literalExpectation("by", false),
-      peg$c250 = "at",
-      peg$c251 = peg$literalExpectation("at", false),
-      peg$c252 = function(w, o) {
+      peg$c247 = "created",
+      peg$c248 = peg$literalExpectation("created", false),
+      peg$c249 = "modified",
+      peg$c250 = peg$literalExpectation("modified", false),
+      peg$c251 = "by",
+      peg$c252 = peg$literalExpectation("by", false),
+      peg$c253 = "at",
+      peg$c254 = peg$literalExpectation("at", false),
+      peg$c255 = function(w, o) {
                                       return {
                                           operation : w === "created" ? "create" : "modify",
                                           property : o,
                                       };
                                   },
-      peg$c253 = function(qs, qsl) {
+      peg$c256 = function(qs, qsl) {
                                       var items = [qs];
                                       for (var i = 0; i < qsl.length; i++) {
                                          items.push(qsl[i][2]);
                                       }
                                      return items;
                                   },
-      peg$c254 = function(c) { return c.join(''); },
-      peg$c255 = "\\",
-      peg$c256 = peg$literalExpectation("\\", false),
-      peg$c257 = peg$anyExpectation(),
-      peg$c258 = "'",
-      peg$c259 = peg$literalExpectation("'", false),
-      peg$c260 = "\"",
-      peg$c261 = peg$literalExpectation("\"", false),
-      peg$c262 = function(n) { return n.join(''); },
-      peg$c263 = function(a) { return a.join(''); },
-      peg$c264 = function(char) {return char},
-      peg$c265 = /^[\t\x0B\f \xA0\uFEFF]/,
-      peg$c266 = peg$classExpectation(["\t", "\x0B", "\f", " ", "\xA0", "\uFEFF"], false, false),
-      peg$c267 = /^[\n\r]/,
-      peg$c268 = peg$classExpectation(["\n", "\r"], false, false),
-      peg$c269 = "/*",
-      peg$c270 = peg$literalExpectation("/*", false),
-      peg$c271 = "*/",
-      peg$c272 = peg$literalExpectation("*/", false),
-      peg$c273 = "//",
-      peg$c274 = peg$literalExpectation("//", false),
+      peg$c257 = function(c) { return c.join(''); },
+      peg$c258 = "\\",
+      peg$c259 = peg$literalExpectation("\\", false),
+      peg$c260 = peg$anyExpectation(),
+      peg$c261 = "'",
+      peg$c262 = peg$literalExpectation("'", false),
+      peg$c263 = "\"",
+      peg$c264 = peg$literalExpectation("\"", false),
+      peg$c265 = function(n) { return n.join(''); },
+      peg$c266 = function(a) { return a.join(''); },
+      peg$c267 = function(char) {return char},
+      peg$c268 = /^[\t\x0B\f \xA0\uFEFF]/,
+      peg$c269 = peg$classExpectation(["\t", "\x0B", "\f", " ", "\xA0", "\uFEFF"], false, false),
+      peg$c270 = /^[\n\r]/,
+      peg$c271 = peg$classExpectation(["\n", "\r"], false, false),
+      peg$c272 = "/*",
+      peg$c273 = peg$literalExpectation("/*", false),
+      peg$c274 = "*/",
+      peg$c275 = peg$literalExpectation("*/", false),
+      peg$c276 = "//",
+      peg$c277 = peg$literalExpectation("//", false),
 
       peg$currPos          = 0,
       peg$savedPos         = 0,
@@ -5305,6 +5313,9 @@ function peg$parse(input, options) {
               s1 = peg$parsesettings_admindata();
               if (s1 === peg$FAILED) {
                 s1 = peg$parsesettings_limits();
+                if (s1 === peg$FAILED) {
+                  s1 = peg$parsesettings_noDimensionAnnoOnTextProperty();
+                }
               }
             }
           }
@@ -5514,13 +5525,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsesettings_hints() {
+  function peg$parsesettings_noDimensionAnnoOnTextProperty() {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 5) === peg$c219) {
+    if (input.substr(peg$currPos, 29) === peg$c219) {
       s1 = peg$c219;
-      peg$currPos += 5;
+      peg$currPos += 29;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$c220); }
@@ -5528,19 +5539,54 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$parseMWS();
       if (s2 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 4) === peg$c221) {
-          s3 = peg$c221;
+        s3 = peg$parsestring();
+        if (s3 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$c221(s3);
+          s0 = s1;
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsesettings_hints() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 5) === peg$c222) {
+      s1 = peg$c222;
+      peg$currPos += 5;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c223); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseMWS();
+      if (s2 !== peg$FAILED) {
+        if (input.substr(peg$currPos, 4) === peg$c224) {
+          s3 = peg$c224;
           peg$currPos += 4;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c222); }
+          if (peg$silentFails === 0) { peg$fail(peg$c225); }
         }
         if (s3 === peg$FAILED) {
           s3 = peg$parsehintlist();
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c223(s3);
+          s1 = peg$c226(s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -5562,12 +5608,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c224) {
-      s1 = peg$c224;
+    if (input.substr(peg$currPos, 6) === peg$c227) {
+      s1 = peg$c227;
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c225); }
+      if (peg$silentFails === 0) { peg$fail(peg$c228); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseMWS();
@@ -5648,7 +5694,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c226(s3, s5);
+              s1 = peg$c229(s3, s5);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -5678,28 +5724,28 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 11) === peg$c227) {
-      s1 = peg$c227;
+    if (input.substr(peg$currPos, 11) === peg$c230) {
+      s1 = peg$c230;
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c228); }
+      if (peg$silentFails === 0) { peg$fail(peg$c231); }
     }
     if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 20) === peg$c229) {
-        s1 = peg$c229;
+      if (input.substr(peg$currPos, 20) === peg$c232) {
+        s1 = peg$c232;
         peg$currPos += 20;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c230); }
+        if (peg$silentFails === 0) { peg$fail(peg$c233); }
       }
       if (s1 === peg$FAILED) {
-        if (input.substr(peg$currPos, 13) === peg$c231) {
-          s1 = peg$c231;
+        if (input.substr(peg$currPos, 13) === peg$c234) {
+          s1 = peg$c234;
           peg$currPos += 13;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c232); }
+          if (peg$silentFails === 0) { peg$fail(peg$c235); }
         }
       }
     }
@@ -5707,11 +5753,11 @@ function peg$parse(input, options) {
       s2 = peg$parseOWS();
       if (s2 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 61) {
-          s3 = peg$c233;
+          s3 = peg$c236;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c234); }
+          if (peg$silentFails === 0) { peg$fail(peg$c237); }
         }
         if (s3 !== peg$FAILED) {
           s4 = peg$parseOWS();
@@ -5719,7 +5765,7 @@ function peg$parse(input, options) {
             s5 = peg$parsestring_no_comma();
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c235(s1, s5);
+              s1 = peg$c238(s1, s5);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -5749,12 +5795,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 9) === peg$c236) {
-      s1 = peg$c236;
+    if (input.substr(peg$currPos, 9) === peg$c239) {
+      s1 = peg$c239;
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c237); }
+      if (peg$silentFails === 0) { peg$fail(peg$c240); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseMWS();
@@ -5835,7 +5881,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c238(s3, s5);
+              s1 = peg$c241(s3, s5);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -5865,20 +5911,20 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3) === peg$c239) {
-      s1 = peg$c239;
+    if (input.substr(peg$currPos, 3) === peg$c242) {
+      s1 = peg$c242;
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c240); }
+      if (peg$silentFails === 0) { peg$fail(peg$c243); }
     }
     if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 4) === peg$c241) {
-        s1 = peg$c241;
+      if (input.substr(peg$currPos, 4) === peg$c244) {
+        s1 = peg$c244;
         peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c242); }
+        if (peg$silentFails === 0) { peg$fail(peg$c245); }
       }
     }
     if (s1 !== peg$FAILED) {
@@ -5887,7 +5933,7 @@ function peg$parse(input, options) {
         s3 = peg$parseadmindata_set();
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c243(s1, s3);
+          s1 = peg$c246(s1, s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -5909,44 +5955,44 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 7) === peg$c244) {
-      s1 = peg$c244;
+    if (input.substr(peg$currPos, 7) === peg$c247) {
+      s1 = peg$c247;
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c245); }
+      if (peg$silentFails === 0) { peg$fail(peg$c248); }
     }
     if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 8) === peg$c246) {
-        s1 = peg$c246;
+      if (input.substr(peg$currPos, 8) === peg$c249) {
+        s1 = peg$c249;
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c247); }
+        if (peg$silentFails === 0) { peg$fail(peg$c250); }
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseMWS();
       if (s2 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c248) {
-          s3 = peg$c248;
+        if (input.substr(peg$currPos, 2) === peg$c251) {
+          s3 = peg$c251;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c249); }
+          if (peg$silentFails === 0) { peg$fail(peg$c252); }
         }
         if (s3 === peg$FAILED) {
-          if (input.substr(peg$currPos, 2) === peg$c250) {
-            s3 = peg$c250;
+          if (input.substr(peg$currPos, 2) === peg$c253) {
+            s3 = peg$c253;
             peg$currPos += 2;
           } else {
             s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c251); }
+            if (peg$silentFails === 0) { peg$fail(peg$c254); }
           }
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c252(s1, s3);
+          s1 = peg$c255(s1, s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -6044,7 +6090,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c253(s1, s3);
+          s1 = peg$c256(s1, s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -6078,7 +6124,7 @@ function peg$parse(input, options) {
         s3 = peg$parsequote();
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c254(s2);
+          s1 = peg$c257(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -6105,11 +6151,11 @@ function peg$parse(input, options) {
     s2 = peg$parsequote();
     if (s2 === peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 92) {
-        s2 = peg$c255;
+        s2 = peg$c258;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c256); }
+        if (peg$silentFails === 0) { peg$fail(peg$c259); }
       }
     }
     peg$silentFails--;
@@ -6125,7 +6171,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c257); }
+        if (peg$silentFails === 0) { peg$fail(peg$c260); }
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -6142,11 +6188,11 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 92) {
-        s1 = peg$c255;
+        s1 = peg$c258;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c256); }
+        if (peg$silentFails === 0) { peg$fail(peg$c259); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$parseescapable();
@@ -6171,27 +6217,27 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 39) {
-      s0 = peg$c258;
+      s0 = peg$c261;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c259); }
+      if (peg$silentFails === 0) { peg$fail(peg$c262); }
     }
     if (s0 === peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 34) {
-        s0 = peg$c260;
+        s0 = peg$c263;
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c261); }
+        if (peg$silentFails === 0) { peg$fail(peg$c264); }
       }
       if (s0 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 92) {
-          s0 = peg$c255;
+          s0 = peg$c258;
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c256); }
+          if (peg$silentFails === 0) { peg$fail(peg$c259); }
         }
       }
     }
@@ -6215,7 +6261,7 @@ function peg$parse(input, options) {
         s3 = peg$parsequote();
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c262(s2);
+          s1 = peg$c265(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -6245,7 +6291,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c263(s1);
+      s1 = peg$c266(s1);
     }
     s0 = s1;
 
@@ -6264,7 +6310,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c263(s1);
+      s1 = peg$c266(s1);
     }
     s0 = s1;
 
@@ -6300,11 +6346,11 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c257); }
+        if (peg$silentFails === 0) { peg$fail(peg$c260); }
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c264(s2);
+        s1 = peg$c267(s2);
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -6356,11 +6402,11 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c257); }
+        if (peg$silentFails === 0) { peg$fail(peg$c260); }
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c264(s2);
+        s1 = peg$c267(s2);
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -6496,12 +6542,12 @@ function peg$parse(input, options) {
   function peg$parsewhiteSpace() {
     var s0;
 
-    if (peg$c265.test(input.charAt(peg$currPos))) {
+    if (peg$c268.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c266); }
+      if (peg$silentFails === 0) { peg$fail(peg$c269); }
     }
 
     return s0;
@@ -6510,12 +6556,12 @@ function peg$parse(input, options) {
   function peg$parselineTerminator() {
     var s0;
 
-    if (peg$c267.test(input.charAt(peg$currPos))) {
+    if (peg$c270.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c268); }
+      if (peg$silentFails === 0) { peg$fail(peg$c271); }
     }
 
     return s0;
@@ -6525,11 +6571,11 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 34) {
-      s0 = peg$c260;
+      s0 = peg$c263;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c261); }
+      if (peg$silentFails === 0) { peg$fail(peg$c264); }
     }
 
     return s0;
@@ -6539,24 +6585,24 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c269) {
-      s1 = peg$c269;
+    if (input.substr(peg$currPos, 2) === peg$c272) {
+      s1 = peg$c272;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c270); }
+      if (peg$silentFails === 0) { peg$fail(peg$c273); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
       s4 = peg$currPos;
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c271) {
-        s5 = peg$c271;
+      if (input.substr(peg$currPos, 2) === peg$c274) {
+        s5 = peg$c274;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c272); }
+        if (peg$silentFails === 0) { peg$fail(peg$c275); }
       }
       peg$silentFails--;
       if (s5 === peg$FAILED) {
@@ -6583,12 +6629,12 @@ function peg$parse(input, options) {
         s3 = peg$currPos;
         s4 = peg$currPos;
         peg$silentFails++;
-        if (input.substr(peg$currPos, 2) === peg$c271) {
-          s5 = peg$c271;
+        if (input.substr(peg$currPos, 2) === peg$c274) {
+          s5 = peg$c274;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c272); }
+          if (peg$silentFails === 0) { peg$fail(peg$c275); }
         }
         peg$silentFails--;
         if (s5 === peg$FAILED) {
@@ -6612,12 +6658,12 @@ function peg$parse(input, options) {
         }
       }
       if (s2 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c271) {
-          s3 = peg$c271;
+        if (input.substr(peg$currPos, 2) === peg$c274) {
+          s3 = peg$c274;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c272); }
+          if (peg$silentFails === 0) { peg$fail(peg$c275); }
         }
         if (s3 !== peg$FAILED) {
           s1 = [s1, s2, s3];
@@ -6642,12 +6688,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c273) {
-      s1 = peg$c273;
+    if (input.substr(peg$currPos, 2) === peg$c276) {
+      s1 = peg$c276;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c274); }
+      if (peg$silentFails === 0) { peg$fail(peg$c277); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -6725,7 +6771,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c257); }
+      if (peg$silentFails === 0) { peg$fail(peg$c260); }
     }
 
     return s0;
@@ -6741,7 +6787,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c257); }
+      if (peg$silentFails === 0) { peg$fail(peg$c260); }
     }
     peg$silentFails--;
     if (s1 === peg$FAILED) {

package/lib/sql/dataCollector2.js

@@ -45,6 +45,8 @@ const executeSqlAsPreparedStatement = (context, sql, parameters, rowCb) => {
                 context.logger.logSqlTime('execQuery', startTime, sql);
                 const rs = [];
 
+                global.execCounter += 1;
+
                 if (resultSet && !errExec) {
                     while (resultSet.next()) {
                         rs.push(resultSet.getValues());
@@ -60,6 +62,9 @@ const executeSqlAsPreparedStatement = (context, sql, parameters, rowCb) => {
                 // try dropping the statement always; report exec error in CB
                 startTime = context.logger.getStartTimeSql();
                 statement.drop((errDrop) => {
+
+                    global.dropCounter += 1;
+
                     context.logger.logSqlTime('drop', startTime, sql);
                     if (errDrop) {
                         // don't hide any execution error, just log
@@ -80,6 +85,9 @@ const executeSqlAsPreparedStatement = (context, sql, parameters, rowCb) => {
             // all other statements use exec
             startTime = context.logger.getStartTimeSql();
             statement.exec(parameters, (errExec, rows) => {
+
+                global.execCounter += 1;
+
                 context.logger.logSqlTime('exec', startTime, sql);
                 if (rows) {
                     context.logger.logSqlData(rows);
@@ -88,6 +96,9 @@ const executeSqlAsPreparedStatement = (context, sql, parameters, rowCb) => {
                 // try dropping the statement always; report exec error in CB
                 startTime = context.logger.getStartTimeSql();
                 statement.drop((errDrop) => {
+
+                    global.dropCounter += 1;
+
                     context.logger.logSqlTime('drop', startTime, sql);
                     if (errDrop) {
                         // don't hide any execution error, just log

package/lib/uri/oDataUriParser.js

@@ -22,6 +22,8 @@ exports.URI_KIND_MetaData = 8;
 exports.URI_KIND_Batch = 9;
 exports.URI_KIND_Resource = 4;
 
+// unknown position indicator on URI parsing failure
+const UNKNOWN_POSITION = -1;
 
 function parseODataSegments(segments) {
     var segmentsParsed = [];
@@ -33,7 +35,12 @@ function parseODataSegments(segments) {
                 var tmp = oDataSegmentParser.parse(segments.decoded[i]);
                 segmentsParsed.push(tmp);
             } catch (err) {
-                throw new BadRequest('Syntax error in resource path at position .', err);
+                let position = (err.hash && err.hash.loc && err.hash.loc.last_column && Number.isInteger(err.hash.loc.last_column)) ? err.hash.loc.last_column : UNKNOWN_POSITION;
+                if (position === UNKNOWN_POSITION) {
+                    throw new BadRequest(`Syntax error in resource path. Character position could not be determined.`, err);
+                } else {
+                    throw new BadRequest(`Syntax error in resource path at position ${position+1}`, err);
+                }
             }
         }
     }

package/lib/uri/resourcePathParser.js

@@ -442,6 +442,9 @@ ResourcePathReader.prototype.addExpand = function (dbSeg, expandNavName, expandI
  */
 ResourcePathReader.prototype._createNavigationSegment = function (dbSeg, expandNavName) {
     var navigation = dbSeg.entityType.getNavigation(expandNavName);
+    if (!navigation) {
+        throw new Http400_BadRequest(`Unknown navigation property '${expandNavName}' in entity type '${dbSeg.entityType.name}'`);
+    }
     var association = this.getAssociation(navigation);
 
     var endTo = this.getTargetEnd(navigation, association, dbSeg);

package/lib/xsodata.js

@@ -39,6 +39,18 @@ var Measurement = require('./utils/measurement');
 var HttpErrorDebugInfo = require('./utils/errors/debugInfo');
 var InternalError = require('./utils/errors/internalError');
 
+// segmentation fault check
+// var SegfaultHandler = require('segfault-handler');
+// SegfaultHandler.registerHandler('crash.log');
+// SegfaultHandler.causeSegfault();
+
+global.execCounter = 0;
+global.dropCounter = 0;
+
+// process.on('exit', () => {
+//     console.log(`global.execCounter: ${global.execCounter}`);
+//     console.log(`global.dropCounter: ${global.dropCounter}`);
+// });
 
 exports.testExits = {
     afterConnectDb: 1,
@@ -212,6 +224,8 @@ exports.ODataHandler.prototype.processRequest = function process(request, respon
         networkContext = new NetworkContext(this.handlerConfiguration, requestOptions);
         context = new RequestContext(networkContext, requestOptions || {});
 
+        context.execCounter = 0;
+
         context.registeredCallBacks = this._registeredCallBacks;
         context.callRegisteredStep = checkRegisteredSteps;
 
@@ -270,6 +284,7 @@ exports.ODataHandler.prototype.processRequest = function process(request, respon
                 }.bind(this));
             }.bind(this)
         );
+
     } catch (exception) {
         var err = new InternalError('InternalError', context, exception);
         tableCleanup.assertCleanTempTables(context, function (error, context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/xsodata",
-  "version": "7.4.4",
+  "version": "7.4.5",
   "description": "Expose data from a HANA database as OData V2 service with help of .xsodata files.",
   "main": "index.js",
   "license": "SEE LICENSE IN developer-license-3.1.txt",
@@ -61,10 +61,10 @@
     "xml-writer": "1.7.0"
   },
   "engines": {
-    "node": "^10 || ^12 || ^14"
+    "node": "^12 || ^14"
   },
   "devDependencies": {
-    "@sap/hana-client": "2.8.16",
+    "@sap/hana-client": "2.10.20",
     "chai": "4.2.0",
     "expect": "1.20.2",
     "filter-node-package": "=2.2.0",