mvhub-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Priya Ravindran (priya)
Related merge proposals:
  https://code.launchpad.net/~priya/mvhub/move_to_sql_lib_agencyaccount/+merge/22473
  proposed by: Priya Ravindran (priya)
  review: Approve - Dan MacNeil (omacneil)
------------------------------------------------------------
revno: 361 [merge]
committer: Priya Ravindran <pthirumal@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-04-06 11:44:21 -0400
message:
  Queries from perl module AccountAgency.pm moved to sql_select.lib
modified:
  app-mvhub/conf/sql_select.lib
  app-mvhub/t/sql_lib_sanity.t
  lib-mvhub/lib/MVHub/AgencyAccount.pm
  lib-mvhub/lib/MVHub/Utils/DB.pm


--
lp:mvhub
https://code.launchpad.net/~mvhub-dev/mvhub/trunk

Your team mvhub-dev is subscribed to branch lp:mvhub.
To unsubscribe from this branch go to https://code.launchpad.net/~mvhub-dev/mvhub/trunk/+edit-subscription

=== modified file 'app-mvhub/conf/sql_select.lib'
--- app-mvhub/conf/sql_select.lib	2010-03-31 16:11:24 +0000
+++ app-mvhub/conf/sql_select.lib	2010-04-06 15:14:41 +0000
@@ -39,6 +39,20 @@
   p.program_id = ?
 AND 
   a.agency_id = p.agency_id
+
+[AGENCY_X_AGENCY_NAME_PASSWORD]
+SELECT agency_name, password 
+FROM 
+    agency 
+WHERE agency_id IN (
+			  SELECT agency_id 
+			  FROM agency 
+			  WHERE contact_email = ? 
+			UNION
+			  SELECT agency_id  
+			  FROM program 
+			  WHERE contact_email = ?
+        	    )
   
 [AGENCY_X_ALL]
 SELECT 
@@ -46,6 +60,7 @@
   FROM 
        agency
 
+           
 [AGENCY_X_ALL_PUBLIC]
 SELECT
   agency_id, last_updated, hidden, 
@@ -110,20 +125,20 @@
    category_id = ?
   
 [PROGRAM_AGENCY_PROGRAM_CATEGORY_X_AGENCY_NAME_ID_PROGRAM_NAME]
-    SELECT 
-          a.agency_name, p.program_id, p.program_name,
-	  p.program_alias, p.address1, p.address2, 
-	  p.city, p.state, p.zip, p.main_phone, 
-          p.short_program_description 
-    FROM 
-	  program p, agency a, program_category pc 
-    WHERE 
-	  p.program_id = pc.program_id 
-          AND pc.category_id = ?
-          AND a.agency_id = p.agency_id 
-          AND p.hidden_reason IS NULL
-    ORDER BY
-          p.program_name
+SELECT 
+    a.agency_name, p.program_id, p.program_name,
+    p.program_alias, p.address1, p.address2, 
+    p.city, p.state, p.zip, p.main_phone, 
+    p.short_program_description 
+FROM 
+   program p, agency a, program_category pc 
+WHERE 
+   p.program_id = pc.program_id 
+   AND pc.category_id = ?
+   AND a.agency_id = p.agency_id 
+   AND p.hidden_reason IS NULL
+ORDER BY
+   p.program_name
 
 [PROGRAM_CATEGORY_HEADING_CATEGORY_X_HEADING_NAME]
 SELECT DISTINCT

=== modified file 'app-mvhub/t/sql_lib_sanity.t'
--- app-mvhub/t/sql_lib_sanity.t	2010-03-31 16:15:41 +0000
+++ app-mvhub/t/sql_lib_sanity.t	2010-04-06 15:14:41 +0000
@@ -37,6 +37,8 @@
 
 sub get_test_placeholders {
     my %data = (
+        'AGENCY_X_AGENCY_NAME_PASSWORD' =>
+            [ 'chester@xxxxxxxxxxxxxx', 'chester@xxxxxxxxxxxxxx' ],
         'AGENCY_X_EXPIRED_RECORDS'                  => [ '01-01-2008', 0 ],
         'AGENCY_X_WEBSITE'                          => [103553],
         'AGENCY_PROGRAM_X_AGENCY_NAME_AGENCY_ALIAS' => [510296],

=== modified file 'lib-mvhub/lib/MVHub/AgencyAccount.pm'
--- lib-mvhub/lib/MVHub/AgencyAccount.pm	2010-03-03 14:13:49 +0000
+++ lib-mvhub/lib/MVHub/AgencyAccount.pm	2010-04-06 15:14:41 +0000
@@ -188,18 +188,11 @@
     if ($email) {
 
         # Process a password request
-        my $sql
-            = 'SELECT agency_name, password FROM agency WHERE agency_id IN ('
-            . 'SELECT agency_id FROM agency '
-            . 'WHERE contact_email = '
-            . $dbh->quote($email)
-            . ' UNION '
-            . 'SELECT agency_id  FROM program '
-            . 'WHERE contact_email = '
-            . $dbh->quote($email) . ')';
+        my $sql = $self->retr_select_sql('AGENCY_X_AGENCY_NAME_PASSWORD');
 
         my $agency_passwords_aref
-            = $dbh->selectall_arrayref( $sql, { Slice => {} } );
+            = $dbh->selectall_arrayref( $sql, { Slice => {} }, $email,
+            $email );
         if (@$agency_passwords_aref) {
             my $from_name = $self->get_config_param('NOTIFICATION.team_name')
                 or die "failed to get team_name";

=== modified file 'lib-mvhub/lib/MVHub/Utils/DB.pm'
--- lib-mvhub/lib/MVHub/Utils/DB.pm	2010-04-01 18:19:48 +0000
+++ lib-mvhub/lib/MVHub/Utils/DB.pm	2010-04-06 15:14:41 +0000
@@ -13,6 +13,7 @@
 use SQL::Library;
 
 use base 'Exporter';
+use SQL::Library;
 
 our @EXPORT_OK = qw(
     get_data_source