merge migrations

17 files changed, 66 insertions, 129 deletions

diff --git a/db/migrate/20130225123010_create_accounts.rb b/db/migrate/20130225123010_create_accounts.rb
deleted file mode 100644
index 9e96020..0000000
--- a/db/migrate/20130225123010_create_accounts.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateAccounts < ActiveRecord::Migration
-  def change
-    create_table :accounts do |t|
-      t.integer :user_id, :limit => 8, :null => false
-      t.string :oauth_token, :null => false
-      t.string :oauth_token_secret, :null => false
-
-      t.timestamps
-    end
-
-    add_index :accounts, :user_id, :unique => true
-  end
-end
diff --git a/db/migrate/20130226150329_create_tweets.rb b/db/migrate/20130226150329_create_tweets.rb
deleted file mode 100644
index 3c7138c..0000000
--- a/db/migrate/20130226150329_create_tweets.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class CreateTweets < ActiveRecord::Migration
-  def change
-    create_table :tweets do |t|
-      t.text :text, :null => false
-      t.text :source
-      t.references :user, :limit => 8, :null => false
-      t.datetime :tweeted_at
-
-      t.integer :favorites_count, :default => 0
-      t.integer :retweets_count, :default => 0
-    end
-
-    add_index :tweets, :user_id
-  end
-end
diff --git a/db/migrate/20130226150829_create_favorites.rb b/db/migrate/20130226150829_create_favorites.rb
deleted file mode 100644
index c972b92..0000000
--- a/db/migrate/20130226150829_create_favorites.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateFavorites < ActiveRecord::Migration
-  def change
-    create_table :favorites do |t|
-      t.references :tweet, :limit => 8, :null => false
-      t.references :user, :limit => 8, :null => false
-    end
-
-    add_index :favorites, [:tweet_id, :user_id], :unique => true
-    add_index :favorites, :tweet_id
-  end
-end
diff --git a/db/migrate/20130226151042_create_retweets.rb b/db/migrate/20130226151042_create_retweets.rb
deleted file mode 100644
index 10ea615..0000000
--- a/db/migrate/20130226151042_create_retweets.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateRetweets < ActiveRecord::Migration
-  def change
-    create_table :retweets do |t|
-      t.references :tweet, :limit => 8, :null => false
-      t.references :user, :limit => 8, :null => false
-    end
-
-    add_index :retweets, [:tweet_id, :user_id], :unique => true
-    add_index :retweets, :tweet_id
-  end
-end
diff --git a/db/migrate/20130322152541_add_user_id_index_to_events.rb b/db/migrate/20130322152541_add_user_id_index_to_events.rb
deleted file mode 100644
index 8543185..0000000
--- a/db/migrate/20130322152541_add_user_id_index_to_events.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddUserIdIndexToEvents < ActiveRecord::Migration
-  def change
-    add_index :favorites, :user_id
-    add_index :retweets, :user_id
-  end
-end
diff --git a/db/migrate/20130322171251_add_column_consumer_version_to_accounts.rb b/db/migrate/20130322171251_add_column_consumer_version_to_accounts.rb
deleted file mode 100644
index 747287b..0000000
--- a/db/migrate/20130322171251_add_column_consumer_version_to_accounts.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddColumnConsumerVersionToAccounts < ActiveRecord::Migration
-  def change
-    add_column :accounts, :consumer_version, :integer
-  end
-end
diff --git a/db/migrate/20130323045606_add_protected_to_users.rb b/db/migrate/20130323045606_add_protected_to_users.rb
deleted file mode 100644
index dcc85f6..0000000
--- a/db/migrate/20130323045606_add_protected_to_users.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddProtectedToUsers < ActiveRecord::Migration
-  def change
-    add_column :users, :protected, :boolean
-  end
-end
diff --git a/db/migrate/20130413042256_my_sql_change_charset.rb b/db/migrate/20130413042256_my_sql_change_charset.rb
deleted file mode 100644
index 27480ad..0000000
--- a/db/migrate/20130413042256_my_sql_change_charset.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class MySqlChangeCharset < ActiveRecord::Migration
-  def change
-    # this isn't needed when the database was created in utf8mb4
-    # if /^mysql2?$/i =~ ActiveRecord::Base.connection.adapter_name
-    #   charset = "utf8mb4"
-    #   collation = "utf8mb4_general_ci"
-
-    #   # database
-    #   execute "ALTER DATABASE #{connection.current_database} DEFAULT CHARACTER SET #{charset} COLLATE #{collation}"
-
-    #   # schema_migrations
-    #   execute "ALTER TABLE schema_migrations CHANGE version version VARCHAR(191) CHARACTER SET #{charset} COLLATE #{collation}"
-
-    #   # table
-    #   connection.tables.each do |table|
-    #     execute "ALTER TABLE #{table} CONVERT TO CHARACTER SET #{charset} COLLATE #{collation}"
-    #   end
-    # else
-    #   raise ActiveRecord::IrreversibleMigration.new("Migration error: Unsupported database for migration to utf8mb4 support.")
-    # end
-  end
-end
diff --git a/db/migrate/20130511060935_change_account_consumer_version_not_null.rb b/db/migrate/20130511060935_change_account_consumer_version_not_null.rb
deleted file mode 100644
index 0c37dc2..0000000
--- a/db/migrate/20130511060935_change_account_consumer_version_not_null.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ChangeAccountConsumerVersionNotNull < ActiveRecord::Migration
-  def change
-    change_column :accounts, :consumer_version, :integer, null: false
-  end
-end
diff --git a/db/migrate/20130525142430_add_account_settings_to_account.rb b/db/migrate/20130525142430_add_account_settings_to_account.rb
deleted file mode 100644
index 2b11479..0000000
--- a/db/migrate/20130525142430_add_account_settings_to_account.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddAccountSettingsToAccount < ActiveRecord::Migration
-  def change
-    add_column :accounts, :notification, :boolean, null: false, default: false
-    add_column :accounts, :private, :boolean, null: false, default: false
-    add_column :accounts, :status, :integer, limit: 2, null: false, default: 0
-  end
-end
-
diff --git a/db/migrate/20130805001718_create_tweets.rb b/db/migrate/20130805001718_create_tweets.rb
new file mode 100644
index 0000000..ebc22df
--- /dev/null
+++ b/db/migrate/20130805001718_create_tweets.rb
@@ -0,0 +1,15 @@
+class CreateTweets < ActiveRecord::Migration
+  def change
+    create_table :tweets do |t|
+      t.text :text,                 null: false
+      t.text :source,               null: false
+      t.references :user, limit: 8, null: false
+      t.datetime :tweeted_at,       null: false
+
+      t.integer :favorites_count,   null: false, default: 0
+      t.integer :retweets_count,    null: false, default: 0
+    end
+
+    add_index :tweets, :user_id
+  end
+end
diff --git a/db/migrate/20130805001719_create_favorites.rb b/db/migrate/20130805001719_create_favorites.rb
new file mode 100644
index 0000000..7744482
--- /dev/null
+++ b/db/migrate/20130805001719_create_favorites.rb
@@ -0,0 +1,11 @@
+class CreateFavorites < ActiveRecord::Migration
+  def change
+    create_table :favorites do |t|
+      t.references :tweet,  limit: 8, null: false
+      t.references :user,   limit: 8, null: false
+    end
+
+    add_index :favorites, [:tweet_id, :user_id], unique: true
+    add_index :favorites, :user_id
+  end
+end
diff --git a/db/migrate/20130805001720_create_retweets.rb b/db/migrate/20130805001720_create_retweets.rb
new file mode 100644
index 0000000..63f64dd
--- /dev/null
+++ b/db/migrate/20130805001720_create_retweets.rb
@@ -0,0 +1,11 @@
+class CreateRetweets < ActiveRecord::Migration
+  def change
+    create_table :retweets do |t|
+      t.references :tweet,  limit: 8, null: false
+      t.references :user,   limit: 8, null: false
+    end
+
+    add_index :retweets, :tweet_id
+    add_index :retweets, :user_id
+  end
+end
diff --git a/db/migrate/20130226145932_create_users.rb b/db/migrate/20130805001721_create_users.rb
index 1c863d2..525fe72 100644
--- a/db/migrate/20130226145932_create_users.rb
+++ b/db/migrate/20130805001721_create_users.rb
@@ -1,11 +1,11 @@
 class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|
