[freeside-commits] freeside/FS/FS/TicketSystem RT_External.pm, 1.25.2.2, 1.25.2.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/TicketSystem
In directory wavetail:/tmp/cvs-serv5754

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	RT_External.pm 
Log Message:
mysql, yes, mysql.

Index: RT_External.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/TicketSystem/RT_External.pm,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -u -d -r1.25.2.2 -r1.25.2.3
--- RT_External.pm	12 Sep 2007 20:40:16 -0000	1.25.2.2
+++ RT_External.pm	25 Oct 2007 19:01:21 -0000	1.25.2.3
@@ -71,8 +71,8 @@
   $limit ||= 0;
 
   my( $from_sql, @param) = $self->_from_customer( $custnum, $priority );
-  my $sql="SELECT tickets.*, queues.name, ".
-          "position(tickets.status in 'newopenstalledresolvedrejecteddeleted')".
+  my $sql="SELECT Tickets.*, Queues.name, ".
+          "position(Tickets.status in 'newopenstalledresolvedrejecteddeleted')".
 	  " AS svalue " .
           ( length($priority) ? ", objectcustomfieldvalues.content" : '' ).
           " $from_sql ORDER BY svalue, priority DESC, id DESC LIMIT $limit";
@@ -94,8 +94,8 @@
   my $where = '';
   if ( defined($priority) ) {
 
-    my $queue_sql = " ObjectCustomFields.ObjectId = ( SELECT id FROM queues
-                                                       WHERE queues.name = ? )
+    my $queue_sql = " ObjectCustomFields.ObjectId = ( SELECT id FROM Queues
+                                                       WHERE Queues.name = ? )
                       OR ( ? = '' AND ObjectCustomFields.ObjectId = 0 )";
 
     my $customfield_sql =
@@ -125,7 +125,7 @@
       unshift @param, $priority;
 
       $join = "JOIN ObjectCustomFieldValues
-                 ON ( tickets.id = ObjectCustomFieldValues.ObjectId )";
+                 ON ( Tickets.id = ObjectCustomFieldValues.ObjectId )";
       
       $where = " AND content = ?
                  AND ObjectCustomFieldValues.disabled != 1
@@ -136,7 +136,7 @@
 
       $where =
                "AND 0 = ( SELECT count(*) FROM ObjectCustomFieldValues
-                           WHERE ObjectId    = tickets.id
+                           WHERE ObjectId    = Tickets.id
                              AND ObjectType  = 'RT::Ticket'
                              AND $customfield_sql
                         )
@@ -146,9 +146,9 @@
   }
 
   my $sql = "
-                    FROM tickets
-                    JOIN queues ON ( tickets.queue = queues.id )
-                    JOIN links ON ( tickets.id = links.localbase )
+                    FROM Tickets
+                    JOIN Queues ON ( Tickets.queue = Queues.id )
+                    JOIN Links ON ( Tickets.id = Links.localbase )
                     $join 
        WHERE ( ". join(' OR ', map "status = '$_'", $self->statuses ). " )
          AND target = 'freeside://freeside/cust_main/$custnum'
@@ -253,7 +253,7 @@
 sub queues {
   my($self) = @_;
 
-  my $sql = "SELECT id, name FROM queues WHERE disabled = 0";
+  my $sql = "SELECT id, name FROM Queues WHERE disabled = 0";
   my $sth = $dbh->prepare($sql) or die $dbh->errstr. " preparing $sql";
   $sth->execute()               or die $sth->errstr. " executing $sql";
 
@@ -266,7 +266,7 @@
 
   return '' unless $queueid;
 
-  my $sql = "SELECT name FROM queues WHERE id = ?";
+  my $sql = "SELECT name FROM Queues WHERE id = ?";
   my $sth = $dbh->prepare($sql) or die $dbh->errstr. " preparing $sql";
   $sth->execute($queueid)       or die $sth->errstr. " executing $sql";