@itwin/core-backend 4.6.0-dev.1 → 4.6.0-dev.3

package/lib/cjs/IModelDb.js

@@ -1556,7 +1556,8 @@ exports.IModelDb = IModelDb;
                 return elProps.id = this._iModel.nativeDb.insertElement(elProps);
             }
             catch (err) {
-                err.message = `error inserting element: ${err.message}`;
+                err.message = `Error inserting element [${err.message}]`;
+                err.metadata = { elProps };
                 throw err;
             }
         }
@@ -1572,7 +1573,8 @@ exports.IModelDb = IModelDb;
                 this._iModel.nativeDb.updateElement(elProps);
             }
             catch (err) {
-                err.message = `error updating element: ${err.message}`;
+                err.message = `Error updating element [${err.message}], id: ${elProps.id}`;
+                err.metadata = { elProps };
                 throw err;
             }
         }
@@ -1588,7 +1590,8 @@ exports.IModelDb = IModelDb;
                     iModel.nativeDb.deleteElement(id);
                 }
                 catch (err) {
-                    err.message = `error deleting element: ${err.message}`;
+                    err.message = `Error deleting element [${err.message}], id: ${id}`;
+                    err.metadata = { elementId: id };
                     throw err;
                 }
             });
@@ -1795,9 +1798,9 @@ exports.IModelDb = IModelDb;
          */
         getAspects(elementId, aspectClassFullName, excludedClassFullNames) {
             if (aspectClassFullName === undefined) {
-                const allAspects = this.runInstanceQuery(`SELECT $ FROM (
-          SELECT ECInstanceId, ECClassId FROM Bis.ElementMultiAspect WHERE Element.Id = :elementId
-            UNION ALL
+                const allAspects = this.runInstanceQuery(`SELECT $ FROM (
+          SELECT ECInstanceId, ECClassId FROM Bis.ElementMultiAspect WHERE Element.Id = :elementId
+            UNION ALL
           SELECT ECInstanceId, ECClassId FROM Bis.ElementUniqueAspect WHERE Element.Id = :elementId) OPTIONS USE_JS_PROP_NAMES DO_NOT_TRUNCATE_BLOB`, elementId, excludedClassFullNames);
                 if (allAspects.length === 0)
                     core_bentley_1.Logger.logError(BackendLoggerCategory_1.BackendLoggerCategory.ECDb, `No aspects found for class ${aspectClassFullName} and element ${elementId}`);
@@ -1815,7 +1818,7 @@ exports.IModelDb = IModelDb;
             let classIdList = IModelDb.Elements.classMap.get(aspectClassFullName);
             if (classIdList === undefined) {
                 const classIds = [];
-                this._iModel.withPreparedStatement(`select SourceECInstanceId from meta.ClassHasAllBaseClasses where TargetECInstanceId = (select ECInstanceId from meta.ECClassDef where Name='${fullClassName[1]}'
+                this._iModel.withPreparedStatement(`select SourceECInstanceId from meta.ClassHasAllBaseClasses where TargetECInstanceId = (select ECInstanceId from meta.ECClassDef where Name='${fullClassName[1]}'
         and Schema.Id = (select ECInstanceId from meta.ECSchemaDef where Name='${fullClassName[0]}')) and SourceECInstanceId != TargetECInstanceId`, (statement) => {
                     while (statement.step() === core_bentley_1.DbResult.BE_SQLITE_ROW)
                         classIds.push(statement.getValue(0).getId());
@@ -1830,10 +1833,10 @@ exports.IModelDb = IModelDb;
                 return [];
             }
             // Execute an instance query to retrieve all aspects from all the derived classes
-            const aspects = this.runInstanceQuery(`SELECT $ FROM (
-        SELECT ECInstanceId, ECClassId FROM Bis.ElementMultiAspect WHERE Element.Id = :elementId AND ECClassId IN (${classIdList})
-          UNION ALL
-        SELECT ECInstanceId, ECClassId FROM Bis.ElementUniqueAspect WHERE Element.Id = :elementId AND ECClassId IN (${classIdList})
+            const aspects = this.runInstanceQuery(`SELECT $ FROM (
+        SELECT ECInstanceId, ECClassId FROM Bis.ElementMultiAspect WHERE Element.Id = :elementId AND ECClassId IN (${classIdList})
+          UNION ALL
+        SELECT ECInstanceId, ECClassId FROM Bis.ElementUniqueAspect WHERE Element.Id = :elementId AND ECClassId IN (${classIdList})
         ) OPTIONS USE_JS_PROP_NAMES DO_NOT_TRUNCATE_BLOB`, elementId, excludedClassFullNames);
             if (aspects.length === 0)
                 core_bentley_1.Logger.logError(BackendLoggerCategory_1.BackendLoggerCategory.ECDb, `No aspects found for class ${aspectClassFullName} and element ${elementId}`);