-      t.string :screen_name
-      t.string :name
+      t.string :screen_name,    limit: 20
+      t.string :name,           limit: 64
       t.text :profile_image_url
-
       t.timestamps
+      t.boolean :protected
     end
 
     add_index :users, :screen_name
diff --git a/db/migrate/20130805001722_change_account_notification_default_true.rb b/db/migrate/20130805001722_change_account_notification_default_true.rb
deleted file mode 100644
index b7297b6..0000000
--- a/db/migrate/20130805001722_change_account_notification_default_true.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ChangeAccountNotificationDefaultTrue < ActiveRecord::Migration
-  def change
-    change_column :accounts, :notification, :boolean, default: true
-  end
-end
diff --git a/db/migrate/20130805001722_create_accounts.rb b/db/migrate/20130805001722_create_accounts.rb
new file mode 100644
index 0000000..16f9673
--- /dev/null
+++ b/db/migrate/20130805001722_create_accounts.rb
@@ -0,0 +1,16 @@
+class CreateAccounts < ActiveRecord::Migration
+  def change
+    create_table :accounts do |t|
+      t.integer :user_id,           limit: 8,   null: false
+      t.string :oauth_token,                    null: false
+      t.string :oauth_token_secret,             null: false
+      t.timestamps
+      t.integer :consumer_version,              null: false
+      t.boolean :notification,                  null: false, default: true
+      t.boolean :private,                       null: false, default: false
+      t.integer :status,            limit: 2,   null: false, default: 0
+    end
+
+    add_index :accounts, :user_id, unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b6c4db9..4c8e8aa 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -33,7 +33,6 @@ ActiveRecord::Schema.define(version: 20130805001722) do
   end
 
   add_index "favorites", ["tweet_id", "user_id"], name: "index_favorites_on_tweet_id_and_user_id", unique: true, using: :btree
