diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-03 19:33:12 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-03 19:33:12 -0300 |
commit | 02966105a57f18d57003fbd9dcb00d981432b1ba (patch) | |
tree | ce455e8c12a060a7d6f816af0e865b05c3605ec5 /activerecord/lib/active_record | |
parent | f17792245ff817afd224c7cc7a1d855511fcf641 (diff) | |
parent | 99801c6a7b69eb4b006a55de17ada78f3a0fa4c1 (diff) | |
download | rails-02966105a57f18d57003fbd9dcb00d981432b1ba.tar.gz rails-02966105a57f18d57003fbd9dcb00d981432b1ba.tar.bz2 rails-02966105a57f18d57003fbd9dcb00d981432b1ba.zip |
Merge pull request #19994 from kamipo/dump_indexes_in_create_table
Dump indexes in `create_table` instead of `add_index`
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/schema_dumper.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index 321611d6c9..a4a986e6ed 100644 --- a/activerecord/lib/active_record/schema_dumper.rb +++ b/activerecord/lib/active_record/schema_dumper.rb @@ -172,11 +172,11 @@ HEADER tbl.puts end + indexes(table, tbl) + tbl.puts " end" tbl.puts - indexes(table, tbl) - tbl.rewind stream.print tbl.read rescue => e @@ -192,8 +192,7 @@ HEADER if (indexes = @connection.indexes(table)).any? add_index_statements = indexes.map do |index| statement_parts = [ - "add_index #{remove_prefix_and_suffix(index.table).inspect}", - index.columns.inspect, + "t.index #{index.columns.inspect}", "name: #{index.name.inspect}", ] statement_parts << 'unique: true' if index.unique @@ -207,11 +206,10 @@ HEADER statement_parts << "using: #{index.using.inspect}" if index.using statement_parts << "type: #{index.type.inspect}" if index.type - " #{statement_parts.join(', ')}" + " #{statement_parts.join(', ')}" end stream.puts add_index_statements.sort.join("\n") - stream.puts end end |