From 011293bb5b109cb2120172b21f7994117ad87253 Mon Sep 17 00:00:00 2001
From: Rob Thorne <rob@torenware.com>
Date: Wed, 29 Apr 2015 20:47:30 +0000
Subject: [PATCH] CRM-16367 (Payment): Added payment_token_id + FK to recurring
 contributions table.

---
 tests/phpunit/api/v3/PaymentTokenTest.php   |  5 +----
 xml/schema/Contribute/ContributionRecur.xml | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/phpunit/api/v3/PaymentTokenTest.php b/tests/phpunit/api/v3/PaymentTokenTest.php
index 11e7ee5c74..e480a49f1f 100644
--- a/tests/phpunit/api/v3/PaymentTokenTest.php
+++ b/tests/phpunit/api/v3/PaymentTokenTest.php
@@ -58,9 +58,7 @@ class api_v3_PaymentTokenTest extends CiviUnitTestCase {
     $result = $this->callAPIAndDocument('payment_token', 'create', $this->params, __FUNCTION__, __FILE__, $description);
     $this->assertEquals(1, $result['count']);
     $this->assertNotNull($result['values'][$result['id']]['id']);
-    $this->getAndCheck(array_merge($this->params, array( //your parameters here.
-                                                        $this->params
-                                                        )), $result['id'], 'payment_token', TRUE);
+    $this->getAndCheck(array_merge($this->params, array($this->params,)), $result['id'], 'payment_token', TRUE);
   }
 
   public function testGetPaymentToken() {
@@ -81,4 +79,3 @@ class api_v3_PaymentTokenTest extends CiviUnitTestCase {
   }
 
 }
-
diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml
index 65fec6ff67..1024fe0a5c 100644
--- a/xml/schema/Contribute/ContributionRecur.xml
+++ b/xml/schema/Contribute/ContributionRecur.xml
@@ -134,6 +134,20 @@
     <comment>Possibly needed to store a unique identifier for this recurring payment order - if this is available from the processor??</comment>
     <add>1.6</add>
   </field>
+  <field>
+    <name>payment_token_id</name>
+    <title>Payment Token ID</title>
+    <type>int unsigned</type>
+    <comment>Optionally used to store a link to a payment token used for this recurring contribution.</comment>
+    <add>4.6</add>
+  </field>
+  <foreignKey>
+    <name>payment_token_id</name>
+    <table>civicrm_payment_token</table>
+    <key>id</key>
+    <add>4.6</add>
+    <onDelete>SET NULL</onDelete>
+  </foreignKey>
   <field>
     <name>trxn_id</name>
     <title>Transaction ID</title>
-- 
2.25.1