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

package/lib/cjs/IModelDb.js

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