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:24:48 -0700 |
| commit | 41dfc46717754c48c6957b6495c35b812109a8b7 (patch) | |
| tree | 08ac491fdfdb4615e9406c291240f952e561dadb /activerecord/lib/active_record | |
| parent | b36f2408002f32c85bc31c459da43be4f4774ac4 (diff) | |
| parent | a58fcd94a077b22204f08385e906bebc31dcb948 (diff) | |
| download | rails-41dfc46717754c48c6957b6495c35b812109a8b7.tar.gz rails-41dfc46717754c48c6957b6495c35b812109a8b7.tar.bz2 rails-41dfc46717754c48c6957b6495c35b812109a8b7.zip | |
Merge pull request #2621 from icco/master
Issue with schema dump
Diffstat (limited to 'activerecord/lib/active_record')
| -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 dcbd165e58..95fd33c1d1 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 |