Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix change_column to work with postgres 7.x and 8.x.

Closes #3141


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3327 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 88bb279df7d2f4c1b4c48be98fbbbae859b20847 1 parent 581f12b
Scott Barron authored
View
8 activerecord/CHANGELOG
@@ -1,12 +1,6 @@
*SVN*
-* removed :piggyback in favor of just allowing :select on :through associations. [Tobias Luetke]
-
-* made method missing delegation to class methods on relation target work on :through associations. [Tobias Luetke]
-
-* made .find() work on :through relations. [Tobias Luetke]
-
-* added :piggyback option to has_many :through relationships to pick up values from the join table as needed [Tobias Luetke]
+* Fix change_column to work with PostgreSQL 7.x and 8.x. #3141 [wejn@box.cz, Rick Olson, Scott Barron]
* Fix typo in association docs. #3296. [Blair Zajac]
View
12 activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -302,7 +302,17 @@ def add_column(table_name, column_name, type, options = {})
end
def change_column(table_name, column_name, type, options = {}) #:nodoc:
- execute = "ALTER TABLE #{table_name} ALTER #{column_name} TYPE #{type}"
+ begin
+ execute "ALTER TABLE #{table_name} ALTER #{column_name} TYPE #{type_to_sql(type, options[:limit])}"
+ rescue ActiveRecord::StatementInvalid
+ # This is PG7, so we use a more arcane way of doing it.
+ begin_db_transaction
+ add_column(table_name, "#{column_name}_ar_tmp", type, options)
+ execute "UPDATE #{table_name} SET #{column_name}_ar_tmp = CAST(#{column_name} AS #{type_to_sql(type, options[:limit])})"
+ remove_column(table_name, column_name)
+ rename_column(table_name, "#{column_name}_ar_tmp", column_name)
+ commit_db_transaction
+ end
change_column_default(table_name, column_name, options[:default]) unless options[:default].nil?
end
View
13 activerecord/test/migration_test.rb
@@ -31,7 +31,7 @@ def teardown
Person.connection.remove_column("people", "administrator") rescue nil
Person.reset_column_information
end
-
+
def test_add_index
Person.connection.add_column "people", "last_name", :string
Person.connection.add_column "people", "administrator", :boolean
@@ -258,8 +258,15 @@ def test_rename_table
end
def test_change_column
- Person.connection.add_column "people", "bio", :string
- assert_nothing_raised { Person.connection.change_column "people", "bio", :text }
+ Person.connection.add_column 'people', 'age', :integer
+ old_columns = Person.connection.columns(Person.table_name, "#{name} Columns")
+ assert old_columns.find { |c| c.name == 'age' and c.type == :integer }
+
+ assert_nothing_raised { Person.connection.change_column "people", "age", :string }
+
+ new_columns = Person.connection.columns(Person.table_name, "#{name} Columns")
+ assert_nil new_columns.find { |c| c.name == 'age' and c.type == :integer }
+ assert new_columns.find { |c| c.name == 'age' and c.type == :string }
end
def test_change_column_with_new_default

0 comments on commit 88bb279

Please sign in to comment.
Something went wrong with that request. Please try again.