Attachment 303412 Details for Bug 443458 – The patch to fix the "Add attah_data table "

[patch] The patch to fix the "Add attah_data table "

1.1.patch (text/plain), 8.90 KB, created by XINSUN on 2008-04-23 02:20:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: XINSUN

Created: 2008-04-23 02:20:27 UTC

Size: 8.90 KB

patch

obsolete

>Index: Bugzilla/Attachment.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/Attachment.pm,v
>retrieving revision 1.1.1.1
>diff -u -r1.1.1.1 Attachment.pm
>--- Bugzilla/Attachment.pm	16 Nov 2004 16:42:36 -0000	1.1.1.1
>+++ Bugzilla/Attachment.pm	23 Apr 2008 02:17:37 -0000
>@@ -76,10 +76,20 @@
>   # Retrieve a list of attachments for this bug and write them into an array
>   # of hashes in which each hash represents a single attachment.
>   &::SendSQL("
>-              SELECT attach_id, " . Bugzilla::DB::DateFormat('creation_ts', '%Y.%m.%d %H:%i:%s') . ", 
>-              mimetype, description, ispatch, isobsolete, isprivate, 
>-              submitter_id, " . Bugzilla::DB::Length('thedata') . "
>-              FROM attachments WHERE bug_id = $bugid ORDER BY attach_id
>+              SELECT attachments.attach_id, "
>+                      . Bugzilla::DB::DateFormat('attachments.creation_ts', '%Y.%m.%d %H:%i:%s') . ", 
>+                     attachments.mimetype, 
>+                     attachments.description, 
>+                     attachments.ispatch, 
>+                     attachments.isobsolete, 
>+                     attachments.isprivate, 
>+                     attachments.submitter_id, "
>+                     . Bugzilla::DB::Length('attach_data.thedata') . "
>+              FROM   attachments,
>+                     attach_data 
>+              WHERE  attachments.bug_id = $bugid 
>+              AND    attachments.attach_id = attach_data.id 
>+              ORDER BY attach_id
>             ");
>   my @attachments = ();
>   while (&::MoreSQLData()) {
>Index: attachment.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/attachment.cgi,v
>retrieving revision 1.10
>diff -u -r1.10 attachment.cgi
>--- attachment.cgi	15 Feb 2008 21:53:11 -0000	1.10
>+++ attachment.cgi	23 Apr 2008 02:17:37 -0000
>@@ -523,7 +523,12 @@
>     # Display an attachment.
> 
>     # Retrieve the attachment content and its content type from the database.
>-    my $query="SELECT mimetype, filename, thedata FROM attachments WHERE attach_id = $::FORM{'id'}";
>+    my $query="SELECT attachments.mimetype, 
>+                      attachments.filename,
>+                      attach_data.thedata 
>+               FROM   attachments,attach_data  
>+               WHERE  attachments.attach_id = attach_data.id
>+               AND    attachments.attach_id = $::FORM{'id'}";
>     $logger->debug("sql query before execution: [ $query ]");
>     SendSQL($query);
>     my ($contenttype, $filename, $thedata) = FetchSQLData();
>@@ -628,7 +633,13 @@
>   require File::Temp;
> 
>   # Get the patch
>-  SendSQL("SELECT bug_id, description, ispatch, thedata FROM attachments WHERE attach_id = $id");
>+  SendSQL("SELECT attachments.bug_id, 
>+                  attachments.description, 
>+                  attachments.ispatch,
>+                  attach_data.thedata 
>+           FROM   attachments,attach_data 
>+           WHERE  attachments.attach_id = attach_data.id
>+           AND    attach_id = $id");
>   my ($bugid, $description, $ispatch, $thedata) = FetchSQLData();
>   if (!$ispatch) {
>     $vars->{'attach_id'} = $id;
>@@ -761,7 +772,13 @@
> sub diff
> {
>   # Get patch data
>-  SendSQL("SELECT bug_id, description, ispatch, thedata FROM attachments WHERE attach_id = $::FORM{'id'}");
>+  SendSQL("SELECT attachments.bug_id, 
>+                  attachments.description, 
>+                  attachments.ispatch, 
>+                  attach_data.thedata 
>+           FROM   attachments,attach_data
>+           WHERE  attachments.attach_id = attach_data.id
>+           AND    attach_id = $::FORM{'id'}");
>   my ($bugid, $description, $ispatch, $thedata) = FetchSQLData();
> 
>   # If it is not a patch, view normally
>@@ -830,10 +847,17 @@
>     if (Param("insidergroup") && !(UserInGroup(Param("insidergroup")))) {
>         $privacy = "AND isprivate < 1 ";
>     }
>-    SendSQL("SELECT attach_id, " . Bugzilla::DB::DateFormat('creation_ts', '%Y.%m.%d %H:%i') . ",
>-            mimetype, description, ispatch, isobsolete, isprivate, " . 
>-            Bugzilla::DB::Length('thedata', 'base64') . "
>-            FROM attachments WHERE bug_id = $::FORM{'bugid'} $privacy 
>+    SendSQL("SELECT attachments.attach_id, "
>+                    . Bugzilla::DB::DateFormat('attachments.creation_ts', '%Y.%m.%d %H:%i') . ",
>+                    attachments.mimetype, 
>+                    attachments.description, 
>+                    attachments.ispatch, 
>+                    attachments.isobsolete, 
>+                    attachments.isprivate, " . 
>+                    Bugzilla::DB::Length('attach_data.thedata', 'base64') . "
>+            FROM  attachments, attach_data 
>+            WHERE attachments.attach_id = attach_data.id
>+            AND   bug_id = $::FORM{'bugid'} $privacy 
>             ORDER BY attach_id");
>   my @attachments; # the attachments array
>   while (MoreSQLData())
>@@ -843,8 +867,7 @@
>      $a{'description'}, $a{'ispatch'}, $a{'isobsolete'}, $a{'isprivate'},
>      $a{'datasize'}) = FetchSQLData();
>     $a{'isviewable'} = isViewable($a{'contenttype'});
>-    $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'},
>-                                          'is_active' => 1 });
>+    $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'} });
> 
>     # Add the hash representing the attachment to the array of attachments.
>     push @attachments, \%a;
>@@ -942,16 +965,22 @@
>   trick_taint($thedata);
> 
>   # Insert the attachment into the database.
>-  my $query="INSERT INTO attachments (bug_id, creation_ts, filename, description, mimetype, ispatch, isprivate, submitter_id, thedata)
>-           VALUES ($::FORM{'bugid'}, now(), $sqlfilename, $description, $contenttype, $::FORM{'ispatch'}, $isprivate, $::userid, ?)";
>+  my $query="INSERT INTO attachments (bug_id, creation_ts, filename, description, mimetype, ispatch, isprivate, submitter_id)
>+           VALUES ($::FORM{'bugid'}, now(), $sqlfilename, $description, $contenttype, $::FORM{'ispatch'}, $isprivate, $::userid)";
> 
>   $logger->debug("sql query before execution: [ $query ]");
>-  SendSQL($query, $thedata);
>+  SendSQL($query);
>   $logger->debug("sql query executed");
> 
>   # Retrieve the ID of the newly created attachment record.
>   SendSQL(Bugzilla::DB::LastKey('attachments', 'attach_id'));
>   my $attachid = FetchOneColumn();
>+ 
>+  # Insert thedata related to the new attachment into attach_data table.
>+  $query="INSERT INTO attach_data (id,thedata) VALUES ($attachid,$thedata)";
>+  $logger->debug("sql query before execution: [ $query ]");
>+  SendSQL($query);
>+  $logger->debug("sql query executed"); 
> 
>   # Insert a comment about the new attachment into the database.
>   my $comment = "Created an attachment (id=$attachid) $filename\n";
>@@ -1064,8 +1092,17 @@
>   # Users cannot edit the content of the attachment itself.
> 
>   # Retrieve the attachment from the database.
>-  SendSQL("SELECT description, mimetype, filename, bug_id, ispatch, isobsolete, isprivate, " . Bugzilla::DB::Length('thedata', 'base64') . "
>-           FROM attachments WHERE attach_id = $::FORM{'id'}");
>+  SendSQL("SELECT attachments.description, 
>+                  attachments.mimetype, 
>+                  attachments.filename, 
>+                  attachments.bug_id, 
>+                  attachments.ispatch, 
>+                  attachments.isobsolete, 
>+                  attachments.isprivate, "
>+                   . Bugzilla::DB::Length('attach_data.thedata', 'base64') . "
>+           FROM   attachments,attach_data 
>+           WHERE  attachments.attach_id = attach_data.id 
>+           AND    attach_id = $::FORM{'id'}");
>   my ($description, $contenttype, $filename, $bugid, $ispatch, $isobsolete, $isprivate, $datasize) = FetchSQLData();
> 
>   my $displaycontenttype;
>@@ -1146,7 +1182,7 @@
>   
>   # Lock database tables in preparation for updating the attachment.
>   Bugzilla::DB::LockTables(
>-          "LOCK TABLES attachments WRITE , flags WRITE , " . 
>+          "LOCK TABLES attachments WRITE , attach_data WRITE , flags WRITE , " . 
>           "flagtypes READ , fielddefs READ , bugs_activity WRITE, " . 
>           "flaginclusions AS i READ, flagexclusions AS e READ, " . 
>           # cc, bug_group_map, user_group_map, and groups are in here so we
>Index: process.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/process.cgi,v
>retrieving revision 1.28
>diff -u -r1.28 process.cgi
>--- process.cgi	29 Feb 2008 11:58:23 -0000	1.28
>+++ process.cgi	23 Apr 2008 02:17:37 -0000
>@@ -1465,7 +1465,7 @@
>             "flaginclusions AS i READ, flagexclusions AS e READ, " .
>             # we need write on attachments so CertifySystem can
>             # mark the packages private.
>-            "keyworddefs READ, groups READ, attachments $write, " .
>+            "keyworddefs READ, groups READ, attachments $write, attach_data $write," .
>             "group_control_map AS oldcontrolmap READ, " .
>             "group_control_map AS newcontrolmap READ, " .
>             "group_control_map READ, external_bugzilla READ, " .

Actions: View | Diff

Attachments on bug 443458: 303412 | 304124 | 304248