aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* force table creationAaron Patterson2014-01-111-1/+1
|
* Merge branch 'master' into set_bindsAaron Patterson2014-01-111524-18289/+32449
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Merge branch 'master' into laurocaetano-fix_send_fileAaron Patterson2014-01-10494-3334/+9555
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (536 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: actionpack/CHANGELOG.md
| | * Merge branch 'ruby-2.2'Aaron Patterson2014-01-102-1/+6
| | |\ | | | | | | | | | | | | | | | | * ruby-2.2: Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
| | | * Merge branch 'master' into ruby-2.2Aaron Patterson2014-01-092-17/+11
| | | |\ | | | | | | | | | | | | | | | | | | | | * master: Revert "ask the fixture set for the sql statements"
| | | * | Check `respond_to` before delegation due to: ↵Aaron Patterson2014-01-092-1/+6
| | | | | | | | | | | | | | | | | | | | https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
| | * | | doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]Yves Senn2014-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | Refs #13658
| | * | | Merge pull request #13657 from leriksen/masterYves Senn2014-01-091-2/+0
| | |\ \ \ | | | | | | | | | | | | [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets re...
| | | * | | [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce ↵leriksen2014-01-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | any confusion for users
| | * | | | Merge pull request #13659 from prathamesh-sonpatki/fix-buildGuillermo Iguaran2014-01-091-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | | Restore DATABASE_URL even if it's nil in connection_handler test
| | | * | | Restore DATABASE_URL even if it's nil in connection_handler testPrathamesh Sonpatki2014-01-101-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | - We have to restore DATABASE_URL to its previous state irrespective of previous value is nil or not
| | * | | Merge pull request #13582 from schneems/schneems/preserve-connection-behaviorRafael Mendonça França2014-01-0911-33/+409
| | |\ \ \ | | | |_|/ | | |/| | Ensure Active Record connection consistency
| | | * | Ensure Active Record connection consistencyschneems2014-01-0911-33/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Active Record can be configured via the environment variable `DATABASE_URL` or by manually injecting a hash of values which is what Rails does, reading in `database.yml` and setting Active Record appropriately. Active Record expects to be able to use `DATABASE_URL` without the use of Rails, and we cannot rip out this functionality without deprecating. This presents a problem though when both config is set, and a `DATABASE_URL` is present. Currently the `DATABASE_URL` should "win" and none of the values in `database.yml` are used. This is somewhat unexpected to me if I were to set values such as `pool` in the `production:` group of `database.yml` they are ignored. There are many ways that active record initiates a connection today: - Stand Alone (without rails) - `rake db:<tasks>` - ActiveRecord.establish_connection - With Rails - `rake db:<tasks>` - `rails <server> | <console>` - `rails dbconsole` We should make all of these behave exactly the same way. The best way to do this is to put all of this logic in one place so it is guaranteed to be used. Here is my prosed matrix of how this behavior should work: ``` No database.yml No DATABASE_URL => Error ``` ``` database.yml present No DATABASE_URL => Use database.yml configuration ``` ``` No database.yml DATABASE_URL present => use DATABASE_URL configuration ``` ``` database.yml present DATABASE_URL present => Merged into `url` sub key. If both specify `url` sub key, the `database.yml` `url` sub key "wins". If other paramaters `adapter` or `database` are specified in YAML, they are discarded as the `url` sub key "wins". ``` ### Implementation Current implementation uses `ActiveRecord::Base.configurations` to resolve and merge all connection information before returning. This is achieved through a utility class: `ActiveRecord::ConnectionHandling::MergeAndResolveDefaultUrlConfig`. To understand the exact behavior of this class, it is best to review the behavior in activerecord/test/cases/connection_adapters/connection_handler_test.rb though it should match the above proposal.
| | * | | Revert "ask the fixture set for the sql statements"Aaron Patterson2014-01-092-17/+11
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 026d0555685087845b74dd87a0417b5a164b1c13. Conflicts: activerecord/lib/active_record/fixtures.rb Fixes #13383
| | * | Merge pull request #13632 from tinogomes/masterRafael Mendonça França2014-01-095-0/+63
| | |\ \ | | | |/ | | |/| Adding Hash#compact and Hash#compact! methods
| | | * Adding Hash#compact and Hash#compact! methodstinogomes2014-01-095-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding Hash#compact and Hash#compact! methods * Using Ruby 1.9 syntax on documentation * Updating guides for `Hash#compact` and `Hash#compact!` methods * Updating CHANGELOG for ActiveSupport * Removing unecessary protected method and lambda for `Hash#compact` implementations * Performing `Hash#compact` implementation - https://gist.github.com/tinogomes/8332883 * fixing order position * Fixing typo
| | * | Merge pull request #13644 from zzak/doc_mysql_config_templateGuillermo Iguaran2014-01-081-1/+1
| | |\ \ | | | | | | | | | | MySQL version 4.1 was EOL on December 31, 2009 [ci-skip]
| | | * | MySQL version 4.1 was EOL on December 31, 2009Zachary Scott2014-01-081-1/+1
| | |/ / | | | | | | | | | | | | We should at least recommend modern versions of MySQL to users.
| | * | clear cache on body close so that cache remains during renderingAaron Patterson2014-01-082-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #13547 The body may use the local cache during rendering. `call`ing the app doesn't mean that rendering is finished, so we need to wait until `close` is called on the body.
| | * | add a more restricted codepath for templates fixes #13390Aaron Patterson2014-01-082-12/+51
| | | |
| | * | Merge pull request #13637 from craftsmen/app-generator-minor-fixRafael Mendonça França2014-01-081-4/+4
| | |\ \ | | | | | | | | | | Move finish_template as the last public method defined in the generator
| | | * | Move finish_template as the last public method in the generatorMehdi Lahmam2014-01-081-4/+4
| | | |/
| | * | refactor generator tests to use block form of TempfileAaron Patterson2014-01-081-36/+30
| | | |
| | * | Merge pull request #13634 from jwworth/masterCarlos Antonio da Silva2014-01-081-1/+1
| | |\ \ | | | |/ | | |/| Fix typo [ci skip]
| | | * Fix typo [ci skip]Jake Worth2014-01-081-1/+1
| | |/
| | * Minor typos fix [ci skip]Robin Dupret2014-01-081-3/+3
| | |
| | * make `change_column_null` reversible. Closes #13576.Yves Senn2014-01-083-1/+26
| | | | | | | | | | | | Closes #13623.
| | * Merge pull request #13629 from dmathieu/drop_testYves Senn2014-01-085-5/+40
| | |\ | | | | | | | | Be more explicit about the default of db:drop and db:create
| | | * create/drop test and development databases only if RAILS_ENV is nilDamien Mathieu2014-01-085-5/+40
| | |/ | | | | | | | | | Closes #13625
| | * Revert "Speedup String#to"Yves Senn2014-01-082-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ef1fb2c455ca53a0c1e1768f50824926ce28bd3. As described in PR #13627 this commit broke functionality when passing a negative Fixnum to the `String#to` method: ```ruby assert_equal "hell", s.to(-2) ``` Before the revert, this failed with: ``` 1) Failure: StringAccessTest#test_#to_with_negative_Fixnum,_position_is_counted_from_the_end [test/core_ext/string_ext_test.rb:275]: Expected: "hell" Actual: nil ``` This revert is to keep the functionality on `master` working. If there is another way to get the performance benefit and keep the documented functionality we can add that. /cc @amatsuda @carlosantoniodasilva
| | * typo fix in test name. [ci skip].Yves Senn2014-01-081-1/+1
| | |
| | * `core_ext/string/access.rb` test what we are documenting.Yves Senn2014-01-081-50/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I also extracted the tests from a single bulk method into a separate test-case. The new tests cover the API described in the docs. There are two skipped tests, which are broken as of 2ef1fb2c455ca53a0c1e1768f50824926ce28bd3 * #to with negative Fixnum, position is counted from the end * #from and #to can be combined This was brought to my attention by #13627. Closes #13627.
| | * Merge pull request #13355 from dylanahsmith/migration-versionRafael Mendonça França2014-01-074-1/+19
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | activerecord: Initialize Migration with version from MigrationProxy. Conflicts: activerecord/CHANGELOG.md
| | | * activerecord: Initialize Migration with version from MigrationProxy.Dylan Thacker-Smith2014-01-064-1/+18
| | | |
| | * | Merge pull request #13621 from Intrepidd/patch-1Xavier Noria2014-01-071-1/+1
| | |\ \ | | | | | | | | | | Fix typo in image_tag documentation [ci skip]
| | | * | Fix typo in image_tag documentationAdrien2014-01-071-1/+1
| | |/ / | | | | | | | | image_tag only supports :alt and :size as additional keys, not three.
| | * | Merge pull request #13597 from prathamesh-sonpatki/hstore_migrationYves Senn2014-01-076-15/+43
| | |\ \ | | | | | | | | | | Make change_table use object of current database adapter
| | | * | Make change_table use object of current database adapterNishant Modak2014-01-076-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Earlier, change_table was creating database-agnostic object. - After this change, it will create correct object based on current database adapter. - This will ensure that create_table and change_table will get same objects. - This makes update_table_definition method public and nodoc. - Fixes #13577 and #13503
| | * | | Use a better method name to check the requirement of password confirmationCarlos Antonio da Silva2014-01-072-8/+8
| | |/ / | | | | | | | | | | | | | | | | Also improve changelog entries related to secure password to proper highlight.
| | * | Merge pull request #13617 from arthurnn/error_varRafael Mendonça França2014-01-061-2/+2
| | |\ \ | | | | | | | | | | Add 'e' var on rescue DalliError, in order to log it
| | | * | Add 'e' var on rescue DalliError, in order to log itArthur Neves2014-01-061-2/+2
| | |/ /
| | * | Merge pull request #13616 from zirni/remove_warningsRafael Mendonça França2014-01-061-1/+1
| | |\ \ | | | |/ | | |/| Remove warnings in test suite
| | | * Remove warnings in test suiteMatthias Zirnstein2014-01-061-1/+1
| | |/ | | | | | | | | | | | | | | | | | | lib/active_record/store.rb:79: warning: method redefined; discarding old color= lib/active_record/store.rb:79: warning: previous definition of color= was here lib/active_record/store.rb:83: warning: method redefined; discarding old color lib/active_record/store.rb:83: warning: previous definition of color was here
| | * Merge pull request #13593 from oliveiraethales/store_yaml_coderYves Senn2014-01-065-1/+14
| | |\ | | | | | | | | Fix: ActiveRecord::Store TypeError conversion when using YAML coder
| | | * Fix: ActiveRecord::Store TypeError conversion when using YAML coderThales Oliveira2014-01-065-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming the test accordingly to its behaviour Adding 'Fixes' statement to changelog Improving tests legibility & changelog Undoing mistakenly removed empty line & further improving changelog
| | * | add example to the CHANGELOG entry from 3a48b83e5 [ci skip].Yves Senn2014-01-061-2/+8
| | | | | | | | | | | | | | | | /cc @pixeltrix
| | * | Fix typo in AS changelog, improve highlight [ci skip]Carlos Antonio da Silva2014-01-061-2/+2
| | | |
| | * | Fix AR connection resolver docs to return a hash with string keys [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
| | | |
| | * | Fix typo [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
| | | |
| | * | Fix rdoc markup [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
| | | | | | | | | | | | | | | | Wrapping symbols with + does not work, we must use <tt> instead.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 21:17:10 +0000