@itwin/core-backend 5.13.0-dev.9 → 5.14.0-dev.2

package/lib/esm/test/standalone/DgnDomainMergeConflict.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=DgnDomainMergeConflict.test.d.ts.map

package/lib/esm/test/standalone/DgnDomainMergeConflict.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DgnDomainMergeConflict.test.d.ts","sourceRoot":"","sources":["../../../../src/test/standalone/DgnDomainMergeConflict.test.ts"],"names":[],"mappings":""}

package/lib/esm/test/standalone/DgnDomainMergeConflict.test.js

@@ -0,0 +1,263 @@
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+import * as fs from "fs";
+import { DbConflictCause, DbConflictResolution, DbOpcode, DbResult } from "@itwin/core-bentley";
+import { assert, expect } from "chai";
+import * as chai from "chai";
+import * as chaiAsPromised from "chai-as-promised";
+import * as sinon from "sinon";
+import { HubWrappers, KnownTestLocations } from "../";
+import { HubMock } from "../../internal/HubMock";
+import { BriefcaseDb, ChannelControl, FunctionalSchema } from "../../core-backend";
+import { IModelTestUtils, TestUserType } from "../IModelTestUtils";
+import { TestUtils } from "../TestUtils";
+import { withEditTxn } from "../../EditTxn";
+import { _nativeDb } from "../../internal/Symbols";
+import { IModelNative } from "../../internal/NativePlatform";
+chai.use(chaiAsPromised);
+/**
+ * `dgn_Domain` holds one bookkeeping row per BIS domain present in the briefcase, and the row is
+ * created automatically as soon as the domain's schema is imported. Merging a changeset that
+ * registers a domain therefore conflicts with the row that was just created locally. The conflict
+ * is benign - both rows describe the same domain - so it must never fail the pull.
+ *
+ * The tests build a timeline where two changesets each insert the same `dgn_Domain` row:
+ *
+ *   cs1 (b1) - "Domain schema upgrade"  : INSERT dgn_Domain('Functional')
+ *   cs2 (b3) - duplicate domain rows    : INSERT dgn_Domain('Functional') again
+ *
+ * b1 and b3 both start at version 0 and perform the same domain upgrade, and cs2 is appended to
+ * the timeline without rebasing. A normal `pushChanges()` cannot produce this shape because the
+ * rebase drops the duplicate insert first, but it is observed in the field from connectors.
+ *
+ * Merging both changesets in one pull used to abort, while pulling them one at a time succeeded,
+ * leaving the cached briefcase permanently stuck. All of these must now succeed alike.
+ */
+describe("dgn_Domain merge conflict", () => {
+    let iTwinId;
+    before(async () => {
+        await TestUtils.startBackend();
+        HubMock.startup("DgnDomainMergeConflict", KnownTestLocations.outputDir);
+        iTwinId = HubMock.iTwinId;
+    });
+    after(() => HubMock.shutdown());
+    /** The domain names present in the briefcase's `dgn_Domain` table. */
+    function queryDomains(db) {
+        const names = [];
+        db.withPreparedSqliteStatement("SELECT Name FROM dgn_Domain ORDER BY Name", (stmt) => {
+            while (stmt.step() === DbResult.BE_SQLITE_ROW)
+                names.push(stmt.getValueString(0));
+        });
+        return names;
+    }
+    /**
+     * Creates an iModel whose timeline holds two changesets that each INSERT the same
+     * `dgn_Domain` row, and leaves both authoring briefcases closed.
+     */
+    async function createTimelineWithDuplicateDomainRows(iModelName) {
+        const accessToken1 = await HubWrappers.getAccessToken(TestUserType.SuperManager);
+        const accessToken3 = await HubWrappers.getAccessToken(TestUserType.Super);
+        const iModelId = await HubMock.createNewIModel({ accessToken: accessToken1, iTwinId, iModelName, description: iModelName, noLocks: true });
+        assert.isNotEmpty(iModelId);
+        const b1 = await HubWrappers.downloadAndOpenBriefcase({ accessToken: accessToken1, iTwinId, iModelId, noLock: true });
+        b1.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+        // b3 is downloaded at version 0 as well, so it never learns about cs1.
+        const b3 = await HubWrappers.downloadAndOpenBriefcase({ accessToken: accessToken3, iTwinId, iModelId, noLock: true });
+        b3.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+        // cs1: the "Domain schema upgrade" changeset. Importing the Functional *domain* adds a
+        // `dgn_Domain` row for "Functional", and that insert is part of the pushed changeset.
+        await withEditTxn(b1, "Domain schema upgrade", async () => {
+            await FunctionalSchema.importSchema(b1);
+        });
+        await b1.pushChanges({ accessToken: accessToken1, description: "Domain schema upgrade" });
+        expect(queryDomains(b1)).to.include("Functional");
+        // cs2: b3 performs the same domain upgrade while unaware of cs1, so its changeset carries a
+        // second INSERT for the same `dgn_Domain` row. It is appended to the timeline without a
+        // rebase (a rebase would rewrite the duplicate insert away, which is exactly why this shape
+        // of changeset cannot be produced by `pushChanges` but is observed in the field).
+        await withEditTxn(b3, "Domain schema upgrade", async () => {
+            await FunctionalSchema.importSchema(b3);
+        });
+        // extra content so cs2 does not hash to the same changeset id as cs1
+        withEditTxn(b3, "connector data", (txn) => {
+            IModelTestUtils.createAndInsertPhysicalPartitionAndModel(txn, IModelTestUtils.getUniqueModelCode(b3, "ConnectorModel"), true);
+        });
+        const csProps = b3[_nativeDb].startCreateChangeset();
+        csProps.briefcaseId = b3.briefcaseId;
+        csProps.description = "Duplicate dgn_Domain rows";
+        csProps.size = fs.statSync(csProps.pathname).size;
+        csProps.parentId = b1.changeset.id;
+        csProps.id = IModelNative.platform.DgnDb.computeChangesetId(csProps);
+        await HubMock.pushChangeset({ accessToken: accessToken3, iModelId, changesetProps: csProps });
+        b3[_nativeDb].abandonCreateChangeset();
+        b1.close();
+        b3.close();
+        return { iModelId, tipIndex: 2 };
+    }
+    it("resolves the duplicate dgn_Domain insert when the changesets are pulled one at a time", async () => {
+        const { iModelId } = await createTimelineWithDuplicateDomainRows("DgnDomainOneAtATime");
+        const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);
+        // A briefcase parked at version 0, i.e. behind the domain upgrade.
+        const b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, asOf: { first: true }, noLock: true });
+        try {
+            expect(b2.txns.hasPendingTxns).to.be.false;
+            // Each pull is its own pull-merge session, so no local change is pending when the
+            // conflicting insert is applied.
+            await b2.pullChanges({ accessToken, toIndex: 1 });
+            await b2.pullChanges({ accessToken });
+            expect(b2.changeset.index).to.equal(2);
+            expect(queryDomains(b2).filter((name) => name === "Functional")).to.have.lengthOf(1);
+        }
+        finally {
+            b2.close();
+        }
+    });
+    it("resolves the duplicate dgn_Domain insert when the changesets are merged by a single pullChanges", async () => {
+        const { iModelId } = await createTimelineWithDuplicateDomainRows("DgnDomainSinglePull");
+        const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);
+        const b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, asOf: { first: true }, noLock: true });
+        try {
+            expect(b2.txns.hasPendingTxns).to.be.false;
+            // Both changesets are merged inside one pull-merge session, so merging cs1 leaves a pending
+            // change behind while cs2 is merged. That used to turn the benign `dgn_Domain` conflict into
+            // an abort and leave the briefcase stuck mid-merge. The conflict is now always resolved by
+            // keeping the incoming row, so batching no longer changes the outcome.
+            await b2.pullChanges({ accessToken });
+            expect(b2.changeset.index).to.equal(2);
+            expect(queryDomains(b2).filter((name) => name === "Functional")).to.have.lengthOf(1);
+        }
+        finally {
+            b2.close();
+        }
+    });
+    it("succeeds for a briefcase downloaded at the tip", async () => {
+        const { iModelId } = await createTimelineWithDuplicateDomainRows("DgnDomainFreshBriefcase");
+        const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);
+        const b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, noLock: true });
+        try {
+            expect(b2.changeset.index).to.equal(2);
+            expect(queryDomains(b2).filter((name) => name === "Functional")).to.have.lengthOf(1);
+        }
+        finally {
+            b2.close();
+        }
+    });
+    it("skips the duplicate local dgn_Domain insert while rebasing local txns", async () => {
+        const { iModelId } = await createTimelineWithDuplicateDomainRows("DgnDomainRebase");
+        const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);
+        const b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, asOf: { first: true }, noLock: true });
+        try {
+            b2.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+            // b2 imports the same domain locally and keeps the txn pending, so pulling has to merge the
+            // two incoming inserts and then replay a local txn that inserts the very same
+            // `dgn_Domain` row over the already merged one.
+            await withEditTxn(b2, "Domain schema upgrade", async () => {
+                await FunctionalSchema.importSchema(b2);
+            });
+            expect(b2.txns.hasPendingTxns).to.be.true;
+            await b2.pullChanges({ accessToken });
+            expect(b2.changeset.index).to.equal(2);
+            expect(queryDomains(b2).filter((name) => name === "Functional")).to.have.lengthOf(1);
+        }
+        finally {
+            b2.close();
+        }
+    });
+    describe("conflict handler guards", () => {
+        let b2;
+        before(async () => {
+            const { iModelId } = await createTimelineWithDuplicateDomainRows("DgnDomainHandlerGuards");
+            const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);
+            b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, asOf: { first: true }, noLock: true });
+        });
+        after(() => b2?.close());
+        /** A conflict as native code would report it, with just enough behavior for the handlers. */
+        function makeConflictArgs(overrides) {
+            return {
+                indirect: false,
+                columnCount: 3,
+                changesetFile: "test.changeset",
+                txn: { id: "0x1", type: "Schema", descr: "Domain schema upgrade" },
+                getForeignKeyConflicts: () => 0,
+                dump: () => { },
+                setLastError: () => { },
+                getPrimaryKeyColumns: () => [1, 0, 0],
+                getColumnNames: () => ["Name", "Version", "Description"],
+                getValueType: () => undefined,
+                getValueBinary: () => undefined,
+                getValueId: () => undefined,
+                getValueText: () => undefined,
+                getValueInteger: () => undefined,
+                getValueDouble: () => undefined,
+                isValueNull: () => undefined,
+                ...overrides,
+            };
+        }
+        const onMergeConflict = (args) => b2.onChangesetConflict(args);
+        const onRebaseConflict = (args) => b2.txns._onRebaseLocalTxnConflict(args);
+        it("keeps the incoming row for a duplicate dgn_Domain insert while merging", () => {
+            const args = makeConflictArgs({ tableName: "dgn_Domain", cause: DbConflictCause.Conflict, opcode: DbOpcode.Insert });
+            expect(onMergeConflict(args)).to.equal(DbConflictResolution.Replace);
+        });
+        it("skips a duplicate dgn_Domain insert while rebasing", () => {
+            const args = makeConflictArgs({ tableName: "dgn_Domain", cause: DbConflictCause.Conflict, opcode: DbOpcode.Insert });
+            expect(onRebaseConflict(args)).to.equal(DbConflictResolution.Skip);
+        });
+        // A `Data` conflict means an UPDATE or DELETE whose "before" values do not match the row in
+        // the briefcase, i.e. the two rows really do differ. Resolving those automatically would
+        // silently discard a genuine change, so they must keep the pre-existing behavior.
+        for (const opcode of [DbOpcode.Update, DbOpcode.Delete]) {
+            it(`does not swallow a dgn_Domain ${DbOpcode[opcode]} whose before values differ while merging`, () => {
+                let lastError;
+                const args = makeConflictArgs({ tableName: "dgn_Domain", cause: DbConflictCause.Data, opcode });
+                args.setLastError = (message) => lastError = message;
+                // With a local change pending, a mismatched UPDATE/DELETE must still abort the merge
+                // rather than be resolved as a benign duplicate domain registration.
+                const pending = sinon.stub(b2.txns, "hasPendingTxns").get(() => true);
+                try {
+                    expect(onMergeConflict(args)).to.equal(DbConflictResolution.Abort);
+                    expect(lastError).to.not.be.undefined;
+                }
+                finally {
+                    pending.restore();
+                }
+            });
+            it(`does not swallow a dgn_Domain ${DbOpcode[opcode]} whose before values differ while rebasing`, () => {
+                const args = makeConflictArgs({ tableName: "dgn_Domain", cause: DbConflictCause.Data, opcode });
+                // The local change wins, as it does for every other non-`ec_` table.
+                expect(onRebaseConflict(args)).to.equal(DbConflictResolution.Replace);
+            });
+        }
+        it("does not resolve conflicts on other tables", () => {
+            const args = makeConflictArgs({ tableName: "bis_Element", cause: DbConflictCause.Conflict, opcode: DbOpcode.Insert });
+            expect(onRebaseConflict(args)).to.equal(DbConflictResolution.Abort);
+        });
+    });
+    // TODO: unskip once a `@bentley/imodeljs-native` version containing iTwin/imodel-native#1548 is
+    // pinned in core/backend/package.json. The default handler lives in the addon, so this case
+    // cannot pass against 5.13.9.
+    it.skip("resolves the conflict when the TypeScript handler defers to the default handler", async () => {
+        const { iModelId } = await createTimelineWithDuplicateDomainRows("DgnDomainNativeHandler");
+        const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);
+        // `IModelDb.onChangesetConflict` is consulted first and normally resolves this conflict.
+        // Returning `undefined` hands the decision to the default handler in the addon, which is the
+        // path taken by hosts that install no JavaScript handler, such as checkpoint creation and
+        // change history. Both handlers must agree, otherwise the same changeset would apply in an
+        // iTwin.js backend but be rejected by those services.
+        const stub = sinon.stub(BriefcaseDb.prototype, "onChangesetConflict").returns(undefined);
+        const b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, asOf: { first: true }, noLock: true });
+        try {
+            await b2.pullChanges({ accessToken });
+            expect(stub.called, "the default conflict handler should have been reached via the stub").to.be.true;
+            expect(b2.changeset.index).to.equal(2);
+            expect(queryDomains(b2).filter((name) => name === "Functional")).to.have.lengthOf(1);
+        }
+        finally {
+            stub.restore();
+            b2.close();
+        }
+    });
+});
+//# sourceMappingURL=DgnDomainMergeConflict.test.js.map

