Add changeset conflict handler to IModelDb (backport #6437) [release/…

…4.4.x] (#6546)

Co-authored-by: affank <[email protected]>
Co-authored-by: Nick Tessier <[email protected]>

common/api/core-backend.api.md

@@ -51,6 +51,8 @@ import { Constructor } from '@itwin/core-bentley';
 import { CreateEmptySnapshotIModelProps } from '@itwin/core-common';
 import { CreateEmptyStandaloneIModelProps } from '@itwin/core-common';
 import { CreateSnapshotIModelProps } from '@itwin/core-common';
+import { DbConflictCause } from '@itwin/core-bentley';
+import { DbOpcode } from '@itwin/core-bentley';
 import { DbResult } from '@itwin/core-bentley';
 import { DefinitionElementProps } from '@itwin/core-common';
 import { DisplayStyle3dProps } from '@itwin/core-common';
@@ -685,6 +687,26 @@ export interface ChangesetArg extends IModelIdArg {
     readonly changeset: ChangesetIndexOrId;
 }
 
+// @internal (undocumented)
+export interface ChangesetConflictArgs {
+    // (undocumented)
+    cause: DbConflictCause;
+    // (undocumented)
+    changesetFile?: string;
+    // (undocumented)
+    dump: () => void;
+    // (undocumented)
+    getForeignKeyConflicts: () => number;
+    // (undocumented)
+    indirect: boolean;
+    // (undocumented)
+    opcode: DbOpcode;
+    // (undocumented)
+    setLastError: (message: string) => void;
+    // (undocumented)
+    tableName: string;
+}
+
 // @beta
 export class ChangesetECAdaptor implements IDisposable {
     constructor(reader: SqliteChangesetReader, disableMetaData?: boolean);

common/api/core-bentley.api.md

@@ -277,6 +277,27 @@ export type ComputePriorityFunction<T> = (value: T) => number;
 // @public
 export type Constructor<T> = new (...args: any[]) => T;
 
+// @internal
+export enum DbConflictCause {
+    // (undocumented)
+    Conflict = 3,
+    // (undocumented)
+    Constraint = 4,
+    // (undocumented)
+    Data = 1,
+    // (undocumented)
+    ForeignKey = 5,
+    // (undocumented)
+    NotFound = 2
+}
+
+// @internal
+export enum DbConflictResolution {
+    Abort = 2,
+    Replace = 1,
+    Skip = 0
+}
+
 // @public
 export enum DbOpcode {
     Delete = 9,

common/api/summary/core-backend.exports.csv

@@ -29,6 +29,7 @@ beta;ChangeFormatArgs
 beta;ChangeInstanceKey
 beta;ChangeMetaData
 public;ChangesetArg 
+internal;ChangesetConflictArgs
 beta;ChangesetECAdaptor 
 internal;ChangesetIndexArg 
 public;ChangesetRangeArg 

common/api/summary/core-bentley.exports.csv

@@ -32,6 +32,8 @@ public;CompressedId64Set = string
 public;CompressedId64Set
 public;ComputePriorityFunction
 public;Constructor
+internal;DbConflictCause
+internal;DbConflictResolution
 public;DbOpcode
 public;DbResult
 public;Dictionary

common/changes/@itwin/core-backend/affanK-add-support-for-ts-conflict-handler_2024-02-13-18-21.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/core-backend",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/core-backend"
+}

common/changes/@itwin/core-bentley/affanK-add-support-for-ts-conflict-handler_2024-02-13-18-21.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/core-bentley",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/core-bentley"
+}

common/config/azure-pipelines/ci.yaml

@@ -46,4 +46,4 @@ jobs:
       - checkout: self
       - template: ./templates/core-build.yaml
         parameters:
-          nodeVersion: 20.x
+          nodeVersion: 20.11.1

common/config/azure-pipelines/integration-client-regression-pr-validation.yaml

@@ -19,4 +19,4 @@ jobs:
     steps:
       - template: templates/integration-test-steps.yaml
         parameters:
-          nodeVersion: 20.x
+          nodeVersion: 20.11.1

common/config/azure-pipelines/integration-pr-validation.yaml

@@ -37,4 +37,4 @@ jobs:
     steps:
       - template: templates/integration-test-steps.yaml
         parameters:
-          nodeVersion: 20.x
+          nodeVersion: 20.11.1

common/config/azure-pipelines/integration-validation.yaml

@@ -32,13 +32,13 @@ jobs:
           nodeVersion: 18.x
         Linux_node_20_x:
           imageName: ubuntu-latest
-          nodeVersion: 20.x
+          nodeVersion: 20.11.1
         Windows_node_20_x:
           imageName: windows-latest
-          nodeVersion: 20.x
+          nodeVersion: 20.11.1
         MacOS_node_20_x:
           imageName: macos-latest
-          nodeVersion: 20.x
+          nodeVersion: 20.11.1
     pool:
       vmImage: $(imageName)
     steps:

common/config/azure-pipelines/jobs/fast-ci.yaml

@@ -10,12 +10,11 @@ variables:
   - name: shouldWriteToCache
     value: ${{ and(eq(variables['Agent.OS'], 'Linux'), in(variables['Build.Reason'], 'IndividualCI', 'Manual')) }}
   - name: win_pool
-    value: 'iModelTechCI'
+    value: "iModelTechCI"
   - name: linux_pool
-    value: 'iModeljs Linux'
+    value: "iModeljs Linux"
   - name: mac_pool
-    value: 'iModelTechMacArm'
-
+    value: "iModelTechMacArm"
 
 pr:
   autoCancel: true
@@ -63,11 +62,11 @@ jobs:
         clean: true
       - template: ../templates/core-build.yaml
         parameters:
-          nodeVersion: 20.x
+          nodeVersion: 20.11.1
           buildMobile: true
       # Will run if even there is a failure somewhere else in the pipeline.
       - template: ../templates/publish-test-results.yaml
         parameters:
-          nodeVersion: 20.x
+          nodeVersion: 20.11.1
       # The publish script identifies any new packages not previously published and tags the build
       - template: ../templates/publish.yaml