• A
    Merge branch 'master' into set_binds · 11e8badb
    Aaron Patterson 提交于
    * master: (2794 commits)
      doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]
      Restore DATABASE_URL even if it's nil in connection_handler test
      [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users
      Ensure Active Record connection consistency
      Revert "ask the fixture set for the sql statements"
      Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
      Adding Hash#compact and Hash#compact! methods
      MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users.
      clear cache on body close so that cache remains during rendering
      add a more restricted codepath for templates fixes #13390
      refactor generator tests to use block form of Tempfile
      Fix typo [ci skip]
      Move finish_template as the last public method in the generator
      Minor typos fix [ci skip]
      make `change_column_null` reversible. Closes #13576.
      create/drop test and development databases only if RAILS_ENV is nil
      Revert "Speedup String#to"
      typo fix in test name. [ci skip].
      `core_ext/string/access.rb` test what we are documenting.
      Fix typo in image_tag documentation
      ...
    
    Conflicts:
    	activerecord/lib/active_record/associations/join_dependency/join_association.rb
    	activerecord/lib/active_record/relation/query_methods.rb
    11e8badb
query_methods.rb 35.6 KB