Merge branch 'master' into create_table_definition

Conflicts: lib/foreigner/connection_adapters/abstract/schema_definitions.rb
matthuhiggins · Jan 14, 2013 · 0ffd92f · 0ffd92f
2 parents f5c7d09 + 960d1f6
commit 0ffd92f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/foreigner/connection_adapters/abstract/table.rb b/lib/foreigner/connection_adapters/abstract/table.rb
@@ -36,7 +36,7 @@ def foreign_key(to_table, options = {})
       #   end
       # ====== Remove the foreign key named party_foreign_key in the accounts table.
       #   change_table :accounts do |t|
-      #     t.remove_index name: :party_foreign_key
+      #     t.remove_foreign_key name: :party_foreign_key
       #   end
       def remove_foreign_key(options)
         @base.remove_foreign_key(@table_name, options)