Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Ensure indices don't flip order in schema.rb [#1266 state:committed]

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
  • Loading branch information...
commit a9e816843289d8839d4206c5ad09e49452d076ac 1 parent 7418d36
@notlaforge notlaforge authored dhh committed
View
2  activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*2.2.1 [RC2 or 2.2 final]*
+* Ensure indices don't flip order in schema.rb #1266 [Jordi Bunster]
+
* Fixed that serialized strings should never be type-casted (i.e. turning "Yes" to a boolean) #857 [Andreas Korth]
View
18 activerecord/lib/active_record/schema_dumper.rb
@@ -159,13 +159,19 @@ def default_string(value)
end
def indexes(table, stream)
- indexes = @connection.indexes(table)
- indexes.each do |index|
- stream.print " add_index #{index.table.inspect}, #{index.columns.inspect}, :name => #{index.name.inspect}"
- stream.print ", :unique => true" if index.unique
+ if (indexes = @connection.indexes(table)).any?
+ add_index_statements = indexes.map do |index|
+ statment_parts = [ ('add_index ' + index.table.inspect) ]
+ statment_parts << index.columns.inspect
+ statment_parts << (':name => ' + index.name.inspect)
+ statment_parts << ':unique => true' if index.unique
+
+ ' ' + statment_parts.join(', ')
+ end
+
+ stream.puts add_index_statements.sort.join("\n")
stream.puts
end
- stream.puts unless indexes.empty?
end
end
-end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.