split migration into two steps, so we only lose raw_email database data *after* we've made filesystem representations of it

2 files changed, 17 insertions, 3 deletions

diff --git a/db/migrate/099_move_raw_email_to_filesystem.rb b/db/migrate/099_move_raw_email_to_filesystem.rb
index 991ef55d7..ea77580e1 100644
--- a/db/migrate/099_move_raw_email_to_filesystem.rb
+++ b/db/migrate/099_move_raw_email_to_filesystem.rb
@@ -6,15 +6,15 @@ class MoveRawEmailToFilesystem < ActiveRecord::Migration
                 if !File.exists?(raw_email.filepath)
                     STDERR.puts "converting raw_email " + raw_email.id.to_s
                     raw_email.data = raw_email.dbdata
-                    raw_email.dbdata = nil
-                    raw_email.save!
+                    #raw_email.dbdata = nil
+                    #raw_email.save!
                 end
             end
         end
     end
 
     def self.down
-        #raise "safer not to have reverse migration scripts, and we never use them"
+        raise "safer not to have reverse migration scripts, and we never use them"
     end
 end
 
diff --git a/db/migrate/100_remove_redundant_raw_email_columns.rb b/db/migrate/100_remove_redundant_raw_email_columns.rb
new file mode 100644
index 000000000..b8f9454f6
--- /dev/null
+++ b/db/migrate/100_remove_redundant_raw_email_columns.rb
@@ -0,0 +1,14 @@
+class RemoveRedundantRawEmailColumns < ActiveRecord::Migration
+    def self.up
+        ActiveRecord::Base.connection.execute("ALTER TABLE raw_emails DROP COLUMN data_text")
+        ActiveRecord::Base.connection.execute("ALTER TABLE raw_emails DROP COLUMN data_binary")
+    end
+
+    def self.down
+        raise "safer not to have reverse migration scripts, and we never use them"
+    end
+end
+
+
+
+