@itwin/core-backend 4.7.0-dev.9 → 4.8.0-dev.1

package/lib/cjs/IModelDb.js

@@ -646,6 +646,7 @@ class IModelDb extends core_common_1.IModel {
      * @param {SchemaImportOptions} options - options during schema import.
      * @throws [[IModelError]] if the schema lock cannot be obtained or there is a problem importing the schema.
      * @note Changes are saved if importSchemas is successful and abandoned if not successful.
+     * - You can use NativeLoggerCategory to turn on the native logs. You can also control [what exactly is logged by the loggers](https://www.itwinjs.org/learning/common/logging/#controlling-what-is-logged).
      * @see querySchemaVersion
      */
     async importSchemas(schemaFileNames, options) {
@@ -656,15 +657,25 @@ class IModelDb extends core_common_1.IModel {
             await SchemaSync_1.SchemaSync.withLockedAccess(this, { openMode: core_bentley_1.OpenMode.Readonly, operationName: "schema sync" }, async (syncAccess) => {
                 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) {
-                    this.abandonChanges();
-                    if (this.nativeDb.getITwinId() !== core_bentley_1.Guid.empty)
-                        await this.acquireSchemaLock();
-                    stat = this.nativeDb.importSchemas(schemaFileNames, { schemaLockHeld: true, ecSchemaXmlContext: maybeCustomNativeContext, schemaSyncDbUri });
+                try {
+                    this.nativeDb.importSchemas(schemaFileNames, { schemaLockHeld: false, ecSchemaXmlContext: maybeCustomNativeContext, schemaSyncDbUri });
+                }
+                catch (outerErr) {
+                    if (core_bentley_1.DbResult.BE_SQLITE_ERROR_DataTransformRequired === outerErr.errorNumber) {
+                        this.abandonChanges();
+                        if (this.nativeDb.getITwinId() !== core_bentley_1.Guid.empty)
+                            await this.acquireSchemaLock();
+                        try {
+                            this.nativeDb.importSchemas(schemaFileNames, { schemaLockHeld: true, ecSchemaXmlContext: maybeCustomNativeContext, schemaSyncDbUri });
+                        }
+                        catch (innerErr) {
+                            throw new core_common_1.IModelError(innerErr.errorNumber, innerErr.message);
+                        }
+                    }
+                    else {
+                        throw new core_common_1.IModelError(outerErr.errorNumber, outerErr.message);
+                    }
                 }
-                if (core_bentley_1.DbResult.BE_SQLITE_OK !== stat)
-                    throw new core_common_1.IModelError(stat, "Error importing schema");
             });
         }
         else {
@@ -674,9 +685,12 @@ class IModelDb extends core_common_1.IModel {
             };
             if (this.nativeDb.getITwinId() !== core_bentley_1.Guid.empty) // if this iModel is associated with an iTwin, importing schema requires the schema lock
                 await this.acquireSchemaLock();
-            const stat = this.nativeDb.importSchemas(schemaFileNames, nativeImportOptions);
-            if (core_bentley_1.DbResult.BE_SQLITE_OK !== stat)
-                throw new core_common_1.IModelError(stat, "Error importing schema");
+            try {
+                this.nativeDb.importSchemas(schemaFileNames, nativeImportOptions);
+            }
+            catch (err) {
+                throw new core_common_1.IModelError(err.errorNumber, err.message);
+            }
         }
         this.clearCaches();
     }
@@ -696,23 +710,36 @@ class IModelDb extends core_common_1.IModel {
             await SchemaSync_1.SchemaSync.withLockedAccess(this, { openMode: core_bentley_1.OpenMode.Readonly, operationName: "schemaSync" }, async (syncAccess) => {
                 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) {
-                    this.abandonChanges();
-                    if (this.nativeDb.getITwinId() !== core_bentley_1.Guid.empty)
-                        await this.acquireSchemaLock();
-                    stat = this.nativeDb.importXmlSchemas(serializedXmlSchemas, { schemaLockHeld: true, schemaSyncDbUri });
+                try {
+                    this.nativeDb.importXmlSchemas(serializedXmlSchemas, { schemaLockHeld: false, schemaSyncDbUri });
+                }
+                catch (outerErr) {
+                    if (core_bentley_1.DbResult.BE_SQLITE_ERROR_DataTransformRequired === outerErr.errorNumber) {
+                        this.abandonChanges();
+                        if (this.nativeDb.getITwinId() !== core_bentley_1.Guid.empty)
+                            await this.acquireSchemaLock();
+                        try {
+                            this.nativeDb.importXmlSchemas(serializedXmlSchemas, { schemaLockHeld: true, schemaSyncDbUri });
+                        }
+                        catch (innerErr) {
+                            throw new core_common_1.IModelError(innerErr.errorNumber, innerErr.message);
+                        }
+                    }
+                    else {
+                        throw new core_common_1.IModelError(outerErr.errorNumber, outerErr.message);
+                    }
                 }
-                if (core_bentley_1.DbResult.BE_SQLITE_OK !== stat)
-                    throw new core_common_1.IModelError(stat, "Error importing schema");
             });
         }
         else {
             if (this.iTwinId && this.iTwinId !== core_bentley_1.Guid.empty) // if this iModel is associated with an iTwin, importing schema requires the schema lock
                 await this.acquireSchemaLock();
-            const stat = this.nativeDb.importXmlSchemas(serializedXmlSchemas, { schemaLockHeld: true });
-            if (core_bentley_1.DbResult.BE_SQLITE_OK !== stat)
-                throw new core_common_1.IModelError(stat, "Error importing schema");
+            try {
+                this.nativeDb.importXmlSchemas(serializedXmlSchemas, { schemaLockHeld: true });
+            }
+            catch (err) {
+                throw new core_common_1.IModelError(err.errorNumber, err.message);
+            }
         }
         this.clearCaches();
     }
@@ -2243,9 +2270,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 +2331,7 @@ class BriefcaseDb extends IModelDb {
                 }
                 return;
             }
+            throw error;
         }
         try {
             await this.doUpgrade(briefcase, { domain: core_common_1.DomainOptions.Upgrade }, "Upgraded domain schemas");
@@ -2298,6 +2347,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 +2427,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 +2454,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 +2566,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);