aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2009-08-06 08:34:23 +0900
committerJeremy Kemper <jeremy@bitsweat.net>2009-08-05 17:08:02 -0700
commit230d43fbf5dee569ea031c8c394ba9ce70804cae (patch)
treefdd9e3b5b287002fd2facd590724f19c204deaac /activerecord/lib/active_record
parentb7052b8dc33d5769e94dfcec62d439c2dd18a8b9 (diff)
downloadrails-230d43fbf5dee569ea031c8c394ba9ce70804cae.tar.gz
rails-230d43fbf5dee569ea031c8c394ba9ce70804cae.tar.bz2
rails-230d43fbf5dee569ea031c8c394ba9ce70804cae.zip
Ruby 1.9.2 compat: Array#* uses to_str instead of to_s to join values since Ruby 1.9.2
[#2959 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 24c734cddb..f346e3ebc8 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -277,7 +277,6 @@ module ActiveRecord
add_column_options!(column_sql, column_options) unless type.to_sym == :primary_key
column_sql
end
- alias to_s :to_sql
private
@@ -508,7 +507,7 @@ module ActiveRecord
# concatenated together. This string can then be prepended and appended to
# to generate the final SQL to create the table.
def to_sql
- @columns * ', '
+ @columns.map(&:to_sql) * ', '
end
private