aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-05-20 23:26:04 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-05-20 23:26:04 -0300
commitd0c257f5daadc2b3451f0b8c775f38c48c56eaad (patch)
tree2eb5e541b8425934ea03c5d6963e9d2f19d6c363 /activerecord
parentce5538be68d186d414c3e21fef72b8815fc58bd6 (diff)
parent2a71885a3f88562c57f81230d31518e5189c0dda (diff)
downloadrails-d0c257f5daadc2b3451f0b8c775f38c48c56eaad.tar.gz
rails-d0c257f5daadc2b3451f0b8c775f38c48c56eaad.tar.bz2
rails-d0c257f5daadc2b3451f0b8c775f38c48c56eaad.zip
Merge pull request #24984 from kamipo/remove_magic_comment_in_schema.rb
Remove magic comment in generated `schema.rb`
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/schema_dumper.rb4
-rw-r--r--activerecord/test/cases/schema_dumper_test.rb4
2 files changed, 0 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index 301718b874..d769376d1a 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -50,10 +50,6 @@ module ActiveRecord
def header(stream)
define_params = @version ? "version: #{@version}" : ""
- if stream.respond_to?(:external_encoding) && stream.external_encoding
- stream.puts "# encoding: #{stream.external_encoding.name}"
- end
-
stream.puts <<HEADER
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index f1927f561e..9dc1f5e2c2 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -47,10 +47,6 @@ class SchemaDumperTest < ActiveRecord::TestCase
end
end
- def test_magic_comment
- assert_match "# encoding: #{Encoding.default_external.name}", standard_dump
- end
-
def test_schema_dump
output = standard_dump
assert_match %r{create_table "accounts"}, output