Commit 431481c4 authored by jaapjansma's avatar jaapjansma
Browse files

Merge branch 'CIVICRM-1702' into 'master'

Data Processor, SQL error - Duplicate column name 'participant_payment_participant_id' when a Data Processor is configured to use two or more Pariticipant Sources

Closes #91

See merge request !85
parents d952892a 969051e6
......@@ -41,7 +41,7 @@ class ParticipantSource extends AbstractCivicrmEntitySource implements AlterExpo
protected function initializeParticipantPayment() {
if (!$this->participantPaymentDataFlow) {
$this->participantPaymentDataFlow = new SqlTableDataFlow('civicrm_participant_payment', $this->getSourceName().'_participant_payment');
DataSpecificationUtils::addDAOFieldsToDataSpecification('CRM_Event_DAO_ParticipantPayment', $this->participantPaymentDataFlow->getDataSpecification(), array('id'), '', 'participant_payment_', E::ts('Participant Payment :: '));
DataSpecificationUtils::addDAOFieldsToDataSpecification('CRM_Event_DAO_ParticipantPayment', $this->participantPaymentDataFlow->getDataSpecification(), array('id'), '', $this->getSourceName() . '_participant_payment_', E::ts('Participant Payment :: '));
}
if (!isset($this->additionalDataFlowDescriptions['civicrm_participant_payment']) && $this->primaryDataFlow != $this->participantPaymentDataFlow) {
$this->participantPaymentJoin = new SimpleJoin($this->getSourceName(), 'id', $this->participantPaymentDataFlow->getName(), 'participant_id', 'LEFT');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment