Make the cloumn used to locate a database row configurable.

Author: jpwhite4

classes/DataWarehouse/Data/RawStatisticsConfiguration.php

@@ -156,6 +156,24 @@ public function getQueryTableDefinitions($realm)
         return $realmConfig['tables'];
     }
 
+    /**
+     * Get the column name to use when looking up a record in the job viewer
+     *
+     * @param string $realm The name of a realm.
+     * @return string
+     */
+    public function getRecordIdentifierColumn($realm)
+    {
+        $realmConfig = $this->getRealmConfiguration($realm);
+        if (!array_key_exists('record_identifier_column', $realmConfig)) {
+            throw new Exception(sprintf(
+                'Record Identifier setting not found for realm "%s"',
+                $realm
+            ));
+        }
+        return $realmConfig['record_identifier_column'];
+    }
+
     /**
      * Get the field definitions for generating a query.
      *

classes/DataWarehouse/Query/Jobs/JobDataset.php

@@ -51,7 +51,6 @@ public function __construct(
 
         // This table is defined in the configuration file, but used in the section below.
         $factTable = $tables['jt'];
-
         if (isset($parameters['primary_key'])) {
             $this->addPdoWhereCondition(new WhereCondition(new TableField($factTable, 'job_id'), "=", $parameters['primary_key']));
         } elseif (isset($parameters['job_identifier'])) {
@@ -62,7 +61,7 @@ public function __construct(
                     $this->addPdoWhereCondition(new WhereCondition(new TableField($factTable, 'local_jobid'), '=', $matches[1]));
                     $this->addPdoWhereCondition(new WhereCondition(new TableField($factTable, 'local_job_array_index'), '=', $matches[2]));
                 } else {
-                    $this->addPdoWhereCondition(new WhereCondition(new TableField($factTable, 'local_job_id_raw'), '=', $matches[1]));
+                    $this->addPdoWhereCondition(new WhereCondition(new TableField($factTable, $config->getRecordIdentifierColumn('Jobs')), '=', $matches[1]));
                 }
             } else {
                 throw new Exception('invalid "job_identifier" query parameter');

configuration/rawstatistics.d/20_jobs.json

@@ -376,6 +376,7 @@
                 "documentation": "${HIERARCHY_BOTTOM_LEVEL_INFO}",
                 "batchExport": true
             }
-        ]
+        ],
+        "record_identifier_column": "local_jobid"
     }
 }