diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-06 18:57:47 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-06 18:57:47 -0300 |
| commit | 4e86602e114223adee4d6733695434db5c1bd824 (patch) | |
| tree | b3fb607c1ba514c68e6f78090351807736d947e5 /activerecord/lib | |
| parent | ae175a5354321fd64393b9e1f4080437ee3cdf74 (diff) | |
| parent | 7f717abb0ed280ba1a1f8abfeeff84bf24cad3e7 (diff) | |
| download | rails-4e86602e114223adee4d6733695434db5c1bd824.tar.gz rails-4e86602e114223adee4d6733695434db5c1bd824.tar.bz2 rails-4e86602e114223adee4d6733695434db5c1bd824.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 3 |
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 |