From 4d8ce65d0e3e6d637fdaf6daa3d785553ff30ac1 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 30 Jul 2008 04:26:35 +0000
Subject: [PATCH] Port over the ems badge upgrade fix to the branch upgrade
 script.

---
 docs/upgrades/upgrade_7.4.40-7.5.16.pl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/upgrades/upgrade_7.4.40-7.5.16.pl b/docs/upgrades/upgrade_7.4.40-7.5.16.pl
index 4d95d21ab..eb0338851 100644
--- a/docs/upgrades/upgrade_7.4.40-7.5.16.pl
+++ b/docs/upgrades/upgrade_7.4.40-7.5.16.pl
@@ -87,8 +87,8 @@ addShoppingHandler($session);
 addAddressBook($session);
 insertCommercePayDriverTable($session);
 addPaymentDrivers($session);
+upgradeEMS($session);  ##Need the transaction log for EMS upgrade.
 convertTransactionLog($session);
-upgradeEMS($session);
 migrateOldProduct($session);
 mergeProductsWithCommerce($session);
 deleteOldProductTemplates($session);
@@ -822,7 +822,13 @@ sub upgradeEMS {
             }
         }
     	print "\t\t\tMigrating old registrants for $emsId.\n" unless ($quiet);
-        my $registrantResults = $db->read("select * from EventManagementSystem_badges where assetId=?",[$emsId]);
+        my $registrantResults = $db->read(<<EOSQL,[$emsId]);
+select * from EventManagementSystem_badges as b
+    join EventManagementSystem_registrations as r on b.badgeId=r.badgeId
+    join EventManagementSystem_purchases     as p on p.purchaseId=r.purchaseId
+    join transaction                         as t on p.transactionId=t.transactionId
+    where b.assetId=? and t.status='Completed'
+EOSQL
         while (my $registrantData = $registrantResults->hashRef) {
             $db->setRow("EMSRegistrant","badgeId",{
                 badgeId             => "new",