From 7e0944fb69ce82b59496dc6f5c9393fa9a567099 Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Fri, 3 Jun 2011 14:38:23 -0700 Subject: [PATCH] Make likes dependent delete, rather than dependent restrict. The fk in the former migration had dependent spelled wrong, and it silently failed --- db/migrate/20110319172136_add_likes.rb | 4 ++-- .../20110603212633_likes_dependent_delete.rb | 15 +++++++++++++++ db/schema.rb | 6 +++--- 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20110603212633_likes_dependent_delete.rb diff --git a/db/migrate/20110319172136_add_likes.rb b/db/migrate/20110319172136_add_likes.rb index d4fcaa788..096636f5d 100644 --- a/db/migrate/20110319172136_add_likes.rb +++ b/db/migrate/20110319172136_add_likes.rb @@ -15,8 +15,8 @@ class AddLikes < ActiveRecord::Migration end add_index :likes, :guid, :unique => true add_index :likes, :post_id - add_foreign_key(:likes, :posts, :dependant => :delete) - add_foreign_key(:likes, :people, :column => :author_id, :dependant => :delete) + add_foreign_key(:likes, :posts) + add_foreign_key(:likes, :people, :column => :author_id) end end diff --git a/db/migrate/20110603212633_likes_dependent_delete.rb b/db/migrate/20110603212633_likes_dependent_delete.rb new file mode 100644 index 000000000..9ec425b20 --- /dev/null +++ b/db/migrate/20110603212633_likes_dependent_delete.rb @@ -0,0 +1,15 @@ +class LikesDependentDelete < ActiveRecord::Migration + def self.up + remove_foreign_key :likes, :column => :author_id + remove_foreign_key :likes, :post + add_foreign_key(:likes, :posts, :dependent => :delete) + add_foreign_key(:likes, :people, :column => :author_id, :dependent => :delete) + end + + def self.down + remove_foreign_key(:likes, :posts) + remove_foreign_key(:likes, :people, :column => :author_id) + add_foreign_key :likes, :people, :column => :author_id + add_foreign_key :likes, :post + end +end diff --git a/db/schema.rb b/db/schema.rb index 84b6fe187..044cccfca 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20110603181015) do +ActiveRecord::Schema.define(:version => 20110603212633) do create_table "aspect_memberships", :force => true do |t| t.integer "aspect_id", :null => false @@ -398,8 +398,8 @@ ActiveRecord::Schema.define(:version => 20110603181015) do add_foreign_key "invitations", "users", :name => "invitations_recipient_id_fk", :column => "recipient_id", :dependent => :delete add_foreign_key "invitations", "users", :name => "invitations_sender_id_fk", :column => "sender_id", :dependent => :delete - add_foreign_key "likes", "people", :name => "likes_author_id_fk", :column => "author_id" - add_foreign_key "likes", "posts", :name => "likes_post_id_fk" + add_foreign_key "likes", "people", :name => "likes_author_id_fk", :column => "author_id", :dependent => :delete + add_foreign_key "likes", "posts", :name => "likes_post_id_fk", :dependent => :delete add_foreign_key "messages", "conversations", :name => "messages_conversation_id_fk", :dependent => :delete add_foreign_key "messages", "people", :name => "messages_author_id_fk", :column => "author_id", :dependent => :delete