1 files changed, 49 insertions, 6 deletions

diff --git a/scripts/migrate-attachments.pl b/scripts/migrate-attachments.pl
index 40342c179..26cb3fb26 100755
--- a/scripts/migrate-attachments.pl
+++ b/scripts/migrate-attachments.pl
@@ -9,6 +9,7 @@
 
 use strict;
 use warnings;
+$| = 1;
 
 use FindBin qw($RealBin);
 use lib "$RealBin/..", "$RealBin/../lib";
@@ -21,23 +22,36 @@ use Getopt::Long qw(GetOptions);
 my @storage_names = Bugzilla::Attachment->get_storage_names();
 
 my %options;
-GetOptions(\%options, 'mirror=s@{2}', 'delete=s') or exit(1);
-unless ($options{mirror} || $options{delete}) {
+GetOptions(\%options, 'mirror=s@{2}', 'copy=s@{2}', 'delete=s') or exit(1);
+unless ($options{mirror} || $options{copy} || $options{delete}) {
     die <<EOF;
 Syntax:
     migrate-attachments.pl --mirror source destination
+    migrate-attachments.pl --copy source destination
     migrate-attachments.pl --delete source
 
 'mirror'
     Copies all attachments from the specified source to the destination.
     Attachments which already exist at the destination will not be copied
-    again.  Attachments deleted on the source will be deleted from the
+    again. Attachments deleted on the source will be deleted from the
     destination.
 
+    eg. migrate-attachments.pl --mirror database s3
+
+'copy'
+    Copies all attachments from the specified source to the destination.
+    Attachments which already exist at the destination will not be copied
+    again. Unlike 'mirror', attachments deleted from the source will not be
+    removed from the destination.
+
+    eg. migrate-attachments.pl --copy database s3
+
 'delete'
     Deletes all attachments in the specified location.  This operation cannot
     be undone.
 
+    eg. migrate-attachments.pl --delete database
+
 Valid locations:
     @storage_names
 
@@ -45,16 +59,17 @@ EOF
 }
 
 my $dbh = Bugzilla->dbh;
-my ($total) = $dbh->selectrow_array("SELECT COUNT(*) FROM attachments");
 
 if ($options{mirror}) {
     if ($options{mirror}->[0] eq $options{mirror}->[1]) {
         die "Source and destination must be different\n";
     }
     my ($source, $dest) = map { storage($_) } @{ $options{mirror} };
+
+    my ($total) = $dbh->selectrow_array("SELECT COUNT(*) FROM attachments");
     confirm(sprintf('Mirror %s attachments from %s to %s?', $total, @{ $options{mirror} }));
 
-    my $sth = $dbh->prepare("SELECT attach_id, attach_size FROM attachments ORDER BY attach_id");
+    my $sth = $dbh->prepare("SELECT attach_id, attach_size FROM attachments ORDER BY attach_id DESC");
     $sth->execute();
     my ($count, $deleted, $stored) = (0, 0, 0);
     while (my ($attach_id, $attach_size) = $sth->fetchrow_array()) {
@@ -79,11 +94,39 @@ if ($options{mirror}) {
     print "Attachments deleted: $deleted\n" if $deleted;
 }
 
+elsif ($options{copy}) {
+    if ($options{copy}->[0] eq $options{copy}->[1]) {
+        die "Source and destination must be different\n";
+    }
+    my ($source, $dest) = map { storage($_) } @{ $options{copy} };
+
+    my ($total) = $dbh->selectrow_array("SELECT COUNT(*) FROM attachments WHERE attach_size != 0");
+    confirm(sprintf('Copy %s attachments from %s to %s?', $total, @{ $options{copy} }));
+
+    my $sth = $dbh->prepare("SELECT attach_id, attach_size FROM attachments WHERE attach_size != 0 ORDER BY attach_id DESC");
+    $sth->execute();
+    my ($count, $stored) = (0, 0);
+    while (my ($attach_id, $attach_size) = $sth->fetchrow_array()) {
+        indicate_progress({ total => $total, current => ++$count });
+
+        # store attachments that don't already exist
+        if (!$dest->exists($attach_id)) {
+            if (my $data = $source->retrieve($attach_id)) {
+                $dest->store($attach_id, $data);
+                $stored++;
+            }
+        }
+    }
+    print "\n";
+    print "Attachments stored: $stored\n";
+}
+
 elsif ($options{delete}) {
     my $storage = storage($options{delete});
+    my ($total) = $dbh->selectrow_array("SELECT COUNT(*) FROM attachments WHERE attach_size != 0");
     confirm(sprintf('DELETE %s attachments from %s?', $total, $options{delete}));
 
-    my $sth = $dbh->prepare("SELECT attach_id FROM attachments ORDER BY attach_id");
+    my $sth = $dbh->prepare("SELECT attach_id FROM attachments WHERE attach_size != 0 ORDER BY attach_id DESC");
     $sth->execute();
     my ($count, $deleted) = (0, 0);
     while (my ($attach_id) = $sth->fetchrow_array()) {