aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2016-08-10 15:01:40 +0200
committerGitHub <noreply@github.com>2016-08-10 15:01:40 +0200
commitdfb246118afbc6b59f6517eaed00208aa6c7e4b5 (patch)
treedee5676c4b55a7dec602f6b9cad20c11261c2afb
parent13cbe12aebc09053b06b93e6fe53062f424674a0 (diff)
parent01fbdb311d0661b4db89024a9b1c9fafcaceaafd (diff)
downloadrails-dfb246118afbc6b59f6517eaed00208aa6c7e4b5.tar.gz
rails-dfb246118afbc6b59f6517eaed00208aa6c7e4b5.tar.bz2
rails-dfb246118afbc6b59f6517eaed00208aa6c7e4b5.zip
Merge pull request #26102 from gsamokovarov/schema-statements-typo
Fix a NoMethodError schema_statements.rb
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb2
-rw-r--r--activerecord/test/cases/adapters/postgresql/active_schema_test.rb6
2 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index d2ebc36fff..d0aefcef68 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -1208,7 +1208,7 @@ module ActiveRecord
checks << lambda { |i| i.columns.join("_and_") == column_names.join("_and_") }
end
- raise ArgumentError "No name or columns specified" if checks.none?
+ raise ArgumentError, "No name or columns specified" if checks.none?
matching_indexes = indexes(table_name).select { |i| checks.all? { |check| check[i] } }
diff --git a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
index a4a06a2da4..d3c65f3d94 100644
--- a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
@@ -81,6 +81,12 @@ class PostgresqlActiveSchemaTest < ActiveRecord::PostgreSQLTestCase
assert_equal expected, remove_index(:people, name: "index_people_on_last_name", algorithm: :concurrently)
end
+ def test_remove_index_with_wrong_option
+ assert_raises ArgumentError do
+ remove_index(:people, coulmn: :last_name)
+ end
+ end
+
private
def method_missing(method_symbol, *arguments)
ActiveRecord::Base.connection.send(method_symbol, *arguments)