@itwin/core-backend 5.7.0-dev.1 → 5.7.0-dev.11

package/lib/esm/internal/IntegrityCheck.js

@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+import { IModelStatus } from "@itwin/core-bentley";
+import { IModelError } from "@itwin/core-common";
+/**
+ * Information about each integrity check type, including the name, expected result type, and SQL query to execute
+ * @internal
+ */
+export const integrityCheckTypeMap = {
+    checkDataColumns: {
+        name: "Check Data Columns",
+        resultType: "CheckDataColumnsResultRow",
+        sqlCommand: "check_data_columns",
+        sqlQuery: `PRAGMA integrity_check(check_data_columns) options enable_experimental_features`,
+    },
+    checkECProfile: {
+        name: "Check EC Profile",
+        resultType: "CheckECProfileResultRow",
+        sqlCommand: "check_ec_profile",
+        sqlQuery: `PRAGMA integrity_check(check_ec_profile) options enable_experimental_features`,
+    },
+    checkNavigationClassIds: {
+        name: "Check Navigation Class Ids",
+        resultType: "CheckNavClassIdsResultRow",
+        sqlCommand: "check_nav_class_ids",
+        sqlQuery: `PRAGMA integrity_check(check_nav_class_ids) options enable_experimental_features`,
+    },
+    checkNavigationIds: {
+        name: "Check Navigation Ids",
+        resultType: "CheckNavIdsResultRow",
+        sqlCommand: "check_nav_ids",
+        sqlQuery: `PRAGMA integrity_check(check_nav_ids) options enable_experimental_features`,
+    },
+    checkLinktableForeignKeyClassIds: {
+        name: "Check Link Table Foreign Key Class Ids",
+        resultType: "CheckLinkTableFkClassIdsResultRow",
+        sqlCommand: "check_linktable_fk_class_ids",
+        sqlQuery: `PRAGMA integrity_check(check_linktable_fk_class_ids) options enable_experimental_features`,
+    },
+    checkLinktableForeignKeyIds: {
+        name: "Check Link Table Foreign Key Ids",
+        resultType: "CheckLinkTableFkIdsResultRow",
+        sqlCommand: "check_linktable_fk_ids",
+        sqlQuery: `PRAGMA integrity_check(check_linktable_fk_ids) options enable_experimental_features`,
+    },
+    checkClassIds: {
+        name: "Check Class Ids",
+        resultType: "CheckClassIdsResultRow",
+        sqlCommand: "check_class_ids",
+        sqlQuery: `PRAGMA integrity_check(check_class_ids) options enable_experimental_features`,
+    },
+    checkDataSchema: {
+        name: "Check Data Schema",
+        resultType: "CheckDataSchemaResultRow",
+        sqlCommand: "check_data_schema",
+        sqlQuery: `PRAGMA integrity_check(check_data_schema) options enable_experimental_features`,
+    },
+    checkSchemaLoad: {
+        name: "Check Schema Load",
+        resultType: "CheckSchemaLoadResultRow",
+        sqlCommand: "check_schema_load",
+        sqlQuery: `PRAGMA integrity_check(check_schema_load) options enable_experimental_features`,
+    },
+    checkMissingChildRows: {
+        name: "Check Missing Child Rows",
+        resultType: "CheckMissingChildRowsResultRow",
+        sqlCommand: "check_missing_child_rows",
+        sqlQuery: `PRAGMA integrity_check(check_missing_child_rows) options enable_experimental_features`,
+    },
+};
+/**
+ * Gets the user-friendly name of an integrity check based on its key or SQL command.
+ * It first attempts to find a direct match for the key in the integrityCheckTypeMap. If not found, it searches for a match based on the SQL command.
+ * If still not found, it returns the original check string.
+ * @param check - The integrity check key or SQL command to get the name of
+ * @returns The user-friendly name of the integrity check, or the original check string if no match is found
+ * @internal
+ */
+export function getIntegrityCheckName(check) {
+    // First try direct lookup by key
+    const directLookup = integrityCheckTypeMap[check];
+    if (directLookup) {
+        return directLookup.name;
+    }
+    // If not found, search by sqlCommand
+    for (const [, value] of Object.entries(integrityCheckTypeMap)) {
+        if (value.sqlCommand === check) {
+            return value.name;
+        }
+    }
+    // Fallback to the original check string
+    return check;
+}
+/**
+ * Performs a quick integrity check on the given iModel.
+ * @param iModel The IModelDb instance to perform the integrity check on
+ * @returns An array of results for each check performed, including the check name, whether it passed, and the elapsed time in seconds
+ * @internal
+ */
+export async function performQuickIntegrityCheck(iModel) {
+    const integrityCheckQuery = "PRAGMA integrity_check options enable_experimental_features";
+    const integrityCheckResults = [];
+    for await (const row of iModel.createQueryReader(integrityCheckQuery)) {
+        integrityCheckResults.push({ check: getIntegrityCheckName(row.check), passed: row.result, elapsedSeconds: row.elapsed_sec });
+    }
+    ;
+    return integrityCheckResults;
+}
+export async function performSpecificIntegrityCheck(iModel, check) {
+    switch (check) {
+        case "checkDataColumns": {
+            const results = [];
+            for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkDataColumns.sqlQuery)) {
+                results.push({ sno: row.sno, table: row.table, column: row.column });
+            }
+            return results;
+        }
+        case "checkECProfile": {
+            const results = [];
+            for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkECProfile.sqlQuery)) {
+                results.push({ sno: row.sno, type: row.type, name: row.name, issue: row.issue });
+            }
+            return results;
+        }
+        case "checkNavigationClassIds": {
+            const results = [];
+            for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkNavigationClassIds.sqlQuery)) {
+                results.push({ sno: row.sno, id: row.id, class: row.class, property: row.property, navId: row.nav_id, navClassId: row.nav_classId });
+            }
+            return results;
+        }
+        case "checkNavigationIds": {
+            const results = [];
+            for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkNavigationIds.sqlQuery)) {
+                results.push({ sno: row.sno, id: row.id, class: row.class, property: row.property, navId: row.nav_id, primaryClass: row.primary_class });
+            }
+            return results;
+        }
+        case "checkLinktableForeignKeyClassIds": {
+            const results = [];
+            for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkLinktableForeignKeyClassIds.sqlQuery)) {
+                results.push({ sno: row.sno, id: row.id, relationship: row.relationship, property: row.property, keyId: row.key_id, keyClassId: row.key_classId });
+            }
+            return results;
+        }
+        case "checkLinktableForeignKeyIds": {
+            const results = [];
+            for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkLinktableForeignKeyIds.sqlQuery)) {
+                results.push({ sno: row.sno, id: row.id, relationship: row.relationship, property: row.property, keyId: row.key_id, primaryClass: row.primary_class });
+            }
+            return results;
+        }
+        case "checkClassIds": {
+            const results = [];
+            for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkClassIds.sqlQuery)) {
+                results.push({ sno: row.sno, class: row.class, id: row.id, classId: row.class_id, type: row.type });
+            }
+            return results;
+        }
+        case "checkDataSchema": {
+            const results = [];
+            for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkDataSchema.sqlQuery)) {
+                results.push({ sno: row.sno, type: row.type, name: row.name });
+            }
+            return results;
+        }
+        case "checkSchemaLoad": {
+            const results = [];
+            for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkSchemaLoad.sqlQuery)) {
+                results.push({ sno: row.sno, schema: row.schema });
+            }
+            return results;
+        }
+        case "checkMissingChildRows": {
+            const results = [];
+            for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkMissingChildRows.sqlQuery)) {
+                results.push({ sno: row.sno, class: row.class, id: row.id, classId: row.class_id, missingRowInTables: row.MissingRowInTables });
+            }
+            return results;
+        }
+        default:
+            throw new IModelError(IModelStatus.BadRequest, `Unknown integrity check type: ${check}`);
+    }
+}
+//# sourceMappingURL=IntegrityCheck.js.map

