aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Ensure Active Record connection consistencyschneems2014-01-097-22/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | 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.
* | create/drop test and development databases only if RAILS_ENV is nilDamien Mathieu2014-01-084-5/+38
| | | | | | | | Closes #13625
* | 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
| | |
* | | 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
* | | 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
* | | 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
| | |
* | | quick formatting pass through CHANGELOGS. [ci skip].Yves Senn2014-01-061-1/+1
|/ /
* | Remove method redefined warnings for test suiteMatthias Zirnstein2014-01-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has_many definitions with "name" as singular and as plural e.g. has_many :welcome_posts_with_comment has_many :welcome_posts_with_comments Ruby mentions it with: lib/active_record/associations/builder/collection_association.rb:65: warning: method redefined; discarding old welcome_posts_with_comment_ids lib/active_record/associations/builder/collection_association.rb:65: warning: previous definition of welcome_posts_with_comment_ids was here lib/active_record/associations/builder/collection_association.rb:75: warning: method redefined; discarding old welcome_posts_with_comment_ids= lib/active_record/associations/builder/collection_association.rb:75: warning: previous definition of welcome_posts_with_comment_ids= was here
* | Fix mergefail in changelogJon Leighton2014-01-041-2/+0
| | | | | | | | The line was duplicated
* | Add deprecation I accidentally missedJon Leighton2014-01-041-1/+1
| |
* | Merge pull request #13584 from tjschuck/cannot_cannot_be_can_notXavier Noria2014-01-036-9/+9
|\ \ | | | | | | Change all "can not"s to the correct "cannot"
| * | Change all "can not"s to the correct "cannot".T.J. Schuck2014-01-036-9/+9
| | |
* | | Minor typo fix [ci skip]Robin Dupret2014-01-031-1/+1
|/ /
* | Merge pull request #10134 from ↵Rafael Mendonça França2014-01-033-6/+10
|\ \ | | | | | | | | | | | | derikson/collection_proxy_select_with_multiple_args Change CollectionProxy#select to take the same arguments as ActiveRecord::select
| * | Changed ActiveRecord::Associations::CollectionProxy#select to take multiple ↵Dan Erikson2013-04-083-6/+10
| | | | | | | | | | | | | | | | | | arguments. This makes the arguments the same as ActiveRecord::QueryMethods::select.
* | | Whitespace [ci skip]Rafael Mendonça França2014-01-031-1/+1
| | |
* | | Building new records with enum scopes now works as expectedGodfrey Chan2014-01-033-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this would give an `ArgumentError`: class Issue < ActiveRecord::Base enum :status, [:open, :finished] end Issue.open.build # => ArgumentError: '0' is not a valid status Issue.open.create # => ArgumentError: '0' is not a valid status PR #13542 muted the error, but the issue remains. This commit fixes the issue by allowing the enum value to be written directly via the setter: Issue.new.status = 0 # This now sets status to :open Assigning a value directly via the setter like this is not part of the documented public API, so users should not rely on this behavior. Closes #13530.
* | | Deprecate unused `symbolized_base_class` and `symbolized_sti_name`.Yves Senn2014-01-032-0/+7
| | | | | | | | | | | | | | | | | | | | | These methods were only used for the `IdentityMap` which was removed. They are no longer used internally and should be removed without replacement. As they were not `:nodoc:`'ed it's better to deprecate them before removal.
* | | Automatically maintain test database schemaJon Leighton2014-01-026-28/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move check from generated helper to test_help.rb, so that all applications can benefit * Rather than just raising when the test schema has pending migrations, try to load in the schema and only raise if there are pending migrations afterwards * Opt out of the check by setting config.active_record.maintain_test_schema = false * Deprecate db:test:* tasks. The test helper is now fully responsible for maintaining the test schema, so we don't need rake tasks for this. This is also a speed improvement since we're no longer reloading the test database on every call to "rake test".
* | | Merge pull request #13542 from robin850/issue-13530Rafael Mendonça França2014-01-013-3/+21
|\ \ \ | | | | | | | | | | | | Fix enum writers when using integers
| * | | Improve enum documentationRobin Dupret2014-01-011-1/+6
| | | | | | | | | | | | | | | | | | | | Add a mention about the automatic generation of scopes based on the allowed values of the field on the enum documentation.
| * | | Fix the enums writer methodsRobin Dupret2014-01-013-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the writer methods would simply check whether the passed argument was the symbol representing the integer value of an enum field. Therefore, it was not possible to specify the numeric value itself but the dynamically defined scopes generate where clauses relying on this kind of values so a chained call to a method like `find_or_initialize_by` would trigger an `ArgumentError`. Reference #13530
* | | | Add CHANGELOG entry for #13557 [ci skip]Rafael Mendonça França2014-01-012-1/+4
| | | |
* | | | Merge pull request #13557 from gmarik/patch-1Rafael Mendonça França2014-01-012-1/+18
|\ \ \ \ | | | | | | | | | | | | | | | Use `Array#wrap` instead `Array()`
| * | | | add test casegmarik2013-12-311-0/+17
| | | | |
| * | | | Use `Array#wrap` instead `Array()`gmarik2013-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | - since `Array()` calls `to_ary` or `to_a` on a subject - the intent is to 'wrap' subject into an array
* | | | | update copyright notices to 2014. [ci skip]Vipul A M2014-01-012-2/+2
| | | | |
* | | | | Improve the tests to not call assert_nothing_raisedRafael Mendonça França2014-01-011-4/+1
| | | | |
* | | | | Merge pull request #13550 from vipulnsward/13437-fixRafael Mendonça França2014-01-013-1/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for #13437 Conflicts: activerecord/CHANGELOG.md
| * | | | | https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5 ↵Vipul A M2013-12-313-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8 introduced a regression in includes/preloades by calling `read_attribute` on an association when preloading takes places, instead of using loaded records in `association.target`. tl;dr Records are not made properly available via `read_attribute` when preloding in simultaneous, but value of `@loaded` is already set true, and records concatenated in `association.target` on an association object. When `@loaded` is true we return an object of `AlreadyLoaded` in preload_for. In `AlreadyLoaded` to return preloaded records we make wrong use of `read_attribute`, instead of `target` records. The regression is fixed by making use of the loaded records in `association.target` when the preloading takes place. Fixes #13437
* | | | | | Merge pull request #13556 from yahonda/update_mysql_grantRafael Mendonça França2014-01-012-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Update grant statement to address #13549
| * | | | | Change the inexistent database name to inexistent_activerecord_unittestYasuo Honda2014-01-012-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | to make this grant statement described in the document works GRANT ALL PRIVILEGES ON inexistent_activerecord_unittest.* to 'rails'@'localhost';
* | | | | Add the ability to nullify the `enum` columnAmr Tamimi2014-01-013-1/+43
| | | | |
* | | | | Improve tests to use only public APIRafael Mendonça França2013-12-311-3/+2
| | | | |
* | | | | Make outer joins on proper parentWashington Luiz2013-12-312-2/+12
|/ / / / | | | | | | | | | | | | | | | | Outer joins were being built on the root relation klass rather than the one specified in the join dependency root
* | | | Allow "url" sub key in database.yml configurationschneems2013-12-303-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently a developer can pass in a YAML configuration that fully specifies connection information: ``` production: database: triage_production adapter: password pool: 5 ``` They can also pass in a string that specifies a connection URL directly to an environment key: ``` production: postgresql://localhost/foo ``` This PR allows the use of both a connection url and specifying connection attributes via YAML through the use of the "url" sub key: ``` production: url: postgresql://localhost/foo pool: 3 ``` This will allow developers to inherit Active Record options such as `pool` from `&defaults` and still use a secure connection url such as `<%= ENV['DATABASE_URL'] %>`. The URL is expanded into a hash and then merged back into the YAML hash. If there are any conflicts, the values from the connection URL are preferred. Talked this over with @josevalim
* | | | Merge pull request #13536 from schneems/schneems/connection-spec-docsRichard Schneeman2013-12-301-14/+80
|\ \ \ \ | | | | | | | | | | [ci skip] ConnectionSpecification::Resolver Docs
| * | | | [ci skip] ConnectionSpecification::Resolver Docsschneems2013-12-301-14/+80
| | | | | | | | | | | | | | | | | | | | | | | | | Document the internal interfaces of `ConnectionSpecification::Resolver` Change method name from `config` to `env` to better match the most common use case.
* | | | | tidy AR CHANGELOG. [ci skip]Yves Senn2013-12-301-4/+7
| | | | |
* | | | | Merge pull request #13538 from robin850/patch-14Yves Senn2013-12-301-0/+12
|\ \ \ \ \ | | | | | | | | | | | | Add a missing changelog entry for #13534 [ci skip]
| * | | | | Add a missing changelog entry for #13534 [ci skip]Robin Dupret2013-12-301-0/+12
| | |/ / / | |/| | |
* | | | | Remove deprecation warning for FIXTURES_PATHPiotr Sarnacki2013-12-301-6/+0
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | FIXTURES_PATH has a bit different case than DatabaseTasks.fixtures_path, which was added along with deprecation. A use case for FIXTURES_PATH could be loading fixtures from a different directory just for a given test run. The implementation is fairly simple, so leaving it as it is won't hurt.
* | | | Merge pull request #13535 from schneems/schneems/extract-url-logicRafael Mendonça França2013-12-291-34/+79
|\ \ \ \ | | | | | | | | | | Extract db url connection logic to class
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 11:18:11 +0000