diff options
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/examples/performance.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/schema_cache.rb | 1 | ||||
-rw-r--r-- | activerecord/lib/active_record/migration.rb | 5 |
3 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/examples/performance.rb b/activerecord/examples/performance.rb index 91697b3c9c..35f13d2438 100644 --- a/activerecord/examples/performance.rb +++ b/activerecord/examples/performance.rb @@ -167,6 +167,6 @@ Benchmark.ips(TIME) do |x| end x.report "AR.execute(query)" do - ActiveRecord::Base.connection.execute("Select * from exhibits where id = #{(rand * 1000 + 1).to_i}") + ActiveRecord::Base.connection.execute("SELECT * FROM exhibits WHERE id = #{(rand * 1000 + 1).to_i}") end end diff --git a/activerecord/lib/active_record/connection_adapters/schema_cache.rb b/activerecord/lib/active_record/connection_adapters/schema_cache.rb index 88d82eabaa..e5c9f6f54a 100644 --- a/activerecord/lib/active_record/connection_adapters/schema_cache.rb +++ b/activerecord/lib/active_record/connection_adapters/schema_cache.rb @@ -1,4 +1,3 @@ -require 'active_support/deprecation/reporting' module ActiveRecord module ConnectionAdapters diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 248ce5753b..33ee129fc6 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -866,10 +866,7 @@ module ActiveRecord @direction = direction @target_version = target_version @migrated_versions = nil - - if Array(migrations).grep(String).empty? - @migrations = migrations - end + @migrations = migrations validate(@migrations) |