github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Made default changes work in both postgresql and mysql #1612 [Tobias Luetke]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1703 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-07-05 09:16:23 +00:00
parent 6eee49aa2e
commit 0bef168238
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
View File

@@ -398,6 +398,10 @@ module ActiveRecord
raise NotImplementedError, "change_column is not implemented"
end
def change_column_default(table_name, column_name, default)
raise NotImplementedError, "change_column_default is not implemented"
end
def supports_migrations?
false
end
@@ -482,7 +486,7 @@ module ActiveRecord
end
def add_column_options!(sql, options)
sql << " DEFAULT '#{options[:default]}'" if options[:default]
sql << " DEFAULT '#{options[:default]}'" unless options[:default].nil?
end
end

10
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
View File

@@ -198,9 +198,17 @@ module ActiveRecord
def create_database(name)
execute "CREATE DATABASE #{name}"
end
def change_column_default(table_name, column_name, default)
current_type = select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Type"]
change_column(table_name, column_name, current_type, { :default => default })
end
def change_column(table_name, column_name, type, options = {})
change_column_sql = "ALTER TABLE #{table_name} MODIFY #{column_name} #{type}"
options[:default] ||= select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Default"]
change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{type_to_sql(type, options[:limit])}"
add_column_options!(change_column_sql, options)
execute(change_column_sql)
end

11
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
View File

@@ -151,10 +151,13 @@ module ActiveRecord
end
def change_column(table_name, column_name, type, options = {})
change_column_sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} TYPE #{type}"
add_column_options!(change_column_sql, options)
execute(change_column_sql)
execute = "ALTER TABLE #{table_name} ALTER #{column_name} TYPE #{type}"
change_column_default(table_name, column_name, options[:default]) unless options[:default].nil?
end
def change_column_default(table_name, column_name, default)
execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET DEFAULT '#{default}'"
end
def rename_column(table_name, column_name, new_column_name)
execute "ALTER TABLE #{table_name} RENAME COLUMN #{column_name} TO #{new_column_name}"
@@ -163,7 +166,7 @@ module ActiveRecord
def remove_index(table_name, column_name)
execute "DROP INDEX #{table_name}_#{column_name}_index"
end
private
BYTEA_COLUMN_TYPE_OID = 17

2
activerecord/test/migration_test.rb
View File

@@ -108,9 +108,11 @@ if ActiveRecord::Base.connection.supports_migrations?
def test_change_column_with_new_default
Person.connection.add_column "people", "administrator", :boolean, :default => 1
Person.reset_column_information
assert Person.new.administrator?
assert_nothing_raised { Person.connection.change_column "people", "administrator", :boolean, :default => 0 }
Person.reset_column_information
assert !Person.new.administrator?
end