Merge pull request civicrm#25633 from eileenmcnaughton/559

PEAR Exception handling - Mitigation of scenario where an import table has been deleted and the metadata is out of date
eileenmcnaughton · Feb 22, 2023 · 1cb8fbf · 1cb8fbf
2 parents a7a482e + 8672f69
commit 1cb8fbf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/ext/civiimport/Civi/Api4/Import/ImportSpecProvider.php b/ext/civiimport/Civi/Api4/Import/ImportSpecProvider.php
@@ -32,8 +32,14 @@ class ImportSpecProvider extends AutoService implements SpecProviderInterface {
    */
   public function modifySpec(RequestSpec $spec): void {
     $tableName = $spec->getEntityTableName();
-    $columns = Import::getFieldsForTable($tableName);
-    $action = $spec->getAction();
+    try {
+      $columns = Import::getFieldsForTable($tableName);
+    }
+    catch (\CRM_Core_Exception $e) {
+      // The api metadata may retain the expectation that this entity exists after the
+      // table is deleted - & hence we get an error.
+      return;
+    }
     // CheckPermissions does not reach us here - so we will have to rely on earlier permission filters.
     $userJobID = substr($spec->getEntity(), (strpos($spec->getEntity(), '_') + 1));
     $userJob = UserJob::get(FALSE)->addWhere('id', '=', $userJobID)->addSelect('metadata', 'job_type', 'created_id')->execute()->first();

diff --git a/ext/civiimport/Civi/BAO/Import.php b/ext/civiimport/Civi/BAO/Import.php
@@ -203,7 +203,12 @@ public static function getFieldsForTable(string $tableName): array {
     $headers = UserJob::get(FALSE)
       ->addWhere('metadata', 'LIKE', '%' . $tableName . '%')
       ->addSelect('metadata')->execute()->first()['metadata']['DataSource']['column_headers'] ?? [];
-    $result = CRM_Core_DAO::executeQuery("SHOW COLUMNS FROM $tableName");
+    try {
+      $result = CRM_Core_DAO::executeQuery("SHOW COLUMNS FROM $tableName");
+    }
+    catch (\PEAR_Exception $e) {
+      throw new CRM_Core_Exception('Import table no longer exists');
+    }
     $userFieldIndex = 0;
     while ($result->fetch()) {
       $columns[$result->Field] = ['name' => $result->Field, 'table_name' => $tableName];