@itwin/core-backend 5.0.0-dev.94 → 5.0.0-dev.95

package/lib/esm/IModelDb.js

@@ -278,8 +278,8 @@ export class IModelDb extends IModel {
         this.clearCaches();
     }
     /** @internal */
-    initializeIModelDb() {
-        const props = this[_nativeDb].getIModelProps();
+    initializeIModelDb(when) {
+        const props = this[_nativeDb].getIModelProps(when);
         super.initialize(props.rootSubject.name, props);
         if (this._initialized)
             return;
@@ -2062,9 +2062,9 @@ function processSchemaWriteStatus(status) {
          */
         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)
                     Logger.logInfo(BackendLoggerCategory.ECDb, `No aspects found for class ${aspectClassFullName} and element ${elementId}`);
@@ -2083,7 +2083,7 @@ function processSchemaWriteStatus(status) {
             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() === DbResult.BE_SQLITE_ROW)
                         classIds.push(statement.getValue(0).getId());
@@ -2098,10 +2098,10 @@ function processSchemaWriteStatus(status) {
                 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)
                 Logger.logInfo(BackendLoggerCategory.ECDb, `No aspects found for class ${aspectClassFullName} and element ${elementId}`);
@@ -2816,7 +2816,7 @@ export class BriefcaseDb extends IModelDb {
             await BriefcaseManager.pullAndApplyChangesets(this, arg ?? {});
             if (!this.skipSyncSchemasOnPullAndPush)
                 await SchemaSync.pull(this);
-            this.initializeIModelDb();
+            this.initializeIModelDb("pullMerge");
         });
         IpcHost.notifyTxns(this, "notifyPulledChanges", this.changeset);
         this.txns.touchWatchFile();
@@ -2898,7 +2898,7 @@ export class BriefcaseDb extends IModelDb {
         // pushing changes requires a writeable briefcase
         await this.executeWritable(async () => {
             await BriefcaseManager.pullMergePush(this, arg);
-            this.initializeIModelDb();
+            this.initializeIModelDb("pullMerge");
         });
         const changeset = this.changeset;
         IpcHost.notifyTxns(this, "notifyPushedChanges", changeset);