@itwin/core-backend 4.7.3 → 4.7.5

package/lib/cjs/IModelDb.js

@@ -1854,9 +1854,9 @@ IModelDb._settingPropNamespace = "settings";
          */
         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.logInfo(BackendLoggerCategory_1.BackendLoggerCategory.ECDb, `No aspects found for class ${aspectClassFullName} and element ${elementId}`);
@@ -1874,7 +1874,7 @@ IModelDb._settingPropNamespace = "settings";
             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());
@@ -1889,10 +1889,10 @@ IModelDb._settingPropNamespace = "settings";
                 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.logInfo(BackendLoggerCategory_1.BackendLoggerCategory.ECDb, `No aspects found for class ${aspectClassFullName} and element ${elementId}`);
@@ -2368,6 +2368,7 @@ class BriefcaseDb extends IModelDb {
             // Restart default txn to trigger events when watch file is changed by some other process.
             const watcher = fs.watch(briefcaseDb.watchFilePathName, { persistent: false }, () => {
                 nativeDb.restartDefaultTxn();
+                briefcaseDb.changeset = briefcaseDb.nativeDb.getCurrentChangeset();
             });
             // Stop the watcher when we close this connection.
             briefcaseDb.onBeforeClose.addOnce(() => {
@@ -2575,6 +2576,7 @@ class BriefcaseDb extends IModelDb {
             this.initializeIModelDb();
         });
         IpcHost_1.IpcHost.notifyTxns(this, "notifyPulledChanges", this.changeset);
+        this.txns.touchWatchFile();
     }
     /** Push changes to iModelHub. */
     async pushChanges(arg) {
@@ -2591,6 +2593,7 @@ class BriefcaseDb extends IModelDb {
         });
         const changeset = this.changeset;
         IpcHost_1.IpcHost.notifyTxns(this, "notifyPushedChanges", changeset);
+        this.txns.touchWatchFile();
     }
     close() {
         super.close();