1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Make change_table use object of current database adapter

- Earlier, change_table was creating database-agnostic object.
  - After this change, it will create correct object based on current
    database adapter.
  - This will ensure that create_table and change_table will get same objects.
  - This makes update_table_definition method public and nodoc.
  - Fixes #13577 and #13503
This commit is contained in:
Nishant Modak 2014-01-06 14:34:22 +05:30 committed by Prathamesh Sonpatki
parent 017b0fb08a
commit eb589fed6f
6 changed files with 43 additions and 15 deletions

View file

@ -1,3 +1,11 @@
* `change_table` now uses the current adapter's `update_table_definition`
method to retrieve a specific table definition.
This ensures that `change_table` and `create_table` will use
similar objects.
Fixes #13577 and #13503.
*Nishant Modak*, *Prathamesh Sonpatki*, *Rafael Mendonça França*
* Fixed ActiveRecord::Store nil conversion TypeError when using YAML coder.
In case the YAML passed as paramter is nil, uses an empty string.

View file

@ -714,7 +714,7 @@ module ActiveRecord
# require the order columns appear in the SELECT.
#
# columns_for_distinct("posts.id", ["posts.created_at desc"])
def columns_for_distinct(columns, orders) # :nodoc:
def columns_for_distinct(columns, orders) #:nodoc:
columns
end
@ -736,6 +736,10 @@ module ActiveRecord
remove_column table_name, :created_at
end
def update_table_definition(table_name, base) #:nodoc:
Table.new(table_name, base)
end
protected
def add_index_sort_order(option_strings, column_names, options = {})
if options.is_a?(Hash) && order = options[:order]
@ -848,10 +852,6 @@ module ActiveRecord
def create_alter_table(name)
AlterTable.new create_table_definition(name, false, {})
end
def update_table_definition(table_name, base)
Table.new(table_name, base)
end
end
end
end

View file

@ -721,6 +721,10 @@ module ActiveRecord
!native_database_types[type].nil?
end
def update_table_definition(table_name, base) #:nodoc:
Table.new(table_name, base)
end
protected
# Returns the version of the connected PostgreSQL server.
@ -800,7 +804,7 @@ module ActiveRecord
end
end
FEATURE_NOT_SUPPORTED = "0A000" # :nodoc:
FEATURE_NOT_SUPPORTED = "0A000" #:nodoc:
def exec_no_cache(sql, name, binds)
log(sql, name, binds) { @connection.async_exec(sql) }
@ -990,10 +994,6 @@ module ActiveRecord
def create_table_definition(name, temporary, options, as = nil)
TableDefinition.new native_database_types, name, temporary, options, as
end
def update_table_definition(table_name, base)
Table.new(table_name, base)
end
end
end
end

View file

@ -86,7 +86,7 @@ module ActiveRecord
alias :remove_belongs_to :remove_reference
def change_table(table_name, options = {})
yield ConnectionAdapters::Table.new(table_name, self)
yield delegate.update_table_definition(table_name, self)
end
private
@ -159,9 +159,11 @@ module ActiveRecord
# Forwards any missing method call to the \target.
def method_missing(method, *args, &block)
@delegate.send(method, *args, &block)
rescue NoMethodError => e
raise e, e.message.sub(/ for #<.*$/, " via proxy for #{@delegate}")
if @delegate.respond_to?(method)
@delegate.send(method, *args, &block)
else
super
end
end
end
end

View file

@ -70,6 +70,23 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
Hstore.reset_column_information
end
def test_hstore_migration
hstore_migration = Class.new(ActiveRecord::Migration) do
def change
change_table("hstores") do |t|
t.hstore :keys
end
end
end
hstore_migration.new.suppress_messages do
hstore_migration.migrate(:up)
assert_includes @connection.columns(:hstores).map(&:name), "keys"
hstore_migration.migrate(:down)
assert_not_includes @connection.columns(:hstores).map(&:name), "keys"
end
end
def test_cast_value_on_write
x = Hstore.new tags: {"bool" => true, "number" => 5}
assert_equal({"bool" => "true", "number" => "5"}, x.tags)

View file

@ -4,7 +4,8 @@ module ActiveRecord
class Migration
class CommandRecorderTest < ActiveRecord::TestCase
def setup
@recorder = CommandRecorder.new
connection = ActiveRecord::Base.connection
@recorder = CommandRecorder.new(connection)
end
def test_respond_to_delegates