Merge remote-tracking branch 'origin/master'

betelgeuse · Jan 6, 2012 · b1ec297 · b1ec297
2 parents 6bdbb36 + f59d295
commit b1ec297
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/schema_plus/active_record/connection_adapters/abstract_adapter.rb b/lib/schema_plus/active_record/connection_adapters/abstract_adapter.rb
@@ -99,7 +99,8 @@ def drop_table_with_schema_plus(name, options = {}) #:nodoc:
           unless ::ActiveRecord::Base.connection.class.include?(SchemaPlus::ActiveRecord::ConnectionAdapters::Sqlite3Adapter)
             reverse_foreign_keys(name).each { |foreign_key| remove_foreign_key(foreign_key.table_name, foreign_key.name) }
           end
-          drop_table_without_schema_plus(name, options)
+          # drop options because #drop_table doesn't use it actually
+          drop_table_without_schema_plus(name)
         end
 
         # Returns true if the database supports parital indexes (abstract; only