aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-04-29 22:18:08 -0500
committerYves Senn <yves.senn@gmail.com>2014-05-04 14:14:26 +0200
commit242bcac17b2b8397bd1ff77a2bddc37fc6628939 (patch)
tree2a0b37122cde4fbea13dc48899274fef1b1315bd /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
parent51c0b8a2ce18a3ffd8fb5402c76f5837d0976bb2 (diff)
downloadrails-242bcac17b2b8397bd1ff77a2bddc37fc6628939.tar.gz
rails-242bcac17b2b8397bd1ff77a2bddc37fc6628939.tar.bz2
rails-242bcac17b2b8397bd1ff77a2bddc37fc6628939.zip
refactor, move `column_for` to `AbstractAdapter` for better reuse.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index ebce0c0460..9da86d27f5 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -713,7 +713,7 @@ module ActiveRecord
def rename_column_sql(table_name, column_name, new_column_name)
options = { name: new_column_name }
- if column = columns(table_name).find { |c| c.name == column_name.to_s }
+ if column = column_for(table_name, column_name)
options[:default] = column.default
options[:null] = column.null
options[:auto_increment] = (column.extra == "auto_increment")
@@ -757,13 +757,6 @@ module ActiveRecord
version[0] >= 5
end
- def column_for(table_name, column_name)
- unless column = columns(table_name).find { |c| c.name == column_name.to_s }
- raise "No such column: #{table_name}.#{column_name}"
- end
- column
- end
-
def configure_connection
variables = @config.fetch(:variables, {}).stringify_keys