diff options
| author | Xavier Noria <fxn@hashref.com> | 2014-03-28 10:55:56 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2014-03-28 10:55:56 -0700 |
| commit | 86c53d510cf31b792a7e96a44535e64b3983d17a (patch) | |
| tree | f8f8d19f5f40bf4b368523ba5525b1bd75182f90 /activerecord/lib | |
| parent | 74d7df175c83e73347114c004ff861aec0572928 (diff) | |
| parent | e43cd0a4c9c1d33c7d1007a51ad885a579c0bfbc (diff) | |
| download | rails-86c53d510cf31b792a7e96a44535e64b3983d17a.tar.gz rails-86c53d510cf31b792a7e96a44535e64b3983d17a.tar.bz2 rails-86c53d510cf31b792a7e96a44535e64b3983d17a.zip | |
Merge pull request #14521 from kreynolds/replace-regexp-with-include-or-string
Replace trivial regexp with string or include, twice as fast
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb index e0516c0773..da25e640c1 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -318,7 +318,7 @@ module ActiveRecord def sanitize_limit(limit) if limit.is_a?(Integer) || limit.is_a?(Arel::Nodes::SqlLiteral) limit - elsif limit.to_s =~ /,/ + elsif limit.to_s.include?(',') Arel.sql limit.to_s.split(',').map{ |i| Integer(i) }.join(',') else Integer(limit) diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index ff1f0f5911..6b0459ea37 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -186,7 +186,7 @@ db_namespace = namespace :db do fixtures_dir = File.join [base_dir, ENV['FIXTURES_DIR']].compact - (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir["#{fixtures_dir}/**/*.yml"].map {|f| f[(fixtures_dir.size + 1)..-5] }).each do |fixture_file| + (ENV['FIXTURES'] ? ENV['FIXTURES'].split(',') : Dir["#{fixtures_dir}/**/*.yml"].map {|f| f[(fixtures_dir.size + 1)..-5] }).each do |fixture_file| ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, fixture_file) end end |