[open-ils-commits] r7857 - tags/rel_1_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher

[svn at svn.open-ils.org]

Author: miker
Date: 2007-10-03 13:24:37 -0400 (Wed, 03 Oct 2007)
New Revision: 7857

Modified:
   tags/rel_1_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm
Log:
backporting critical SQL fix for patron search

Modified: tags/rel_1_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm
===================================================================
--- tags/rel_1_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm	2007-10-03 17:22:26 UTC (rev 7856)
+++ tags/rel_1_2_0/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm	2007-10-03 17:24:37 UTC (rev 7857)
@@ -508,7 +508,7 @@
 	my $clone_select = '';
 	$clone_select = "JOIN (SELECT cu.id as id FROM $a_table ca ".
 			   "JOIN $u_table cu ON (cu.mailing_address = ca.id OR cu.billing_address = ca.id) ".
-			   "WHERE $addr_where) AS clone USING (id)" if ($addr_where);
+			   "WHERE $addr_where) AS clone ON (clone.id = users.id)" if ($addr_where);
 
 	my $select = '';
 	if ($usr_where) {
@@ -533,7 +533,7 @@
 	}
 
 	if (!$ws_ou) {  # XXX This should be required!!
-		$ws_ou = actor::org_unit->search( { parent_ou => undef } )->[0]->id;
+		$ws_ou = actor::org_unit->search( { parent_ou => undef } )->next->id;
 	}
 
 	my $opt_in_join = '';
@@ -548,7 +548,7 @@
 	$select = <<"	SQL";
 		SELECT	DISTINCT $distinct_list
 		  FROM	$u_table AS users
-			JOIN ($select) AS search USING (id)
+			JOIN ($select) AS search ON (search.id = users.id)
 			JOIN $descendants d ON (d.id = users.home_ou)
 			$opt_in_join
 			$clone_select