@itwin/core-backend 4.7.0-dev.10 → 4.7.0-dev.11

package/lib/cjs/IModelDb.js

@@ -657,7 +657,7 @@ class IModelDb extends core_common_1.IModel {
                 const schemaSyncDbUri = syncAccess.getUri();
                 this.saveChanges();
                 let stat = this.nativeDb.importSchemas(schemaFileNames, { schemaLockHeld: false, ecSchemaXmlContext: maybeCustomNativeContext, schemaSyncDbUri });
-                if (core_bentley_1.DbResult.BE_SQLITE_ERROR_SchemaLockFailed === stat) {
+                if (core_bentley_1.DbResult.BE_SQLITE_ERROR_DataTransformRequired === stat) {
                     this.abandonChanges();
                     if (this.nativeDb.getITwinId() !== core_bentley_1.Guid.empty)
                         await this.acquireSchemaLock();
@@ -697,7 +697,7 @@ class IModelDb extends core_common_1.IModel {
                 const schemaSyncDbUri = syncAccess.getUri();
                 this.saveChanges();
                 let stat = this.nativeDb.importXmlSchemas(serializedXmlSchemas, { schemaLockHeld: false, schemaSyncDbUri });
-                if (core_bentley_1.DbResult.BE_SQLITE_ERROR_SchemaLockFailed === stat) {
+                if (core_bentley_1.DbResult.BE_SQLITE_ERROR_DataTransformRequired === stat) {
                     this.abandonChanges();
                     if (this.nativeDb.getITwinId() !== core_bentley_1.Guid.empty)
                         await this.acquireSchemaLock();
@@ -1827,9 +1827,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}`);
@@ -1847,7 +1847,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());
@@ -1862,10 +1862,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}`);
@@ -2243,9 +2243,30 @@ class BriefcaseDb extends IModelDb {
     }
     /** Upgrades the profile or domain schemas. File must be closed before this call and is always left closed. */
     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.closeFile();
+        let wasChanges = false;
+        const executeUpgrade = () => {
+            const nativeDb = this.openDgnDb({ path: briefcase.fileName }, core_bentley_1.OpenMode.ReadWrite, upgradeOptions); // performs the upgrade
+            wasChanges = nativeDb.hasPendingTxns();
+            nativeDb.closeFile();
+        };
+        const isSchemaSyncEnabled = await withBriefcaseDb(briefcase, async (db) => {
+            await SchemaSync_1.SchemaSync.pull(db);
+            return db.nativeDb.schemaSyncEnabled();
+        });
+        if (isSchemaSyncEnabled) {
+            await SchemaSync_1.SchemaSync.withLockedAccess(briefcase, { openMode: core_bentley_1.OpenMode.Readonly, operationName: "schema sync" }, async (syncAccess) => {
+                const schemaSyncDbUri = syncAccess.getUri();
+                executeUpgrade();
+                await withBriefcaseDb(briefcase, async (db) => {
+                    db.nativeDb.schemaSyncPush(schemaSyncDbUri);
+                    db.saveChanges();
+                });
+                syncAccess.synchronizeWithCloud();
+            });
+        }
+        else {
+            executeUpgrade();
+        }
         if (wasChanges)
             await withBriefcaseDb(briefcase, async (db) => db.pushChanges({ ...briefcase, description, retainLocks: true }));
     }
@@ -2283,6 +2304,7 @@ class BriefcaseDb extends IModelDb {
                 }
                 return;
             }
+            throw error;
         }
         try {
             await this.doUpgrade(briefcase, { domain: core_common_1.DomainOptions.Upgrade }, "Upgraded domain schemas");
@@ -2298,6 +2320,7 @@ class BriefcaseDb extends IModelDb {
                     await withBriefcaseDb(briefcase, async (db) => db.locks.releaseAllLocks());
                 }
             }
+            throw error;
         }
     }
     /** Open a briefcase file and return a new BriefcaseDb to interact with it.
@@ -2377,6 +2400,14 @@ class BriefcaseDb extends IModelDb {
                 args.dump();
             }
             else {
+                if (args.tableName === "be_Prop") {
+                    if (args.getValueText(0, core_bentley_1.DbChangeStage.Old) === "ec_Db" && args.getValueText(1, core_bentley_1.DbChangeStage.Old) === "localDbInfo") {
+                        return core_bentley_1.DbConflictResolution.Replace;
+                    }
+                }
+                if (args.tableName.startsWith("ec_")) {
+                    return core_bentley_1.DbConflictResolution.Skip;
+                }
                 const msg = "UPDATE/DELETE before value do not match with one in db or CASCADE action was triggered.";
                 args.setLastError(msg);
                 core_bentley_1.Logger.logError(category, msg);
@@ -2396,6 +2427,9 @@ class BriefcaseDb extends IModelDb {
                 args.dump();
             }
             else {
+                if (args.tableName.startsWith("ec_")) {
+                    return core_bentley_1.DbConflictResolution.Skip;
+                }
                 const msg = "PRIMARY KEY INSERT CONFLICT - rejecting this changeset";
                 args.setLastError(msg);
                 core_bentley_1.Logger.logError(category, msg);
@@ -2505,6 +2539,7 @@ class BriefcaseDb extends IModelDb {
     async pullChanges(arg) {
         await this.executeWritable(async () => {
             await BriefcaseManager_1.BriefcaseManager.pullAndApplyChangesets(this, arg ?? {});
+            await SchemaSync_1.SchemaSync.pull(this);
             this.initializeIModelDb();
         });
         IpcHost_1.IpcHost.notifyTxns(this, "notifyPulledChanges", this.changeset);