aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-12-09 18:04:44 +0100
committerJosé Valim <jose.valim@gmail.com>2010-12-09 18:50:49 +0100
commite12810178cebc0c40a90b4aba3976537852b71b4 (patch)
tree30730351354e387729194a2a0b4d9eb25552fc7b
parent6f8958277b4ba96dc6185a476a7a00a6c1d99892 (diff)
downloadrails-e12810178cebc0c40a90b4aba3976537852b71b4.tar.gz
rails-e12810178cebc0c40a90b4aba3976537852b71b4.tar.bz2
rails-e12810178cebc0c40a90b4aba3976537852b71b4.zip
Use Array.wrap instead of using ternary
Signed-off-by: José Valim <jose.valim@gmail.com>
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb2
-rw-r--r--activerecord/lib/active_record/migration.rb4
2 files changed, 3 insertions, 3 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 3eb81b0dfa..d4aefada22 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -443,7 +443,7 @@ module ActiveRecord
end
def assume_migrated_upto_version(version, migrations_paths = ActiveRecord::Migrator.migrations_paths)
- migrations_paths = [migrations_paths] unless migrations_paths.kind_of?(Array)
+ migrations_paths = Array.wrap(migrations_paths)
version = version.to_i
sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 130b43cc15..ea9950de08 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -573,7 +573,7 @@ module ActiveRecord
def migrations_paths
@migrations_paths ||= ['db/migrate']
# just to not break things if someone uses: migration_path = some_string
- @migrations_paths.kind_of?(Array) ? @migrations_paths : [@migrations_paths]
+ Array.wrap(@migrations_paths)
end
def migrations_path
@@ -581,7 +581,7 @@ module ActiveRecord
end
def migrations(paths)
- paths = [paths] unless paths.kind_of?(Array)
+ paths = Array.wrap(paths)
files = Dir[*paths.map { |p| "#{p}/[0-9]*_*.rb" }]