diff options
author | Raphael Sofaer <raphael@joindiaspora.com> | 2011-06-16 05:31:56 +0400 |
---|---|---|
committer | Raphael Sofaer <raphael@joindiaspora.com> | 2011-06-19 18:16:30 +0400 |
commit | 728a547cb2483016b9be768f6c7045b70a36cbb5 (patch) | |
tree | 36450e8a04ba751a91435cc2074662630754207f /db | |
parent | 7c454b7d15c5a1984a0404a8fc34cd51628bd79e (diff) |
Undo some pg changes
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20110328202414_post_visibilities_on_contacts.rb | 7 | ||||
-rw-r--r-- | db/schema.rb | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/db/migrate/20110328202414_post_visibilities_on_contacts.rb b/db/migrate/20110328202414_post_visibilities_on_contacts.rb index 26a3c0b26..1445f3a9f 100644 --- a/db/migrate/20110328202414_post_visibilities_on_contacts.rb +++ b/db/migrate/20110328202414_post_visibilities_on_contacts.rb @@ -1,4 +1,5 @@ class PostVisibilitiesOnContacts < ActiveRecord::Migration + class PostVisibility < ActiveRecord::Base; end def self.move_author_pvs_to_aspect_pvs where_clause = <<SQL FROM post_visibilities as pv @@ -57,11 +58,7 @@ SQL end def self.pv_count - @pv_count ||= lambda { - count = execute('SELECT count(*) FROM post_visibilities').to_a.first.first - count = count.last.to_i if self.connection.class == ActiveRecord::ConnectionAdapters::PostgreSQLAdapter - count - }.call + @pv_count ||= PostVisibility.count end def self.up diff --git a/db/schema.rb b/db/schema.rb index d7e34da15..64324d449 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -81,7 +81,7 @@ ActiveRecord::Schema.define(:version => 20110606192307) do t.datetime "updated_at" end - add_index "conversation_visibilities", ["conversation_id", "person_id"], :name => "index_conversation_visibilities_on_everything", :unique => true + add_index "conversation_visibilities", ["conversation_id", "person_id"], :name => "index_conversation_visibilities_on_conversation_id_and_person_id", :unique => true add_index "conversation_visibilities", ["conversation_id"], :name => "index_conversation_visibilities_on_conversation_id" add_index "conversation_visibilities", ["person_id"], :name => "index_conversation_visibilities_on_person_id" @@ -93,6 +93,8 @@ ActiveRecord::Schema.define(:version => 20110606192307) do t.datetime "updated_at" end + add_index "conversations", ["author_id"], :name => "conversations_author_id_fk" + create_table "invitations", :force => true do |t| t.text "message" t.integer "sender_id", :null => false @@ -117,6 +119,7 @@ ActiveRecord::Schema.define(:version => 20110606192307) do t.datetime "updated_at" end + add_index "likes", ["author_id"], :name => "likes_author_id_fk" add_index "likes", ["guid"], :name => "index_likes_on_guid", :unique => true add_index "likes", ["post_id"], :name => "index_likes_on_post_id" @@ -141,6 +144,7 @@ ActiveRecord::Schema.define(:version => 20110606192307) do end add_index "messages", ["author_id"], :name => "index_messages_on_author_id" + add_index "messages", ["conversation_id"], :name => "messages_conversation_id_fk" create_table "notification_actors", :force => true do |t| t.integer "notification_id" |