From 68439ebab3767fc2bea530e3115c1068a3a6e50e Mon Sep 17 00:00:00 2001 From: Dennis Collinson Date: Mon, 14 May 2012 18:36:25 -0700 Subject: [PATCH] fix service user migration --- .../20120510184853_drop_service_users.rb | 2 +- db/schema.rb | 23 ++++--------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/db/migrate/20120510184853_drop_service_users.rb b/db/migrate/20120510184853_drop_service_users.rb index e24c0e7f4..717981605 100644 --- a/db/migrate/20120510184853_drop_service_users.rb +++ b/db/migrate/20120510184853_drop_service_users.rb @@ -1,6 +1,6 @@ class DropServiceUsers < ActiveRecord::Migration def up - drop_table :services_users + drop_table :service_users end diff --git a/db/schema.rb b/db/schema.rb index 3fc27a9b0..1e01514d6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -107,6 +107,8 @@ ActiveRecord::Schema.define(:version => 20120510184853) do t.datetime "updated_at" end + add_index "conversations", ["author_id"], :name => "conversations_author_id_fk" + create_table "invitation_codes", :force => true do |t| t.string "token" t.integer "user_id" @@ -144,6 +146,7 @@ ActiveRecord::Schema.define(:version => 20120510184853) do t.string "target_type", :limit => 60, :null => false 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", ["target_id", "author_id", "target_type"], :name => "index_likes_on_target_id_and_author_id_and_target_type", :unique => true add_index "likes", ["target_id"], :name => "index_likes_on_post_id" @@ -169,6 +172,7 @@ ActiveRecord::Schema.define(:version => 20120510184853) 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" @@ -200,7 +204,7 @@ ActiveRecord::Schema.define(:version => 20120510184853) do t.text "data", :null => false end - add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url" + add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url", :length => {"url"=>255} create_table "oauth_access_tokens", :force => true do |t| t.integer "authorization_id", :null => false @@ -392,23 +396,6 @@ ActiveRecord::Schema.define(:version => 20120510184853) do t.datetime "updated_at" end - create_table "service_users", :force => true do |t| - t.string "uid", :null => false - t.string "name", :null => false - t.string "photo_url", :null => false - t.integer "service_id", :null => false - t.integer "person_id" - t.integer "contact_id" - t.integer "request_id" - t.integer "invitation_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "username", :limit => 127 - end - - add_index "service_users", ["service_id"], :name => "index_service_users_on_service_id" - add_index "service_users", ["uid", "service_id"], :name => "index_service_users_on_uid_and_service_id", :unique => true - create_table "services", :force => true do |t| t.string "type", :limit => 127, :null => false t.integer "user_id", :null => false