From 110efd1fb6beef4abbd5a4d54e0136e3d09ac2cf Mon Sep 17 00:00:00 2001
From: Miles Georgi <azimux@gmail.com>
Date: Wed, 2 Dec 2009 19:24:14 -0800
Subject: [PATCH] Changed some recent migrations to call
 reset_column_information on model classes before using them.

---
 db/migrate/071_fix_tags_naming.rb         |    4 ++++
 db/migrate/075_move_editor_to_user.rb     |    3 +++
 db/migrate/076_fix_users_empty_email.rb   |    2 ++
 db/migrate/077_fix_userless_articles.rb   |    3 +++
 db/migrate/078_add_textfilter_to_users.rb |    6 ++++++
 db/migrate/079_move_editor_as_string.rb   |    2 ++
 db/migrate/080_add_state_to_user.rb       |    2 ++
 7 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/db/migrate/071_fix_tags_naming.rb b/db/migrate/071_fix_tags_naming.rb
index 6023126..b0ec060 100644
--- a/db/migrate/071_fix_tags_naming.rb
+++ b/db/migrate/071_fix_tags_naming.rb
@@ -1,5 +1,7 @@
 class FixTagsNaming < ActiveRecord::Migration
   def self.up
+    Tag.reset_column_information
+
     tags = Tag.find(:all)
     tags.each do |tag|
       tag.name = tag.name.gsub('.', '-')
@@ -8,6 +10,8 @@ class FixTagsNaming < ActiveRecord::Migration
   end
 
   def self.down
+    Tag.reset_column_information
+
     tags = Tag.find(:all)
     tags.each do |tag|
       tag.name = tag.display_name.gsub('-', '.')
diff --git a/db/migrate/075_move_editor_to_user.rb b/db/migrate/075_move_editor_to_user.rb
index 08ea3db..9575a52 100644
--- a/db/migrate/075_move_editor_to_user.rb
+++ b/db/migrate/075_move_editor_to_user.rb
@@ -3,6 +3,9 @@ class MoveEditorToUser < ActiveRecord::Migration
     add_column :users, :editor, :integer, :default => 2
     
     unless $schema_generator
+      Blog.reset_column_information
+      User.reset_column_information
+
       blog = Blog.default
       editor = blog.editor
       users = User.find(:all)
diff --git a/db/migrate/076_fix_users_empty_email.rb b/db/migrate/076_fix_users_empty_email.rb
index df221a3..9a57610 100644
--- a/db/migrate/076_fix_users_empty_email.rb
+++ b/db/migrate/076_fix_users_empty_email.rb
@@ -1,5 +1,7 @@
 class FixUsersEmptyEmail < ActiveRecord::Migration
   def self.up
+    User.reset_column_information
+
       users = User.find(:all)
       users.each do |user|
         if user.email.empty?
diff --git a/db/migrate/077_fix_userless_articles.rb b/db/migrate/077_fix_userless_articles.rb
index f0f8864..9865b96 100644
--- a/db/migrate/077_fix_userless_articles.rb
+++ b/db/migrate/077_fix_userless_articles.rb
@@ -1,6 +1,9 @@
 class FixUserlessArticles < ActiveRecord::Migration
   def self.up
     unless $schema_generator
+      User.reset_column_information
+      Article.reset_column_information
+
       articles = Article.find(:all)
       STDERR.puts "Fixing articles with empty user_id"
       
diff --git a/db/migrate/078_add_textfilter_to_users.rb b/db/migrate/078_add_textfilter_to_users.rb
index 132bd76..527efd4 100644
--- a/db/migrate/078_add_textfilter_to_users.rb
+++ b/db/migrate/078_add_textfilter_to_users.rb
@@ -1,8 +1,14 @@
 class AddTextfilterToUsers < ActiveRecord::Migration
   def self.up
+    TextFilter.reset_column_information
+    User.reset_column_information
+    Blog.reset_column_information
+
     f = TextFilter.find(:first, :conditions => ["name = ?", "none"])
     add_column :users, :text_filter_id, :string, :default => f.id
 
+    User.reset_column_information
+
     unless Blog.default.nil?
       t = TextFilter.find(:first, :conditions => "name= '#{Blog.default.text_filter}'")
       User.find(:all).each do |user|
diff --git a/db/migrate/079_move_editor_as_string.rb b/db/migrate/079_move_editor_as_string.rb
index 61d1f08..f62f5e4 100644
--- a/db/migrate/079_move_editor_as_string.rb
+++ b/db/migrate/079_move_editor_as_string.rb
@@ -3,6 +3,8 @@ class MoveEditorAsString < ActiveRecord::Migration
     remove_column :users, :editor
     add_column :users, :editor, :string, :default => 'simple'
     
+    User.reset_column_information
+
     unless $schema_generator
       users = User.find(:all)
       users.each do |user|
diff --git a/db/migrate/080_add_state_to_user.rb b/db/migrate/080_add_state_to_user.rb
index 09fa8f1..5ef037a 100644
--- a/db/migrate/080_add_state_to_user.rb
+++ b/db/migrate/080_add_state_to_user.rb
@@ -2,6 +2,8 @@ class AddStateToUser < ActiveRecord::Migration
   def self.up
     add_column :users, :state, :string, :default => 'active'
     
+    User.reset_column_information
+
     unless $schema_generator
       users = User.find(:all)
       users.each do |user|
-- 
1.5.6.1.1071.g76fb