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