diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-05 13:29:28 -0700 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-05 13:33:48 -0700 |
commit | d666a5a5cfd4692cb8ff3914d7ff0e3885c7eb5c (patch) | |
tree | e00cfdbf74c09dffb63d83749d58863553cee064 /activerecord/lib/active_record/schema_dumper.rb | |
parent | 7ea174e6d5c70f82b707368dcb2eed8a19b5af3e (diff) | |
download | rails-d666a5a5cfd4692cb8ff3914d7ff0e3885c7eb5c.tar.gz rails-d666a5a5cfd4692cb8ff3914d7ff0e3885c7eb5c.tar.bz2 rails-d666a5a5cfd4692cb8ff3914d7ff0e3885c7eb5c.zip |
Revert "Dump indexes in `create_table` instead of `add_index`"
This reverts commit 99801c6a7b69eb4b006a55de17ada78f3a0fa4c1.
Ultimately it doesn't matter whether `add_index` or `t.index` are used
in the schema dumper in any meaningful way. There are gems out there
which hook into the old behavior for things like indexing materialized
views. Since the reverted commit doesn't seem to add much benefit,
there's no reason for us to break these gems.
Diffstat (limited to 'activerecord/lib/active_record/schema_dumper.rb')
-rw-r--r-- | activerecord/lib/active_record/schema_dumper.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index 65005bd44b..f115c7542b 100644 --- a/activerecord/lib/active_record/schema_dumper.rb +++ b/activerecord/lib/active_record/schema_dumper.rb @@ -178,11 +178,11 @@ HEADER tbl.puts end - indexes(table, tbl) - tbl.puts " end" tbl.puts + indexes(table, tbl) + tbl.rewind stream.print tbl.read rescue => e @@ -198,7 +198,8 @@ HEADER if (indexes = @connection.indexes(table)).any? add_index_statements = indexes.map do |index| statement_parts = [ - "t.index #{index.columns.inspect}", + "add_index #{remove_prefix_and_suffix(index.table).inspect}", + index.columns.inspect, "name: #{index.name.inspect}", ] statement_parts << 'unique: true' if index.unique @@ -212,10 +213,11 @@ 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 |