From 06303ed34eea1f9c3dfa8c7d0ada186b0faf648f Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Tue, 25 Oct 2005 19:28:53 +0000 Subject: Allow symbols to rename columns when using SQLite adapter. #2531 [kevin.clark@gmail.com] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2731 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../lib/active_record/connection_adapters/sqlite_adapter.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index c356f607c9..f0c2cc06d4 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -280,10 +280,12 @@ module ActiveRecord def copy_table(from, to, options = {}) #:nodoc: create_table(to, options) do |@definition| columns(from).each do |column| - column_name = options[:rename][column.name] if - options[:rename][column.name] if options[:rename] - - @definition.column(column_name || column.name, column.type, + column_name = options[:rename] ? + (options[:rename][column.name] || + options[:rename][column.name.to_sym] || + column.name) : column.name + + @definition.column(column_name, column.type, :limit => column.limit, :default => column.default, :null => column.null) end -- cgit v1.2.3