diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-06 08:49:38 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-06 08:49:38 -0700 |
| commit | b4fb80cbdab118125df0d48e74b6818fe5ec65d5 (patch) | |
| tree | b912b5041ee4a6a1ea7fdb3a743a7205b6bbd579 /activerecord/lib/active_record | |
| parent | 96123978ff5cbfe1ce56c2a3203b02007823335b (diff) | |
| parent | ef9bbb87e8228940f768580a7d05d5feadec0d1e (diff) | |
| download | rails-b4fb80cbdab118125df0d48e74b6818fe5ec65d5.tar.gz rails-b4fb80cbdab118125df0d48e74b6818fe5ec65d5.tar.bz2 rails-b4fb80cbdab118125df0d48e74b6818fe5ec65d5.zip | |
Merge pull request #6645 from amatsuda/reduce_string_instance
Reduce number of String instance
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/schema_dumper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index 5758ac4569..f5794a4e54 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -548,7 +548,7 @@ module ActiveRecord if options.is_a?(Hash) && order = options[:order] case order when Hash - column_names.each {|name| option_strings[name] += " #{order[name].to_s.upcase}" if order.has_key?(name)} + column_names.each {|name| option_strings[name] += " #{order[name].upcase}" if order.has_key?(name)} when String column_names.each {|name| option_strings[name] += " #{order.upcase}"} end diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index 7cbe2db408..1cdaa516ba 100644 --- a/activerecord/lib/active_record/schema_dumper.rb +++ b/activerecord/lib/active_record/schema_dumper.rb @@ -175,7 +175,7 @@ HEADER when BigDecimal value.to_s when Date, DateTime, Time - "'" + value.to_s(:db) + "'" + "'#{value.to_s(:db)}'" else value.inspect end |