@itwin/core-backend 4.3.0-dev.36 → 4.3.0-dev.38

package/lib/cjs/IModelDb.js

@@ -204,7 +204,7 @@ class IModelDb extends core_common_1.IModel {
             });
         }
     }
-    /** Close this IModel, if it is currently open. */
+    /** Close this IModel, if it is currently open, and save changes if it was opened in ReadWrite mode. */
     close() {
         if (!this.isOpen)
             return; // don't continue if already closed
@@ -215,7 +215,9 @@ class IModelDb extends core_common_1.IModel {
         this._locks = undefined;
         this._codeService?.close();
         this._codeService = undefined;
-        this.nativeDb.closeIModel();
+        if (!this.isReadonly)
+            this.saveChanges();
+        this.nativeDb.closeFile();
     }
     /** @internal */
     async refreshContainer(_userAccessToken) { }
@@ -766,7 +768,7 @@ class IModelDb extends core_common_1.IModel {
                 domain: core_common_1.DomainOptions.CheckRecommendedUpgrades,
             };
             const nativeDb = this.openDgnDb(file, openMode, upgradeOptions);
-            nativeDb.closeIModel();
+            nativeDb.closeFile();
         }
         catch (err) {
             result = err.errorNumber;
@@ -1778,9 +1780,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}`);
@@ -1798,7 +1800,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());
@@ -1813,10 +1815,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}`);
@@ -2189,7 +2191,7 @@ class BriefcaseDb extends IModelDb {
     static async doUpgrade(briefcase, upgradeOptions, description) {
         const nativeDb = this.openDgnDb({ path: briefcase.fileName }, core_bentley_1.OpenMode.ReadWrite, upgradeOptions); // performs the upgrade
         const wasChanges = nativeDb.hasPendingTxns();
-        nativeDb.closeIModel();
+        nativeDb.closeFile();
         if (wasChanges)
             await withBriefcaseDb(briefcase, async (db) => db.pushChanges({ ...briefcase, description, retainLocks: true }));
     }
@@ -2279,7 +2281,7 @@ class BriefcaseDb extends IModelDb {
         // Unclosed statements will produce BUSY error when attempting to close.
         this.clearCaches();
         // The following resets the native db's pointer to this JavaScript object.
-        this.nativeDb.closeIModel();
+        this.nativeDb.closeFile();
         this.nativeDb.openIModel(fileName, openMode);
         // Restore the native db's pointer to this JavaScript object.
         this.nativeDb.setIModelDb(this);
@@ -2579,9 +2581,11 @@ class StandaloneDb extends BriefcaseDb {
      */
     static upgradeStandaloneSchemas(filePath) {
         let nativeDb = this.openDgnDb({ path: filePath }, core_bentley_1.OpenMode.ReadWrite, { profile: core_common_1.ProfileOptions.Upgrade, schemaLockHeld: true });
-        nativeDb.closeIModel();
+        nativeDb.saveChanges();
+        nativeDb.closeFile();
         nativeDb = this.openDgnDb({ path: filePath }, core_bentley_1.OpenMode.ReadWrite, { domain: core_common_1.DomainOptions.Upgrade, schemaLockHeld: true });
-        nativeDb.closeIModel();
+        nativeDb.saveChanges();
+        nativeDb.closeFile();
     }
     /** Creates or updates views in the iModel to permit visualizing the EC content as ECClasses and ECProperties rather than raw database tables and columns.
      * This can be helpful when debugging the EC data, especially when the raw tables make use of shared columns or spread data across multiple tables.
@@ -2613,7 +2617,7 @@ class StandaloneDb extends BriefcaseDb {
             return new StandaloneDb({ nativeDb, key: file.key, openMode, briefcaseId: core_common_1.BriefcaseIdValue.Unassigned });
         }
         catch (error) {
-            nativeDb.closeIModel();
+            nativeDb.closeFile();
             throw error;
         }
     }