package/lib/esm/test/standalone/DgnDomainMergeConflict.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DgnDomainMergeConflict.test.js","sourceRoot":"","sources":["../../../../src/test/standalone/DgnDomainMergeConflict.test.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport * as fs from \"fs\";\r\nimport { DbConflictCause, DbConflictResolution, DbOpcode, DbResult, GuidString } from \"@itwin/core-bentley\";\r\nimport { ChangesetFileProps } from \"@itwin/core-common\";\r\nimport { assert, expect } from \"chai\";\r\nimport * as chai from \"chai\";\r\nimport * as chaiAsPromised from \"chai-as-promised\";\r\nimport * as sinon from \"sinon\";\r\nimport { HubWrappers, KnownTestLocations } from \"../\";\r\nimport { HubMock } from \"../../internal/HubMock\";\r\nimport { BriefcaseDb, ChannelControl, FunctionalSchema } from \"../../core-backend\";\r\nimport { IModelTestUtils, TestUserType } from \"../IModelTestUtils\";\r\nimport { TestUtils } from \"../TestUtils\";\r\nimport { withEditTxn } from \"../../EditTxn\";\r\nimport { _nativeDb } from \"../../internal/Symbols\";\r\nimport { IModelNative } from \"../../internal/NativePlatform\";\r\n\r\nchai.use(chaiAsPromised);\r\n\r\n/**\r\n * `dgn_Domain` holds one bookkeeping row per BIS domain present in the briefcase, and the row is\r\n * created automatically as soon as the domain's schema is imported. Merging a changeset that\r\n * registers a domain therefore conflicts with the row that was just created locally. The conflict\r\n * is benign - both rows describe the same domain - so it must never fail the pull.\r\n *\r\n * The tests build a timeline where two changesets each insert the same `dgn_Domain` row:\r\n *\r\n *   cs1 (b1) - \"Domain schema upgrade\"  : INSERT dgn_Domain('Functional')\r\n *   cs2 (b3) - duplicate domain rows    : INSERT dgn_Domain('Functional') again\r\n *\r\n * b1 and b3 both start at version 0 and perform the same domain upgrade, and cs2 is appended to\r\n * the timeline without rebasing. A normal `pushChanges()` cannot produce this shape because the\r\n * rebase drops the duplicate insert first, but it is observed in the field from connectors.\r\n *\r\n * Merging both changesets in one pull used to abort, while pulling them one at a time succeeded,\r\n * leaving the cached briefcase permanently stuck. All of these must now succeed alike.\r\n */\r\ndescribe(\"dgn_Domain merge conflict\", () => {\r\n  let iTwinId: GuidString;\r\n\r\n  before(async () => {\r\n    await TestUtils.startBackend();\r\n    HubMock.startup(\"DgnDomainMergeConflict\", KnownTestLocations.outputDir);\r\n    iTwinId = HubMock.iTwinId;\r\n  });\r\n  after(() => HubMock.shutdown());\r\n\r\n  /** The domain names present in the briefcase's `dgn_Domain` table. */\r\n  function queryDomains(db: BriefcaseDb): string[] {\r\n    const names: string[] = [];\r\n    db.withPreparedSqliteStatement(\"SELECT Name FROM dgn_Domain ORDER BY Name\", (stmt) => {\r\n      while (stmt.step() === DbResult.BE_SQLITE_ROW)\r\n        names.push(stmt.getValueString(0));\r\n    });\r\n    return names;\r\n  }\r\n\r\n  /**\r\n   * Creates an iModel whose timeline holds two changesets that each INSERT the same\r\n   * `dgn_Domain` row, and leaves both authoring briefcases closed.\r\n   */\r\n  async function createTimelineWithDuplicateDomainRows(iModelName: string) {\r\n    const accessToken1 = await HubWrappers.getAccessToken(TestUserType.SuperManager);\r\n    const accessToken3 = await HubWrappers.getAccessToken(TestUserType.Super);\r\n\r\n    const iModelId = await HubMock.createNewIModel({ accessToken: accessToken1, iTwinId, iModelName, description: iModelName, noLocks: true });\r\n    assert.isNotEmpty(iModelId);\r\n\r\n    const b1 = await HubWrappers.downloadAndOpenBriefcase({ accessToken: accessToken1, iTwinId, iModelId, noLock: true });\r\n    b1.channels.addAllowedChannel(ChannelControl.sharedChannelName);\r\n    // b3 is downloaded at version 0 as well, so it never learns about cs1.\r\n    const b3 = await HubWrappers.downloadAndOpenBriefcase({ accessToken: accessToken3, iTwinId, iModelId, noLock: true });\r\n    b3.channels.addAllowedChannel(ChannelControl.sharedChannelName);\r\n\r\n    // cs1: the \"Domain schema upgrade\" changeset. Importing the Functional *domain* adds a\r\n    // `dgn_Domain` row for \"Functional\", and that insert is part of the pushed changeset.\r\n    await withEditTxn(b1, \"Domain schema upgrade\", async () => {\r\n      await FunctionalSchema.importSchema(b1);\r\n    });\r\n    await b1.pushChanges({ accessToken: accessToken1, description: \"Domain schema upgrade\" });\r\n    expect(queryDomains(b1)).to.include(\"Functional\");\r\n\r\n    // cs2: b3 performs the same domain upgrade while unaware of cs1, so its changeset carries a\r\n    // second INSERT for the same `dgn_Domain` row. It is appended to the timeline without a\r\n    // rebase (a rebase would rewrite the duplicate insert away, which is exactly why this shape\r\n    // of changeset cannot be produced by `pushChanges` but is observed in the field).\r\n    await withEditTxn(b3, \"Domain schema upgrade\", async () => {\r\n      await FunctionalSchema.importSchema(b3);\r\n    });\r\n    // extra content so cs2 does not hash to the same changeset id as cs1\r\n    withEditTxn(b3, \"connector data\", (txn) => {\r\n      IModelTestUtils.createAndInsertPhysicalPartitionAndModel(txn, IModelTestUtils.getUniqueModelCode(b3, \"ConnectorModel\"), true);\r\n    });\r\n\r\n    const csProps = b3[_nativeDb].startCreateChangeset() as ChangesetFileProps;\r\n    csProps.briefcaseId = b3.briefcaseId;\r\n    csProps.description = \"Duplicate dgn_Domain rows\";\r\n    csProps.size = fs.statSync(csProps.pathname).size;\r\n    csProps.parentId = b1.changeset.id;\r\n    csProps.id = IModelNative.platform.DgnDb.computeChangesetId(csProps);\r\n    await HubMock.pushChangeset({ accessToken: accessToken3, iModelId, changesetProps: csProps });\r\n    b3[_nativeDb].abandonCreateChangeset();\r\n\r\n    b1.close();\r\n    b3.close();\r\n    return { iModelId, tipIndex: 2 };\r\n  }\r\n\r\n  it(\"resolves the duplicate dgn_Domain insert when the changesets are pulled one at a time\", async () => {\r\n    const { iModelId } = await createTimelineWithDuplicateDomainRows(\"DgnDomainOneAtATime\");\r\n    const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);\r\n\r\n    // A briefcase parked at version 0, i.e. behind the domain upgrade.\r\n    const b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, asOf: { first: true }, noLock: true });\r\n    try {\r\n      expect(b2.txns.hasPendingTxns).to.be.false;\r\n\r\n      // Each pull is its own pull-merge session, so no local change is pending when the\r\n      // conflicting insert is applied.\r\n      await b2.pullChanges({ accessToken, toIndex: 1 });\r\n      await b2.pullChanges({ accessToken });\r\n\r\n      expect(b2.changeset.index).to.equal(2);\r\n      expect(queryDomains(b2).filter((name) => name === \"Functional\")).to.have.lengthOf(1);\r\n    } finally {\r\n      b2.close();\r\n    }\r\n  });\r\n\r\n  it(\"resolves the duplicate dgn_Domain insert when the changesets are merged by a single pullChanges\", async () => {\r\n    const { iModelId } = await createTimelineWithDuplicateDomainRows(\"DgnDomainSinglePull\");\r\n    const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);\r\n\r\n    const b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, asOf: { first: true }, noLock: true });\r\n    try {\r\n      expect(b2.txns.hasPendingTxns).to.be.false;\r\n\r\n      // Both changesets are merged inside one pull-merge session, so merging cs1 leaves a pending\r\n      // change behind while cs2 is merged. That used to turn the benign `dgn_Domain` conflict into\r\n      // an abort and leave the briefcase stuck mid-merge. The conflict is now always resolved by\r\n      // keeping the incoming row, so batching no longer changes the outcome.\r\n      await b2.pullChanges({ accessToken });\r\n\r\n      expect(b2.changeset.index).to.equal(2);\r\n      expect(queryDomains(b2).filter((name) => name === \"Functional\")).to.have.lengthOf(1);\r\n    } finally {\r\n      b2.close();\r\n    }\r\n  });\r\n\r\n  it(\"succeeds for a briefcase downloaded at the tip\", async () => {\r\n    const { iModelId } = await createTimelineWithDuplicateDomainRows(\"DgnDomainFreshBriefcase\");\r\n    const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);\r\n\r\n    const b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, noLock: true });\r\n    try {\r\n      expect(b2.changeset.index).to.equal(2);\r\n      expect(queryDomains(b2).filter((name) => name === \"Functional\")).to.have.lengthOf(1);\r\n    } finally {\r\n      b2.close();\r\n    }\r\n  });\r\n\r\n  it(\"skips the duplicate local dgn_Domain insert while rebasing local txns\", async () => {\r\n    const { iModelId } = await createTimelineWithDuplicateDomainRows(\"DgnDomainRebase\");\r\n    const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);\r\n\r\n    const b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, asOf: { first: true }, noLock: true });\r\n    try {\r\n      b2.channels.addAllowedChannel(ChannelControl.sharedChannelName);\r\n\r\n      // b2 imports the same domain locally and keeps the txn pending, so pulling has to merge the\r\n      // two incoming inserts and then replay a local txn that inserts the very same\r\n      // `dgn_Domain` row over the already merged one.\r\n      await withEditTxn(b2, \"Domain schema upgrade\", async () => {\r\n        await FunctionalSchema.importSchema(b2);\r\n      });\r\n      expect(b2.txns.hasPendingTxns).to.be.true;\r\n\r\n      await b2.pullChanges({ accessToken });\r\n\r\n      expect(b2.changeset.index).to.equal(2);\r\n      expect(queryDomains(b2).filter((name) => name === \"Functional\")).to.have.lengthOf(1);\r\n    } finally {\r\n      b2.close();\r\n    }\r\n  });\r\n\r\n  describe(\"conflict handler guards\", () => {\r\n    let b2: BriefcaseDb;\r\n\r\n    before(async () => {\r\n      const { iModelId } = await createTimelineWithDuplicateDomainRows(\"DgnDomainHandlerGuards\");\r\n      const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);\r\n      b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, asOf: { first: true }, noLock: true });\r\n    });\r\n    after(() => b2?.close());\r\n\r\n    /** A conflict as native code would report it, with just enough behavior for the handlers. */\r\n    function makeConflictArgs(overrides: { tableName: string, cause: DbConflictCause, opcode: DbOpcode, indirect?: boolean }) {\r\n      return {\r\n        indirect: false,\r\n        columnCount: 3,\r\n        changesetFile: \"test.changeset\",\r\n        txn: { id: \"0x1\", type: \"Schema\", descr: \"Domain schema upgrade\" },\r\n        getForeignKeyConflicts: () => 0,\r\n        dump: () => { },\r\n        setLastError: () => { },\r\n        getPrimaryKeyColumns: () => [1, 0, 0],\r\n        getColumnNames: () => [\"Name\", \"Version\", \"Description\"],\r\n        getValueType: () => undefined,\r\n        getValueBinary: () => undefined,\r\n        getValueId: () => undefined,\r\n        getValueText: () => undefined,\r\n        getValueInteger: () => undefined,\r\n        getValueDouble: () => undefined,\r\n        isValueNull: () => undefined,\r\n        ...overrides,\r\n      } as any;\r\n    }\r\n\r\n    const onMergeConflict = (args: any): DbConflictResolution | undefined => (b2 as any).onChangesetConflict(args);\r\n    const onRebaseConflict = (args: any): DbConflictResolution => (b2.txns as any)._onRebaseLocalTxnConflict(args);\r\n\r\n    it(\"keeps the incoming row for a duplicate dgn_Domain insert while merging\", () => {\r\n      const args = makeConflictArgs({ tableName: \"dgn_Domain\", cause: DbConflictCause.Conflict, opcode: DbOpcode.Insert });\r\n      expect(onMergeConflict(args)).to.equal(DbConflictResolution.Replace);\r\n    });\r\n\r\n    it(\"skips a duplicate dgn_Domain insert while rebasing\", () => {\r\n      const args = makeConflictArgs({ tableName: \"dgn_Domain\", cause: DbConflictCause.Conflict, opcode: DbOpcode.Insert });\r\n      expect(onRebaseConflict(args)).to.equal(DbConflictResolution.Skip);\r\n    });\r\n\r\n    // A `Data` conflict means an UPDATE or DELETE whose \"before\" values do not match the row in\r\n    // the briefcase, i.e. the two rows really do differ. Resolving those automatically would\r\n    // silently discard a genuine change, so they must keep the pre-existing behavior.\r\n    for (const opcode of [DbOpcode.Update, DbOpcode.Delete]) {\r\n      it(`does not swallow a dgn_Domain ${DbOpcode[opcode]} whose before values differ while merging`, () => {\r\n        let lastError: string | undefined;\r\n        const args = makeConflictArgs({ tableName: \"dgn_Domain\", cause: DbConflictCause.Data, opcode });\r\n        args.setLastError = (message: string) => lastError = message;\r\n\r\n        // With a local change pending, a mismatched UPDATE/DELETE must still abort the merge\r\n        // rather than be resolved as a benign duplicate domain registration.\r\n        const pending = sinon.stub(b2.txns, \"hasPendingTxns\").get(() => true);\r\n        try {\r\n          expect(onMergeConflict(args)).to.equal(DbConflictResolution.Abort);\r\n          expect(lastError).to.not.be.undefined;\r\n        } finally {\r\n          pending.restore();\r\n        }\r\n      });\r\n\r\n      it(`does not swallow a dgn_Domain ${DbOpcode[opcode]} whose before values differ while rebasing`, () => {\r\n        const args = makeConflictArgs({ tableName: \"dgn_Domain\", cause: DbConflictCause.Data, opcode });\r\n        // The local change wins, as it does for every other non-`ec_` table.\r\n        expect(onRebaseConflict(args)).to.equal(DbConflictResolution.Replace);\r\n      });\r\n    }\r\n\r\n    it(\"does not resolve conflicts on other tables\", () => {\r\n      const args = makeConflictArgs({ tableName: \"bis_Element\", cause: DbConflictCause.Conflict, opcode: DbOpcode.Insert });\r\n      expect(onRebaseConflict(args)).to.equal(DbConflictResolution.Abort);\r\n    });\r\n  });\r\n\r\n  // TODO: unskip once a `@bentley/imodeljs-native` version containing iTwin/imodel-native#1548 is\r\n  // pinned in core/backend/package.json. The default handler lives in the addon, so this case\r\n  // cannot pass against 5.13.9.\r\n  it.skip(\"resolves the conflict when the TypeScript handler defers to the default handler\", async () => {\r\n    const { iModelId } = await createTimelineWithDuplicateDomainRows(\"DgnDomainNativeHandler\");\r\n    const accessToken = await HubWrappers.getAccessToken(TestUserType.Regular);\r\n\r\n    // `IModelDb.onChangesetConflict` is consulted first and normally resolves this conflict.\r\n    // Returning `undefined` hands the decision to the default handler in the addon, which is the\r\n    // path taken by hosts that install no JavaScript handler, such as checkpoint creation and\r\n    // change history. Both handlers must agree, otherwise the same changeset would apply in an\r\n    // iTwin.js backend but be rejected by those services.\r\n    const stub = sinon.stub(BriefcaseDb.prototype, \"onChangesetConflict\" as any).returns(undefined);\r\n    const b2 = await HubWrappers.downloadAndOpenBriefcase({ accessToken, iTwinId, iModelId, asOf: { first: true }, noLock: true });\r\n    try {\r\n      await b2.pullChanges({ accessToken });\r\n\r\n      expect(stub.called, \"the default conflict handler should have been reached via the stub\").to.be.true;\r\n      expect(b2.changeset.index).to.equal(2);\r\n      expect(queryDomains(b2).filter((name) => name === \"Functional\")).to.have.lengthOf(1);\r\n    } finally {\r\n      stub.restore();\r\n      b2.close();\r\n    }\r\n  });\r\n});\r\n"]}

package/lib/esm/test/standalone/GeometryStream.test.js

@@ -2082,9 +2082,7 @@ describe("ElementGeometry", () => {
         saveTestTxn(imodel, true);
         const updateElemProps = imodel.elements.getElementProps({ id: newId, wantGeometry: true });
         assert.isUndefined(updateElemProps.geom);
-        assert.isTrue(updateElemProps.placement !== undefined);
-        const updatedPlacement = Placement3d.fromJSON(updateElemProps.placement);
-        assert.isTrue(updatedPlacement.bbox.isNull);
+        assert.isUndefined(updateElemProps.placement);
     });
 });
 describe("BRepGeometry", () => {