aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #13799 from kbrock/better_dirtyJeremy Kemper2014-01-227-18/+49
|\ \ \ \ | |/ / / |/| | | Better ActiveRecord hierarchy for Dirty and others
| * | | Move changed_attributes into dirty.rbKeenan Brock2014-01-226-16/+47
| | | | | | | | | | | | Move serialization dirty into serialization.rb
| * | | put core at the beginning so other classes can modify the behaviorKeenan Brock2014-01-222-2/+2
| | | |
* | | | Merge pull request #13791 from kei-s/remove_duplicate_mergeCarlos Antonio da Silva2014-01-221-1/+0
|\ \ \ \ | | | | | | | | | | Remove duplicate merge
| * | | | Remove duplicate mergekei2014-01-221-1/+0
| | | | |
* | | | | Make CollectionProxy#reset return selfRafael Mendonça França2014-01-221-1/+2
| | | | |
* | | | | Calling reset on a collection association should unload the assocationKelsey Schlarman2014-01-211-0/+21
|/ / / / | | | | | | | | | | | | Need to define #reset on CollectionProxy.
* | | | Ensure AR #second, #third, etc. finders work through associationsJason Meller2014-01-213-13/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes two regressions introduced in cafe31a078 where newly created finder methods #second, #third, #forth, and #fifth caused a NoMethodError error on reload associations and where we were pulling the wrong element out of cached associations. Examples: some_book.authors.reload.second # Before # => NoMethodError: undefined method 'first' for nil:NilClass # After # => #<Author id: 2, name: "Sally Second", ...> some_book.first.authors.first some_book.first.authors.second # Before # => #<Author id: 1, name: "Freddy First", ...> # => #<Author id: 1, name: "Freddy First", ...> # After # => #<Author id: 1, name: "Freddy First", ...> # => #<Author id: 2, name: "Sally Second", ...> Fixes #13783.
* | | | Merge pull request #13776 from rails/dirty-enumRafael Mendonça França2014-01-212-4/+36
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Implement the Dirty API with the Enum feature correctly. Conflicts: activerecord/CHANGELOG.md
| * | | Use string as keysRafael Mendonça França2014-01-211-2/+2
| | | |
| * | | Store the enum values in the DEFINED_ENUM constantRafael Mendonça França2014-01-211-8/+8
| | | | | | | | | | | | | | | | | | | | This will make simpler to compare if the values changed in the save_changed_attribute method.
| * | | Add more tests for the dirty feature for enumsRafael Mendonça França2014-01-212-8/+19
| | | |
| * | | Make enum feature work with dirty methodsRafael Mendonça França2014-01-211-1/+18
| | | | | | | | | | | | | | | | | | | | To make this possible we have to override the save_changed_attribute hook.
| * | | Extract all attribute changed work to its own methodRafael Mendonça França2014-01-211-3/+7
| | | | | | | | | | | | | | | | This will make easier to hook on this feature to customize the behavior
* | | | add missing information for `id` field when used with `select` [ci skip]Kuldeep Aggarwal2014-01-221-1/+1
| | | |
* | | | `has_one` and `belongs_to` accessors don't add ORDER BY to the queries anymore.Rafael Mendonça França2014-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Rails 4.0, we add an ORDER BY in the `first` method to ensure consistent results among different database engines. But for singular associations this behavior is not needed since we will have one record to return. As this ORDER BY option can lead some performance issues we are removing it for singular associations accessors. Fixes #12623.
* | | | prepend table name for `Relation#select` columns.Yves Senn2014-01-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where `select(:id)` combined with `joins()` raised: ``` ActiveRecord::StatementInvalid: SQLite3::SQLException: ambiguous column name: id: SELECT id, authors.author_address_id FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY posts.id LIMIT 3 ``` The `select_values` are still String and Symbols because other parts (mainly calculations.rb) rely on that fact. /cc @tenderlove
* | | | Merge pull request #9969 from divineforest/fix-find-in-batchesYves Senn2014-01-211-5/+2
|\ \ \ \ | | | | | | | | | | Fail early with "Primary key not included in the custom select clause" i...
| * | | | Fail early with "Primary key not included in the custom select clause" in ↵Alexander Balashov2014-01-211-5/+2
| |/ / / | | | | | | | | | | | | | | | | find_in_batches Before this patch find_in_batches raises this error only on second iteration. So you will know about the problem only when you get the batch size threshold.
* / / / Remove missed usage of @first variableCarlos Antonio da Silva2014-01-211-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | With the introduction of `#second` method and friends, we added an offsets hash which replaced the @first variable, so removing it from the reset method to avoid creating an unused variable now. Introduced in bc625080308e4853ae3036f2ad74fe3826e463ef.
* | | Remove unneded argumentRafael Mendonça França2014-01-201-2/+2
| | | | | | | | | | | | This variable is internal and should not be exposed to end users
* | | Ensure #second acts like #first AR finderJason Meller2014-01-203-8/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit bring the famous ordinal Array instance methods defined in ActiveSupport into ActiveRecord as fully-fledged finders. These finders ensure a default ascending order of the table's primary key, and utilize the OFFSET SQL verb to locate the user's desired record. If an offset is defined in the query, calling #second adds to the offset to get the actual desired record. Fixes #13743.
* | | Restore ActiveRecord states after a rollback for models w/o callbacksGodfrey Chan2014-01-182-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression (#13744) that was caused by 67d8bb9. In 67d8bb9, we introduced lazy rollback for records, such that the record's internal states and attributes are not restored immediately after a transaction rollback, but deferred until they are first accessed. This optimization is only performed when the model does not have any transactional callbacks (e.g. `after_commit` and `after_create`). Unfortunately, the models used to test the affected codepaths all comes with some sort of transactional callbacks. Therefore this codepath remains largely untested until now and as a result there are a few issues in the implementation that remains hidden until now. First, the `sync_with_transaction_state` (or more accurately, `update_attributes_from_transaction_state`) would perform the synchronization prematurely before a transaction is finalized (i.e. comitted or rolled back). As a result, when the actuall rollback happens, the record will incorrectly assumes that its internal states match the transaction state, and neglect to perform the restore. Second, `update_attributes_from_transaction_state` calls `committed!` in some cases. This in turns checks for the `destroyed?` state which also requires synchronization with the transaction stae, which causes an infnite recurrsion. This fix works by deferring the synchronization until the transaction has been finalized (addressing the first point), and also unrolled the `committed!` and `rolledback!` logic in-place (addressing the second point). It should be noted that the primary purpose of the `committed!` and `rolledback!` methods are to trigger the relevant transactional callbacks. Since this code path is only entered when there are no transactional callbacks on the model, this shouldn't be necessary. By unrolling the method calls, the intention here (to restore the states when necessary) becomes more clear.
* | | fix exception translationAaron Patterson2014-01-172-3/+4
| | |
* | | translate exceptions on prepared statement failureAaron Patterson2014-01-172-6/+13
| | |
* | | Update deprecation warning to give more information about callerT.J. Schuck2014-01-161-2/+2
| | |
* | | Make AR::Base#touch fire the after_commit and after_rollback callbacksHarry Brundage2014-01-161-0/+4
| | |
* | | Get rid of unused TransactionError constantCarlos Antonio da Silva2014-01-151-3/+0
| | | | | | | | | | | | | | | | | | This has been added 9 years ago in a677da209b16f43198b3485dda89dce862fb9bfb, and removed 6 years ago in 38f8252e2d0a109d1b833d6b289cd989e7bfffe4.
* | | Avoid converting :on option to array twice when defining commit/rollback ↵Carlos Antonio da Silva2014-01-151-3/+2
| | | | | | | | | | | | callbacks
* | | directly create the ARel ASTAaron Patterson2014-01-141-6/+4
| | | | | | | | | | | | rather than allocating a new Relation, just make the AST directly
* | | Updated comment to mention the enum mapping class method [ci skip]Godfrey Chan2014-01-141-2/+3
| | |
* | | sqlite >= 3.8.0 supports partial indexesCody Cutrer2014-01-141-1/+17
| | |
* | | Don't try to get the subclass if the inheritance column doesn't existUjjwal Thaakar2014-01-141-7/+15
| | | | | | | | | | | | | | | | | | | | | The `subclass_from_attrs` method is called even if the column specified by the `inheritance_column` setting doesn't exist. This prevents setting associations via the attributes hash if the association name clashes with the value of the setting, typically `:type`. This worked previously in Rails 3.2.
* | | Enum mappings are now exposed via class methods instead of constants.Godfrey Chan2014-01-141-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: class Conversation < ActiveRecord::Base enum status: [ :active, :archived ] end Before: Conversation::STATUS # => { "active" => 0, "archived" => 1 } After: Conversation.statuses # => { "active" => 0, "archived" => 1 }
* | | Merge pull request #13669 from chulkilee/name-error-nameYves Senn2014-01-141-1/+1
|\ \ \ | | | | | | | | Set NameError#name
| * | | Set NameError#nameChulki Lee2014-01-131-1/+1
| | | |
* | | | unscope should remove bind values associated with the whereAaron Patterson2014-01-131-0/+2
| | | |
* | | | reverse_order_value= is not private, so no need to sendAaron Patterson2014-01-131-1/+1
| | | | | | | | | | | | | | | | It's not public API, but is not private scoped.
* | | | avoid more dynamic symbolsAaron Patterson2014-01-131-1/+1
| | | |
* | | | no need to to_symAaron Patterson2014-01-131-2/+2
|/ / /
* | | fix bug in becomes! when changing from base to subclass. Closes #13272.Yves Senn2014-01-131-1/+5
| | |
* | | use enum labels as form values. Achieved by `_before_type_cast`.Yves Senn2014-01-111-0/+3
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13650, #13672 This is an alternate implementation to solve #13650. Currently form fields contain the enum value (eg. "1"). This breaks because the setter `enum=` expects the label (eg. "active"). ActiveRecord::Enum allows you to use labels in your application but store numbers. We should make sure that all parts after AR are dealing with labels and not the underlying mapping to a number. This patch defines `_before_type_cast` on every enum column to return the label. This method is later used to fetch the value to display in form fields. I deliberately copied the implementation of the enum getter instead of delegating to it. This allows you to overwrite the getter and for example return a `Value Object` but have it still work for form fields.
* | 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 #13582 from schneems/schneems/preserve-connection-behaviorRafael Mendonça França2014-01-095-22/+80
|\ \ | | | | | | Ensure Active Record connection consistency
| * | Ensure Active Record connection consistencyschneems2014-01-095-22/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | make `change_column_null` reversible. Closes #13576.Yves Senn2014-01-081-1/+6
| | | | | | | | Closes #13623.
* | create/drop test and development databases only if RAILS_ENV is nilDamien Mathieu2014-01-082-3/+4
| | | | | | | | Closes #13625
* | Merge pull request #13355 from dylanahsmith/migration-versionRafael Mendonça França2014-01-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | activerecord: Initialize Migration with version from MigrationProxy. Conflicts: activerecord/CHANGELOG.md
| * | activerecord: Initialize Migration with version from MigrationProxy.Dylan Thacker-Smith2014-01-061-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 17:56:21 +0000