Consolodated migrations

djcp · Jul 28, 2009 · 4275542 · 4275542
1 parent 1329672
commit 4275542
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 42 deletions.
diff --git a/db/migrate/20090617191213_create_freemailer_campaigns.rb b/db/migrate/20090617191213_create_freemailer_campaigns.rb
@@ -5,7 +5,9 @@ def self.up
       t.string :title
       t.text :body_template
       t.integer :sender_id, :references => :users
-
+      t.boolean :sent, :default => false
+      t.string :from
+
       t.timestamps
     end
   end

diff --git a/db/migrate/20090617191423_create_freemailer_campaign_contacts.rb b/db/migrate/20090617191423_create_freemailer_campaign_contacts.rb
@@ -4,12 +4,14 @@ def self.up
       t.integer :freemailer_campaign_id
       t.integer :contact_id
       t.string :delivery_status
-
+ 
       t.timestamps
     end
+    add_index :freemailer_campaign_contacts, [:contact_id, :freemailer_campaign_id], :unique => true
   end
 
   def self.down
+    remove_index :freemailer_campaign_contacts, :column => [:contact_id, :freemailer_campaign_id]         
     drop_table :freemailer_campaign_contacts
   end
 end
diff --git a/db/migrate/20090623195836_add_sent_to_freemailer_campaign.rb b/db/migrate/20090623195836_add_sent_to_freemailer_campaign.rb
diff --git a/db/migrate/20090701134557_add_from_to_freemailer_campaign.rb b/db/migrate/20090701134557_add_from_to_freemailer_campaign.rb
diff --git a/db/migrate/20090713165206_add_index_for_campaign_contacts.rb b/db/migrate/20090713165206_add_index_for_campaign_contacts.rb
diff --git a/db/migrate/20090714140554_create_contact_carts.rb b/db/migrate/20090714140554_create_contact_carts.rb
@@ -2,7 +2,7 @@ class CreateContactCarts < ActiveRecord::Migration
   def self.up
     create_table :contact_carts do |t|
       t.integer :user_id
-      t.string :name
+      t.string :title
       t.boolean :global, :default => false
 
       t.timestamps

diff --git a/db/migrate/20090716190453_remove_name_from_contact_cart.rb b/db/migrate/20090716190453_remove_name_from_contact_cart.rb
diff --git a/db/schema.rb b/db/schema.rb
@@ -43,10 +43,10 @@
 
   create_table "contact_carts", :force => true do |t|
     t.integer  "user_id"
+    t.string   "title"
     t.boolean  "global",     :default => false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "title"
   end
 
   create_table "contact_emails", :force => true do |t|
@@ -117,10 +117,10 @@
     t.string   "title"
     t.text     "body_template"
     t.integer  "sender_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
     t.boolean  "sent",          :default => false
     t.string   "from"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "log_items", :force => true do |t|