package/lib/esm/internal/IntegrityCheck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IntegrityCheck.js","sourceRoot":"","sources":["../../../src/internal/IntegrityCheck.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 { IModelStatus } from \"@itwin/core-bentley\";\r\nimport { IModelError } from \"@itwin/core-common\";\r\nimport { IModelDb } from \"../IModelDb\";\r\n\r\n/**\r\n * Information about each integrity check type, including the name, expected result type, and SQL query to execute\r\n * @internal\r\n */\r\nexport const integrityCheckTypeMap = {\r\n  checkDataColumns: {\r\n    name: \"Check Data Columns\",\r\n    resultType: \"CheckDataColumnsResultRow\",\r\n    sqlCommand: \"check_data_columns\",\r\n    sqlQuery: `PRAGMA integrity_check(check_data_columns) options enable_experimental_features`,\r\n  },\r\n  checkECProfile: {\r\n    name: \"Check EC Profile\",\r\n    resultType: \"CheckECProfileResultRow\",\r\n    sqlCommand: \"check_ec_profile\",\r\n    sqlQuery: `PRAGMA integrity_check(check_ec_profile) options enable_experimental_features`,\r\n  },\r\n  checkNavigationClassIds: {\r\n    name: \"Check Navigation Class Ids\",\r\n    resultType: \"CheckNavClassIdsResultRow\",\r\n    sqlCommand: \"check_nav_class_ids\",\r\n    sqlQuery: `PRAGMA integrity_check(check_nav_class_ids) options enable_experimental_features`,\r\n  },\r\n  checkNavigationIds: {\r\n    name: \"Check Navigation Ids\",\r\n    resultType: \"CheckNavIdsResultRow\",\r\n    sqlCommand: \"check_nav_ids\",\r\n    sqlQuery: `PRAGMA integrity_check(check_nav_ids) options enable_experimental_features`,\r\n  },\r\n  checkLinktableForeignKeyClassIds: {\r\n    name: \"Check Link Table Foreign Key Class Ids\",\r\n    resultType: \"CheckLinkTableFkClassIdsResultRow\",\r\n    sqlCommand: \"check_linktable_fk_class_ids\",\r\n    sqlQuery: `PRAGMA integrity_check(check_linktable_fk_class_ids) options enable_experimental_features`,\r\n  },\r\n  checkLinktableForeignKeyIds: {\r\n    name: \"Check Link Table Foreign Key Ids\",\r\n    resultType: \"CheckLinkTableFkIdsResultRow\",\r\n    sqlCommand: \"check_linktable_fk_ids\",\r\n    sqlQuery: `PRAGMA integrity_check(check_linktable_fk_ids) options enable_experimental_features`,\r\n  },\r\n  checkClassIds: {\r\n    name: \"Check Class Ids\",\r\n    resultType: \"CheckClassIdsResultRow\",\r\n    sqlCommand: \"check_class_ids\",\r\n    sqlQuery: `PRAGMA integrity_check(check_class_ids) options enable_experimental_features`,\r\n  },\r\n  checkDataSchema: {\r\n    name: \"Check Data Schema\",\r\n    resultType: \"CheckDataSchemaResultRow\",\r\n    sqlCommand: \"check_data_schema\",\r\n    sqlQuery: `PRAGMA integrity_check(check_data_schema) options enable_experimental_features`,\r\n  },\r\n  checkSchemaLoad: {\r\n    name: \"Check Schema Load\",\r\n    resultType: \"CheckSchemaLoadResultRow\",\r\n    sqlCommand: \"check_schema_load\",\r\n    sqlQuery: `PRAGMA integrity_check(check_schema_load) options enable_experimental_features`,\r\n  },\r\n  checkMissingChildRows: {\r\n    name: \"Check Missing Child Rows\",\r\n    resultType: \"CheckMissingChildRowsResultRow\",\r\n    sqlCommand: \"check_missing_child_rows\",\r\n    sqlQuery: `PRAGMA integrity_check(check_missing_child_rows) options enable_experimental_features`,\r\n  },\r\n} as const;\r\n\r\n/**\r\n * Type representing the keys of the integrityCheckType map, which correspond to the different types of integrity checks that can be performed.\r\n */\r\nexport type IntegrityCheckKey = keyof typeof integrityCheckTypeMap;\r\n\r\n/** Map of integrity check keys to their result row types */\r\ninterface IntegrityCheckResultTypeMap {\r\n  checkDataColumns: CheckDataColumnsResultRow;\r\n  checkECProfile: CheckECProfileResultRow;\r\n  checkNavigationClassIds: CheckNavClassIdsResultRow;\r\n  checkNavigationIds: CheckNavIdsResultRow;\r\n  checkLinktableForeignKeyClassIds: CheckLinkTableFkClassIdsResultRow;\r\n  checkLinktableForeignKeyIds: CheckLinkTableFkIdsResultRow;\r\n  checkClassIds: CheckClassIdsResultRow;\r\n  checkDataSchema: CheckDataSchemaResultRow;\r\n  checkSchemaLoad: CheckSchemaLoadResultRow;\r\n  checkMissingChildRows: CheckMissingChildRowsResultRow;\r\n}\r\n\r\n/** Checks the Map to give the return type of a specific integrity check */\r\ntype IntegrityCheckResultRow<K extends IntegrityCheckKey> = IntegrityCheckResultTypeMap[K];\r\n\r\n/**\r\n * Return type for quick integrity check\r\n */\r\nexport interface QuickIntegrityCheckResultRow {\r\n  check: string;\r\n  passed: boolean;\r\n  elapsedSeconds: string;\r\n}\r\n\r\n/**\r\n * Return type for Check Data Columns integrity check\r\n */\r\nexport interface CheckDataColumnsResultRow {\r\n  sno: number;\r\n  table: string;\r\n  column: string;\r\n}\r\n\r\n/**\r\n * Return type for Check EC Profile integrity check\r\n */\r\nexport interface CheckECProfileResultRow {\r\n  sno: number;\r\n  type: string;\r\n  name: string;\r\n  issue: string;\r\n}\r\n\r\n/**\r\n * Return type for Check Navigation Class Ids integrity check\r\n */\r\nexport interface CheckNavClassIdsResultRow {\r\n  sno: number;\r\n  id: string;\r\n  class: string;\r\n  property: string;\r\n  navId: string;\r\n  navClassId: string;\r\n}\r\n\r\n/**\r\n * Return type for Check Navigation Ids integrity check\r\n */\r\nexport interface CheckNavIdsResultRow {\r\n  sno: number;\r\n  id: string;\r\n  class: string;\r\n  property: string;\r\n  navId: string;\r\n  primaryClass: string;\r\n}\r\n\r\n/**\r\n * Return type for Check Link Table Foreign Key Class Ids integrity check\r\n */\r\nexport interface CheckLinkTableFkClassIdsResultRow {\r\n  sno: number;\r\n  id: string;\r\n  relationship: string;\r\n  property: string;\r\n  keyId: string;\r\n  keyClassId: string;\r\n}\r\n\r\n/**\r\n * Return type for Check Link Table Foreign Key Ids integrity check\r\n */\r\nexport interface CheckLinkTableFkIdsResultRow {\r\n  sno: number;\r\n  id: string;\r\n  relationship: string;\r\n  property: string;\r\n  keyId: string;\r\n  primaryClass: string;\r\n}\r\n\r\n/**\r\n * Return type for Check Class Ids integrity check\r\n */\r\nexport interface CheckClassIdsResultRow {\r\n  sno: number;\r\n  class: string;\r\n  id: string;\r\n  classId: string;\r\n  type: string;\r\n}\r\n\r\n/**\r\n * Return type for Check Data Schema integrity check\r\n */\r\nexport interface CheckDataSchemaResultRow {\r\n  sno: number;\r\n  type: string;\r\n  name: string;\r\n}\r\n\r\n/**\r\n * Return type for Check Schema Load integrity check\r\n */\r\nexport interface CheckSchemaLoadResultRow {\r\n  sno: number;\r\n  schema: string;\r\n}\r\n\r\n/**\r\n * Return type for Check Missing Child Rows integrity check\r\n */\r\nexport interface CheckMissingChildRowsResultRow {\r\n  sno: number;\r\n  class: string;\r\n  id: string;\r\n  classId: string;\r\n  missingRowInTables: string;\r\n}\r\n\r\n/**\r\n * Return type for integrity check results, including the check name, whether it passed, and the specific results (if any)\r\n */\r\nexport interface IntegrityCheckResult {\r\n  /** The name of the integrity check that was performed */\r\n  check: string;\r\n  /** Whether the integrity check passed (i.e. no issues were found = true) */\r\n  passed: boolean;\r\n  /** The specific results returned by the integrity check, which may include details about any issues that were found.\r\n   * In the case where issues are found, this will be an array of result rows specific to the type of check that was performed,\r\n   * or an array of quick integrity check results if it was a quick check. */\r\n  results: IntegrityCheckResultRow<IntegrityCheckKey>[] | QuickIntegrityCheckResultRow[];\r\n}\r\n\r\n/**\r\n * Gets the user-friendly name of an integrity check based on its key or SQL command.\r\n * It first attempts to find a direct match for the key in the integrityCheckTypeMap. If not found, it searches for a match based on the SQL command.\r\n * If still not found, it returns the original check string.\r\n * @param check - The integrity check key or SQL command to get the name of\r\n * @returns The user-friendly name of the integrity check, or the original check string if no match is found\r\n * @internal\r\n */\r\nexport function getIntegrityCheckName(check: string): string {\r\n  // First try direct lookup by key\r\n  const directLookup = integrityCheckTypeMap[check as IntegrityCheckKey];\r\n  if (directLookup) {\r\n    return directLookup.name;\r\n  }\r\n  // If not found, search by sqlCommand\r\n  for (const [, value] of Object.entries(integrityCheckTypeMap)) {\r\n    if (value.sqlCommand === check) {\r\n      return value.name;\r\n    }\r\n  }\r\n  // Fallback to the original check string\r\n  return check;\r\n}\r\n\r\n/**\r\n * Performs a quick integrity check on the given iModel.\r\n * @param iModel The IModelDb instance to perform the integrity check on\r\n * @returns An array of results for each check performed, including the check name, whether it passed, and the elapsed time in seconds\r\n * @internal\r\n */\r\nexport async function performQuickIntegrityCheck(iModel: IModelDb): Promise<QuickIntegrityCheckResultRow[]> {\r\n  const integrityCheckQuery = \"PRAGMA integrity_check options enable_experimental_features\";\r\n  const integrityCheckResults: QuickIntegrityCheckResultRow[] = [];\r\n  for await (const row of iModel.createQueryReader(integrityCheckQuery)) {\r\n    integrityCheckResults.push({ check: getIntegrityCheckName(row.check), passed: row.result, elapsedSeconds: row.elapsed_sec});\r\n  };\r\n  return integrityCheckResults;\r\n}\r\n\r\n/**\r\n * Performs a specific integrity check on the given iModel based on the provided check key, and returns the results specific to that check type.\r\n * @param iModel The IModelDb instance to perform the integrity check on\r\n * @param check The key of the specific integrity check to perform\r\n * @return An array of results specific to the integrity check that was performed. The type of the result rows will depend on the check that was executed.\r\n * @throws IModelError with status BadRequest if an unknown integrity check key is provided\r\n * @internal\r\n */\r\nexport async function performSpecificIntegrityCheck(iModel: IModelDb, check: \"checkDataColumns\"): Promise<IntegrityCheckResultRow<\"checkDataColumns\">[]>;\r\nexport async function performSpecificIntegrityCheck(iModel: IModelDb, check: \"checkECProfile\"): Promise<IntegrityCheckResultRow<\"checkECProfile\">[]>;\r\nexport async function performSpecificIntegrityCheck(iModel: IModelDb, check: \"checkNavigationClassIds\"): Promise<IntegrityCheckResultRow<\"checkNavigationClassIds\">[]>;\r\nexport async function performSpecificIntegrityCheck(iModel: IModelDb, check: \"checkNavigationIds\"): Promise<IntegrityCheckResultRow<\"checkNavigationIds\">[]>;\r\nexport async function performSpecificIntegrityCheck(iModel: IModelDb, check: \"checkLinktableForeignKeyClassIds\"): Promise<IntegrityCheckResultRow<\"checkLinktableForeignKeyClassIds\">[]>;\r\nexport async function performSpecificIntegrityCheck(iModel: IModelDb, check: \"checkLinktableForeignKeyIds\"): Promise<IntegrityCheckResultRow<\"checkLinktableForeignKeyIds\">[]>;\r\nexport async function performSpecificIntegrityCheck(iModel: IModelDb, check: \"checkClassIds\"): Promise<IntegrityCheckResultRow<\"checkClassIds\">[]>;\r\nexport async function performSpecificIntegrityCheck(iModel: IModelDb, check: \"checkDataSchema\"): Promise<IntegrityCheckResultRow<\"checkDataSchema\">[]>;\r\nexport async function performSpecificIntegrityCheck(iModel: IModelDb, check: \"checkSchemaLoad\"): Promise<IntegrityCheckResultRow<\"checkSchemaLoad\">[]>;\r\nexport async function performSpecificIntegrityCheck(iModel: IModelDb, check: \"checkMissingChildRows\"): Promise<IntegrityCheckResultRow<\"checkMissingChildRows\">[]>;\r\nexport async function performSpecificIntegrityCheck<K extends IntegrityCheckKey>(iModel: IModelDb, check: K): Promise<IntegrityCheckResultRow<K>[]>;\r\nexport async function performSpecificIntegrityCheck(iModel: IModelDb, check: IntegrityCheckKey): Promise<IntegrityCheckResultRow<IntegrityCheckKey>[]> {\r\n  switch (check) {\r\n    case \"checkDataColumns\": {\r\n      const results: CheckDataColumnsResultRow[] = [];\r\n      for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkDataColumns.sqlQuery)) {\r\n        results.push({ sno: row.sno, table: row.table, column: row.column });\r\n      }\r\n      return results;\r\n    }\r\n    case \"checkECProfile\": {\r\n      const results: CheckECProfileResultRow[] = [];\r\n      for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkECProfile.sqlQuery)) {\r\n        results.push({ sno: row.sno, type: row.type, name: row.name, issue: row.issue });\r\n      }\r\n      return results;\r\n    }\r\n    case \"checkNavigationClassIds\": {\r\n      const results: CheckNavClassIdsResultRow[] = [];\r\n      for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkNavigationClassIds.sqlQuery)) {\r\n        results.push({ sno: row.sno, id: row.id, class: row.class, property: row.property, navId: row.nav_id, navClassId: row.nav_classId });\r\n      }\r\n      return results;\r\n    }\r\n    case \"checkNavigationIds\": {\r\n      const results: CheckNavIdsResultRow[] = [];\r\n      for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkNavigationIds.sqlQuery)) {\r\n        results.push({ sno: row.sno, id: row.id, class: row.class, property: row.property, navId: row.nav_id, primaryClass: row.primary_class });\r\n      }\r\n      return results;\r\n    }\r\n    case \"checkLinktableForeignKeyClassIds\": {\r\n      const results: CheckLinkTableFkClassIdsResultRow[] = [];\r\n      for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkLinktableForeignKeyClassIds.sqlQuery)) {\r\n        results.push({ sno: row.sno, id: row.id, relationship: row.relationship, property: row.property, keyId: row.key_id, keyClassId: row.key_classId });\r\n      }\r\n      return results;\r\n    }\r\n    case \"checkLinktableForeignKeyIds\": {\r\n      const results: CheckLinkTableFkIdsResultRow[] = [];\r\n      for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkLinktableForeignKeyIds.sqlQuery)) {\r\n        results.push({ sno: row.sno, id: row.id, relationship: row.relationship, property: row.property, keyId: row.key_id, primaryClass: row.primary_class });\r\n      }\r\n      return results;\r\n    }\r\n    case \"checkClassIds\": {\r\n      const results: CheckClassIdsResultRow[] = [];\r\n      for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkClassIds.sqlQuery)) {\r\n        results.push({ sno: row.sno, class: row.class, id: row.id, classId: row.class_id, type: row.type });\r\n      }\r\n      return results;\r\n    }\r\n    case \"checkDataSchema\": {\r\n      const results: CheckDataSchemaResultRow[] = [];\r\n      for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkDataSchema.sqlQuery)) {\r\n        results.push({ sno: row.sno, type: row.type, name: row.name });\r\n      }\r\n      return results;\r\n    }\r\n    case \"checkSchemaLoad\": {\r\n      const results: CheckSchemaLoadResultRow[] = [];\r\n      for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkSchemaLoad.sqlQuery)) {\r\n        results.push({ sno: row.sno, schema: row.schema });\r\n      }\r\n      return results;\r\n    }\r\n    case \"checkMissingChildRows\": {\r\n      const results: CheckMissingChildRowsResultRow[] = [];\r\n      for await (const row of iModel.createQueryReader(integrityCheckTypeMap.checkMissingChildRows.sqlQuery)) {\r\n        results.push({ sno: row.sno, class: row.class, id: row.id, classId: row.class_id, missingRowInTables: row.MissingRowInTables });\r\n      }\r\n      return results;\r\n    }\r\n    default:\r\n      throw new IModelError(IModelStatus.BadRequest, `Unknown integrity check type: ${check}`);\r\n  }\r\n}"]}

