Skip to content

Commit c12b293

Browse files
committed
Fix remove_column arity. Fixes #359
1 parent 417106d commit c12b293

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#### Fixed
66

77
* Bundling and test running. Noted current failures.
8+
* Fix `remove_column` arity. Fixes #359
89

910

1011
## v4.1.1

RUNNING_UNIT_TESTS.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,14 @@ By default, Bundler will download the Rails git repo and use the git tag that ma
9595

9696
## Current Expected Failures
9797

98-
* CascadedEagerLoadingTest#test_eager_association_loading_where_first_level_returns_nil
98+
* MergingDifferentRelationsTest#test_0004_relation merging (using a proc argument):
9999
* NonTransactionalHMTAssociationsTest#test_eager_load_polymorphic_nested_associations:
100-
* OptimisticLockingTest#test_removing_has_and_belongs_to_many_associations_upon_destroy:
101-
* ActiveRecord::ConnectionAdapters::MergeAndResolveDefaultUrlConfigTest#test_blank_with_database_url_with_rack_env
102-
* ActiveRecord::ConnectionAdapters::MergeAndResolveDefaultUrlConfigTest#test_blank_with_database_url_with_rails_env
100+
* ActiveRecord::ConnectionAdapters::MergeAndResolveDefaultUrlConfigTest#test_blank_with_database_url_with_rack_env:
101+
* ActiveRecord::ConnectionAdapters::MergeAndResolveDefaultUrlConfigTest#test_blank_with_database_url_with_rails_env:
103102
* ActiveRecord::ConnectionAdapters::MergeAndResolveDefaultUrlConfigTest#test_resolver_with_database_uri_and_and_current_env_string_key_and_rack_env:
104103
* ActiveRecord::ConnectionAdapters::MergeAndResolveDefaultUrlConfigTest#test_resolver_with_database_uri_and_and_current_env_string_key_and_rails_env:
105104
* ActiveRecord::ConnectionAdapters::MergeAndResolveDefaultUrlConfigTest#test_resolver_with_database_uri_and_current_env_symbol_key_and_rack_env:
106105
* ActiveRecord::ConnectionAdapters::MergeAndResolveDefaultUrlConfigTest#test_resolver_with_database_uri_and_current_env_symbol_key_and_rails_env:
107106
* EagerAssociationTest#test_0013_including association based on sql condition and no database column:
108-
* CalculationsTest#test_should_group_by_association_with_non_numeric_foreign_key:
109-
* HasManyAssociationsTest#test_0001_building the association with an array
107+
* HasManyAssociationsTest#test_0001_building the association with an array:
110108
* HasManyAssociationsTest#test_0010_does not duplicate associations when used with natural primary keys:
111-
* HasManyAssociationsTest#test_do_not_call_callbacks_for_delete_all

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def rename_table(table_name, new_name)
6363
rename_table_indexes(table_name, new_name)
6464
end
6565

66-
def remove_column(table_name, column_name, _type = nil)
66+
def remove_column(table_name, column_name, type = nil, options = {})
6767
raise ArgumentError.new('You must specify at least one column name. Example: remove_column(:people, :first_name)') if column_name.is_a? Array
6868
remove_check_constraints(table_name, column_name)
6969
remove_default_constraint(table_name, column_name)

0 commit comments

Comments
 (0)