- 10 1月, 2014 1 次提交
-
-
由 schneems 提交于
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.
-
- 09 1月, 2014 9 次提交
-
-
由 Guillermo Iguaran 提交于
MySQL version 4.1 was EOL on December 31, 2009 [ci-skip]
-
由 Zachary Scott 提交于
We should at least recommend modern versions of MySQL to users.
-
由 Aaron Patterson 提交于
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.
-
由 Aaron Patterson 提交于
-
由 Rafael Mendonça França 提交于
Move finish_template as the last public method defined in the generator
-
由 Aaron Patterson 提交于
-
由 Carlos Antonio da Silva 提交于
Fix typo [ci skip]
-
由 Jake Worth 提交于
-
由 Mehdi Lahmam 提交于
-
- 08 1月, 2014 8 次提交
-
-
由 Robin Dupret 提交于
-
由 Yves Senn 提交于
Closes #13623.
-
由 Yves Senn 提交于
Be more explicit about the default of db:drop and db:create
-
由 Damien Mathieu 提交于
Closes #13625
-
由 Yves Senn 提交于
This reverts commit 2ef1fb2c. 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
-
由 Yves Senn 提交于
-
由 Yves Senn 提交于
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 2ef1fb2c * #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.
-
由 Rafael Mendonça França 提交于
activerecord: Initialize Migration with version from MigrationProxy. Conflicts: activerecord/CHANGELOG.md
-
- 07 1月, 2014 7 次提交
-
-
由 Xavier Noria 提交于
Fix typo in image_tag documentation [ci skip]
-
由 Adrien 提交于
image_tag only supports :alt and :size as additional keys, not three.
-
由 Yves Senn 提交于
Make change_table use object of current database adapter
-
由 Nishant Modak 提交于
- 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
-
由 Carlos Antonio da Silva 提交于
Also improve changelog entries related to secure password to proper highlight.
-
由 Rafael Mendonça França 提交于
Add 'e' var on rescue DalliError, in order to log it
-
由 Arthur Neves 提交于
-
- 06 1月, 2014 15 次提交
-
-
由 Dylan Thacker-Smith 提交于
-
由 Rafael Mendonça França 提交于
Remove warnings in test suite
-
由 Matthias Zirnstein 提交于
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
-
由 Yves Senn 提交于
Fix: ActiveRecord::Store TypeError conversion when using YAML coder
-
由 Thales Oliveira 提交于
Renaming the test accordingly to its behaviour Adding 'Fixes' statement to changelog Improving tests legibility & changelog Undoing mistakenly removed empty line & further improving changelog
-
由 Yves Senn 提交于
/cc @pixeltrix
-
由 Carlos Antonio da Silva 提交于
-
由 Carlos Antonio da Silva 提交于
-
由 Carlos Antonio da Silva 提交于
-
由 Carlos Antonio da Silva 提交于
Wrapping symbols with + does not work, we must use <tt> instead.
-
由 Yves Senn 提交于
Add missing tests for invalid names in `rails plugin new` generator
-
由 Carlos Antonio da Silva 提交于
-
由 Robin Böning 提交于
* Test for: Invalid plugin name, because of reserved rails word. * Test for: Invalid plugin name because of constant name that is already in use.
-
由 Yves Senn 提交于
-
由 Yves Senn 提交于
-