diff options
author | Jamis Buck <jamis@37signals.com> | 2005-10-25 19:28:53 +0000 |
---|---|---|
committer | Jamis Buck <jamis@37signals.com> | 2005-10-25 19:28:53 +0000 |
commit | 06303ed34eea1f9c3dfa8c7d0ada186b0faf648f (patch) | |
tree | dbc5e6a4916e018d118e9607b0b6b71a63d10e4c /activerecord/lib/active_record | |
parent | 17d3fd316551660ad19251b969540dc304a9a48c (diff) | |
download | rails-06303ed34eea1f9c3dfa8c7d0ada186b0faf648f.tar.gz rails-06303ed34eea1f9c3dfa8c7d0ada186b0faf648f.tar.bz2 rails-06303ed34eea1f9c3dfa8c7d0ada186b0faf648f.zip |
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
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 10 |
1 files changed, 6 insertions, 4 deletions
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 |