From 0c893443e0720bb1316599d990c0e1013eaac8ab Mon Sep 17 00:00:00 2001 From: Nat Welch Date: Sun, 21 Aug 2011 15:54:59 -0700 Subject: Fixes bug with schema dumper when using with Padrino. --- activerecord/lib/active_record/schema_dumper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index 6fe305f843..6eadba6238 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.external_encoding.nil? stream.puts "# encoding: #{stream.external_encoding.name}" end -- cgit v1.2.3 From f69036781c0ee7a22a456fe3a6689277d44ed9a6 Mon Sep 17 00:00:00 2001 From: Nat Welch Date: Mon, 22 Aug 2011 00:35:53 -0700 Subject: From @dasch's recommendation. --- activerecord/lib/active_record/schema_dumper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index 6eadba6238..a3e9c5ebba 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.external_encoding.nil? + if stream.respond_to?(:external_encoding) && !stream.external_encoding.nil? stream.puts "# encoding: #{stream.external_encoding.name}" end -- cgit v1.2.3 From a58fcd94a077b22204f08385e906bebc31dcb948 Mon Sep 17 00:00:00 2001 From: Nat Welch Date: Wed, 21 Sep 2011 23:59:22 -0700 Subject: Not checking for nil is apparently a lot faster. --- activerecord/lib/active_record/schema_dumper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index a3e9c5ebba..c30501a836 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) && !stream.external_encoding.nil? + if stream.respond_to?(:external_encoding) && stream.external_encoding stream.puts "# encoding: #{stream.external_encoding.name}" end -- cgit v1.2.3