package/lib/esm/test/hubaccess/Rebase.test.js

@@ -184,6 +184,18 @@ class TestIModel {
         HubMock.shutdown();
     }
 }
+const removePropertyRecursive = (obj, prop) => {
+    if (obj && typeof obj === "object") {
+        Object.keys(obj).forEach((key) => {
+            if (key === prop) {
+                delete obj[key];
+            }
+            else {
+                removePropertyRecursive(obj[key], prop);
+            }
+        });
+    }
+};
 describe("rebase changes & stashing api", function () {
     let testIModel;
     before(async () => {
@@ -483,7 +495,7 @@ describe("rebase changes & stashing api", function () {
         b1.saveChanges();
         await chai.expect(b1.txns.withIndirectTxnModeAsync(async () => {
             await b1.pushChanges({ description: "test" });
-        })).to.be.rejectedWith("Cannot push changeset while in an indirect change scope");
+        })).to.be.rejectedWith("Cannot pull and apply changeset while in an indirect change scope");
         await b1.pushChanges({ description: "test" });
     });
     it("should fail to saveFileProperty/deleteFileProperty in indirect scope", async () => {
@@ -978,7 +990,7 @@ describe("rebase changes & stashing api", function () {
             onRebase: {
                 beginCount: 0,
                 endCount: 0,
-                beginIds: [],
+                beginTxns: [],
             },
             onRebaseTxn: {
                 beginTxns: [],
@@ -987,44 +999,174 @@ describe("rebase changes & stashing api", function () {
             rebaseHandler: {
                 shouldReinstate: [],
                 recompute: [],
-            }
+            },
+            pullMerge: {
+                beginCount: 0,
+                endCount: 0,
+                beginChangeset: [],
+                endChangeset: [],
+            },
+            applyIncomingChanges: {
+                beginCount: 0,
+                endCount: 0,
+                beginChangesets: [],
+                endChangesets: [],
+            },
+            reverseLocalChanges: {
+                beginCount: 0,
+                endCount: 0,
+                txns: [],
+            },
+            downloadChangesets: {
+                beginCount: 0,
+                endCount: 0,
+            },
         };
         const resetEvent = () => {
             events.onRebase.beginCount = 0;
             events.onRebase.endCount = 0;
-            events.onRebase.beginIds = [];
+            events.onRebase.beginTxns = [];
             events.onRebaseTxn.beginTxns = [];
             events.onRebaseTxn.endTxns = [];
             events.rebaseHandler.shouldReinstate = [];
             events.rebaseHandler.recompute = [];
+            events.pullMerge.beginCount = 0;
+            events.pullMerge.endCount = 0;
+            events.pullMerge.beginChangeset = [];
+            events.pullMerge.endChangeset = [];
+            events.applyIncomingChanges.beginCount = 0;
+            events.applyIncomingChanges.endCount = 0;
+            events.applyIncomingChanges.beginChangesets = [];
+            events.applyIncomingChanges.endChangesets = [];
+            events.reverseLocalChanges.beginCount = 0;
+            events.reverseLocalChanges.endCount = 0;
+            events.reverseLocalChanges.txns = [];
+            events.downloadChangesets.beginCount = 0;
+            events.downloadChangesets.endCount = 0;
         };
-        b2.txns.onRebaseBegin.addListener((ids) => {
+        // onPullMergeXXXX
+        b2.txns.rebaser.onPullMergeBegin.addListener((changeset) => {
+            events.pullMerge.beginCount++;
+            events.pullMerge.beginChangeset.push(changeset);
+        });
+        b2.txns.rebaser.onPullMergeEnd.addListener((changeset) => {
+            events.pullMerge.endCount++;
+            events.pullMerge.endChangeset.push(changeset);
+        });
+        // onApplyIncomingChangesXXXX
+        b2.txns.rebaser.onApplyIncomingChangesBegin.addListener((changesets) => {
+            events.applyIncomingChanges.beginCount++;
+            events.applyIncomingChanges.beginChangesets.push(...changesets);
+        });
+        b2.txns.rebaser.onApplyIncomingChangesEnd.addListener((changesets) => {
+            events.applyIncomingChanges.endCount++;
+            events.applyIncomingChanges.endChangesets.push(...changesets);
+        });
+        // onReverseLocalChangesXXXX
+        b2.txns.rebaser.onReverseLocalChangesBegin.addListener(() => {
+            events.reverseLocalChanges.beginCount++;
+        });
+        b2.txns.rebaser.onReverseLocalChangesEnd.addListener((txns) => {
+            events.reverseLocalChanges.endCount++;
+            removePropertyRecursive(txns, "timestamp"); // it changes on each run, so remove it for comparison
+            events.reverseLocalChanges.txns.push(...txns);
+        });
+        // onDownloadChangesetsXXXX
+        b2.txns.rebaser.onDownloadChangesetsBegin.addListener(() => {
+            events.downloadChangesets.beginCount++;
+        });
+        b2.txns.rebaser.onDownloadChangesetsEnd.addListener(() => {
+            events.downloadChangesets.endCount++;
+        });
+        // onRebaseXXXX
+        b2.txns.rebaser.onRebaseBegin.addListener((txns) => {
             events.onRebase.beginCount++;
-            events.onRebase.beginIds.push(...ids);
+            removePropertyRecursive(txns, "timestamp"); // it changes on each run, so remove it for comparison
+            events.onRebase.beginTxns.push(...txns);
         });
-        b2.txns.onRebaseEnd.addListener(() => {
+        b2.txns.rebaser.onRebaseEnd.addListener(() => {
             events.onRebase.endCount++;
         });
-        b2.txns.onRebaseTxnBegin.addListener((txn) => {
+        // onRebaseTxnXXXX
+        b2.txns.rebaser.onRebaseTxnBegin.addListener((txn) => {
+            removePropertyRecursive(txn, "timestamp"); // it changes on each run, so remove it for comparison
             events.onRebaseTxn.beginTxns.push(txn);
         });
-        b2.txns.onRebaseTxnEnd.addListener((txn) => {
+        b2.txns.rebaser.onRebaseTxnEnd.addListener((txn) => {
+            removePropertyRecursive(txn, "timestamp"); // it changes on each run, so remove it for comparison
             events.onRebaseTxn.endTxns.push(txn);
         });
         b2.txns.rebaser.setCustomHandler({
             shouldReinstate: (_txn) => {
+                // shouldReinstate
+                removePropertyRecursive(_txn, "timestamp"); // it changes on each run, so remove it for comparison
                 events.rebaseHandler.shouldReinstate.push(_txn);
                 return true;
             },
             recompute: async (_txn) => {
+                // recompute
+                removePropertyRecursive(_txn, "timestamp"); // it changes on each run, so remove it for comparison
                 events.rebaseHandler.recompute.push(_txn);
             },
         });
         resetEvent();
         await b2.pullChanges();
+        // pullMerge events
+        chai.expect(events.pullMerge.beginCount).to.equal(1);
+        chai.expect(events.pullMerge.endCount).to.equal(1);
+        chai.expect((events.pullMerge.beginChangeset[0].index)).to.equal(3);
+        chai.expect((events.pullMerge.endChangeset[0].index)).to.equal(4);
+        // applyIncomingChanges events
+        chai.expect(events.applyIncomingChanges.beginCount).to.equal(1);
+        chai.expect(events.applyIncomingChanges.endCount).to.equal(1);
+        chai.expect(events.applyIncomingChanges.beginChangesets.map((cs) => cs.index)).to.deep.equal([4]);
+        chai.expect(events.applyIncomingChanges.endChangesets.map((cs) => cs.index)).to.deep.equal([4]);
+        // downloadChangesets events
+        chai.expect(events.downloadChangesets.beginCount).to.equal(1);
+        chai.expect(events.downloadChangesets.endCount).to.equal(1);
+        // reverseLocalChanges events
+        chai.expect(events.reverseLocalChanges.beginCount).to.equal(1);
+        chai.expect(events.reverseLocalChanges.endCount).to.equal(1);
+        chai.expect(events.reverseLocalChanges.txns.map((txn) => txn.id)).to.deep.equal(["0x100000000", "0x100000001", "0x100000002"]);
+        // rebase events
         chai.expect(events.onRebase.beginCount).to.equal(1);
         chai.expect(events.onRebase.endCount).to.equal(1);
-        chai.expect(events.onRebase.beginIds).to.deep.equal(["0x100000000", "0x100000001", "0x100000002"]);
+        chai.expect(events.onRebase.beginTxns).to.deep.equal([
+            {
+                grouped: false,
+                id: "0x100000000",
+                nextId: "0x100000001",
+                props: {
+                    description: "first change"
+                },
+                reversed: true,
+                sessionId: 1,
+                type: "Data"
+            },
+            {
+                grouped: false,
+                id: "0x100000001",
+                nextId: "0x100000002",
+                prevId: "0x100000000",
+                props: {
+                    description: "second change",
+                },
+                reversed: true,
+                sessionId: 1,
+                type: "Data"
+            },
+            {
+                grouped: false,
+                id: "0x100000002",
+                prevId: "0x100000001",
+                props: {
+                    description: "third change"
+                },
+                reversed: true,
+                sessionId: 1,
+                type: "Data"
+            }
+        ]);
         chai.expect(events.onRebaseTxn.beginTxns.map((txn) => txn.id)).to.deep.equal(["0x100000000", "0x100000001", "0x100000002"]);
         chai.expect(events.onRebaseTxn.endTxns.map((txn) => txn.id)).to.deep.equal(["0x100000000", "0x100000001", "0x100000002"]);
         chai.expect(events.rebaseHandler.shouldReinstate.map((txn) => txn.id)).to.deep.equal(["0x100000000", "0x100000001", "0x100000002"]);
@@ -1035,12 +1177,59 @@ describe("rebase changes & stashing api", function () {
         await b1.pushChanges({ description: "update element 1 direct and 1 indirect" });
         await testIModel.insertElement(b2);
         await testIModel.insertElement(b2, true);
-        b2.saveChanges("forth change");
+        b2.saveChanges("fourth change");
         resetEvent();
         await b2.pullChanges();
         chai.expect(events.onRebase.beginCount).to.equal(1);
         chai.expect(events.onRebase.endCount).to.equal(1);
-        chai.expect(events.onRebase.beginIds).to.deep.equal(["0x100000000", "0x100000001", "0x100000002", "0x100000003"]);
+        chai.expect(events.onRebase.beginTxns).to.deep.equal([
+            {
+                grouped: false,
+                id: "0x100000000",
+                nextId: "0x100000001",
+                props: {
+                    description: "first change"
+                },
+                reversed: true,
+                sessionId: 1,
+                type: "Data"
+            },
+            {
+                grouped: false,
+                id: "0x100000001",
+                nextId: "0x100000002",
+                prevId: "0x100000000",
+                props: {
+                    description: "second change"
+                },
+                reversed: true,
+                sessionId: 1,
+                type: "Data"
+            },
+            {
+                grouped: false,
+                id: "0x100000002",
+                nextId: "0x100000003",
+                prevId: "0x100000001",
+                props: {
+                    description: "third change"
+                },
+                reversed: true,
+                sessionId: 1,
+                type: "Data"
+            },
+            {
+                grouped: false,
+                id: "0x100000003",
+                prevId: "0x100000002",
+                props: {
+                    description: "fourth change"
+                },
+                reversed: true,
+                sessionId: 1,
+                type: "Data"
+            }
+        ]);
         chai.expect(events.onRebaseTxn.beginTxns.map((txn) => txn.id)).to.deep.equal(["0x100000000", "0x100000001", "0x100000002", "0x100000003"]);
         chai.expect(events.onRebaseTxn.endTxns.map((txn) => txn.id)).to.deep.equal(["0x100000000", "0x100000001", "0x100000002", "0x100000003"]);
         chai.expect(events.rebaseHandler.shouldReinstate.map((txn) => txn.id)).to.deep.equal(["0x100000000", "0x100000001", "0x100000002", "0x100000003"]);