diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-26 17:24:48 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-26 17:26:10 -0700 |
| commit | 3eb5be67b14e347951eea2dd13cd6f4a8aaaa38c (patch) | |
| tree | dddc8eab590d4fc2928dcf048373a81504111328 /activerecord | |
| parent | 0e916ae232e7c9ffed614a55bbb0218557d944ea (diff) | |
| download | rails-3eb5be67b14e347951eea2dd13cd6f4a8aaaa38c.tar.gz rails-3eb5be67b14e347951eea2dd13cd6f4a8aaaa38c.tar.bz2 rails-3eb5be67b14e347951eea2dd13cd6f4a8aaaa38c.zip | |
Merge pull request #2621 from icco/master
Issue with schema dump
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/schema_dumper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index cdde5cf3b9..6dc07a6d04 100644 --- a/activerecord/lib/active_record/schema_dumper.rb +++ b/activerecord/lib/active_record/schema_dumper.rb @@ -40,7 +40,7 @@ module ActiveRecord def header(stream) define_params = @version ? ":version => #{@version}" : "" - if stream.respond_to?(:external_encoding) + if stream.respond_to?(:external_encoding) && stream.external_encoding stream.puts "# encoding: #{stream.external_encoding.name}" end |