diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | activerecord/CHANGELOG.md | 23 | ||||
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 6 | ||||
| -rw-r--r-- | guides/source/routing.md | 2 |
4 files changed, 20 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 303c838693..dd1d911b63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ script: 'ci/travis.rb' before_install: - travis_retry gem install bundler - "rvm current | grep 'jruby' && export AR_JDBC=true || echo" -install: "bundle install --without test" rvm: - 1.9.3 - 2.0.0 diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 6b17d6b265..46daf4978d 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,4 +1,19 @@ -* Deprecated use of string argument as a configuration lookup in `ActiveRecord::Base.establish_connection`. Instead, a symbol must be given. +* An `ArgumentError` is now raised on a call to `Relation#where.not(nil)`. + + Example: + + User.where.not(nil) + + # Before + # => 'SELECT `users`.* FROM `users` WHERE (NOT (NULL))' + + # After + # => ArgumentError, 'Invalid argument for .where.not(), got nil.' + + *Kuldeep Aggarwal* + +* Deprecated use of string argument as a configuration lookup in + `ActiveRecord::Base.establish_connection`. Instead, a symbol must be given. *José Valim* @@ -34,10 +49,10 @@ *Richard Schneeman* -* Do not raise `'can not touch on a new record object'` exception on destroying already destroyed - `belongs_to` association with `touch: true` option +* Do not raise `'can not touch on a new record object'` exception on destroying + already destroyed `belongs_to` association with `touch: true` option. - Fixes: #13445 + Fixes #13445. Example: diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 90dfc177e5..4b769aa11c 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -179,9 +179,6 @@ db_namespace = namespace :db do require 'active_record/fixtures' base_dir = if ENV['FIXTURES_PATH'] - STDERR.puts "Using FIXTURES_PATH env variable is deprecated, please use " + - "ActiveRecord::Tasks::DatabaseTasks.fixtures_path = '/path/to/fixtures' " + - "instead." File.join [Rails.root, ENV['FIXTURES_PATH'] || %w{test fixtures}].flatten else ActiveRecord::Tasks::DatabaseTasks.fixtures_path @@ -204,9 +201,6 @@ db_namespace = namespace :db do puts %Q(The fixture ID for "#{label}" is #{ActiveRecord::FixtureSet.identify(label)}.) if label base_dir = if ENV['FIXTURES_PATH'] - STDERR.puts "Using FIXTURES_PATH env variable is deprecated, please use " + - "ActiveRecord::Tasks::DatabaseTasks.fixtures_path = '/path/to/fixtures' " + - "instead." File.join [Rails.root, ENV['FIXTURES_PATH'] || %w{test fixtures}].flatten else ActiveRecord::Tasks::DatabaseTasks.fixtures_path diff --git a/guides/source/routing.md b/guides/source/routing.md index 019861c3d6..3375293b5a 100644 --- a/guides/source/routing.md +++ b/guides/source/routing.md @@ -138,7 +138,7 @@ Sometimes, you have a resource that clients always look up without referencing a get 'profile', to: 'users#show' ``` -Passing a `String` to `match` will expect a `controller#action` format, while passing a `Symbol` will map directly to an action: +Passing a `String` to `get` will expect a `controller#action` format, while passing a `Symbol` will map directly to an action: ```ruby get 'profile', to: :show |