-  add_index "favorites", ["tweet_id"], name: "index_favorites_on_tweet_id", using: :btree
   add_index "favorites", ["user_id"], name: "index_favorites_on_user_id", using: :btree
 
   create_table "issues", force: true do |t|
@@ -52,38 +51,29 @@ ActiveRecord::Schema.define(version: 20130805001722) do
     t.integer "user_id",  limit: 8, null: false
   end
 
-  add_index "retweets", ["tweet_id", "user_id"], name: "index_retweets_on_tweet_id_and_user_id", unique: true, using: :btree
   add_index "retweets", ["tweet_id"], name: "index_retweets_on_tweet_id", using: :btree
   add_index "retweets", ["user_id"], name: "index_retweets_on_user_id", using: :btree
 
-  create_table "stolen_tweets", force: true do |t|
-    t.integer "tweet_id",    limit: 8
-    t.integer "original_id", limit: 8
-  end
-
-  add_index "stolen_tweets", ["original_id"], name: "index_stolen_tweets_on_original_id", using: :btree
-  add_index "stolen_tweets", ["tweet_id"], name: "index_stolen_tweets_on_tweet_id", unique: true, using: :btree
-
   create_table "tweets", force: true do |t|
-    t.text     "text",            limit: 16777215,             null: false
-    t.text     "source",          limit: 16777215
-    t.integer  "user_id",         limit: 8,                    null: false
-    t.datetime "tweeted_at"
-    t.integer  "favorites_count",                  default: 0
-    t.integer  "retweets_count",                   default: 0
+    t.text     "text",                                  null: false
+    t.text     "source",                                null: false
+    t.integer  "user_id",         limit: 8,             null: false
+    t.datetime "tweeted_at",                            null: false
+    t.integer  "favorites_count",           default: 0, null: false
+    t.integer  "retweets_count",            default: 0, null: false
   end
 
   add_index "tweets", ["user_id"], name: "index_tweets_on_user_id", using: :btree
 
   create_table "users", force: true do |t|
-    t.string   "screen_name"
-    t.string   "name"
-    t.text     "profile_image_url", limit: 16777215
+    t.string   "screen_name",       limit: 20
+    t.string   "name",              limit: 64
+    t.text     "profile_image_url"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "protected"
   end
 
-  add_index "users", ["screen_name"], name: "index_users_on_screen_name", length: {"screen_name"=>191}, using: :btree
+  add_index "users", ["screen_name"], name: "index_users_on_screen_name", using: :btree
 
 end