aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Minor changelog improvements [ci skip]Carlos Antonio da Silva2014-01-311-4/+4
|
* Merge pull request #13896 from laurocaetano/dangerous_association_namesCarlos Antonio da Silva2014-01-315-0/+52
|\ | | | | Associations now raises `ArgumentError` on name conflicts. Closes #13217.
| * Associations now raise `ArgumentError` on name conflicts.Lauro Caetano2014-01-315-0/+52
| | | | | | | | | | Dangerous association names conflicts include instance or class methods already defined by `ActiveRecord::Base`.
* | Remove unused variable.Tim Fenney2014-01-311-1/+1
|/
* Merge pull request #13859 from huoxito/let-it-goRafael Mendonça França2014-01-302-2/+10
|\ | | | | Let `unscope` ignore non Arel scope.where_values
| * Let `unscope` ignore non Arel scope.where_valuesWashington Luiz2014-01-302-2/+10
| |
* | Merge pull request #13886 from arthurnn/fix_relation_arelRafael Mendonça França2014-01-308-18/+52
|\ \ | |/ |/| Fix regression on .select method
| * Fix regression on `.select_*` methods.Arthur Neves2014-01-308-18/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a common pattern: ``` query = author.posts.select(:title) connection.select_one(query) ``` However `.select` returns a ActiveRecord::AssociationRelation, which has the bind information, so we can use that to get the right sql query. Also fix select_rows on postgress and sqlite3 that were not using the binds [fixes #7538] [fixes #12017] [related #13731] [related #12056]
* | Remove automatic removal of Date/Time stubs after each test caseRafael Mendonça França2014-01-301-1/+5
| | | | | | | | | | | | This behavior is only work out-of-box with minitest and also add a downside to run after each test case, even if we don't used the travel or travel_to methods
* | Merge pull request #13878 from marcandre/leave_my_options_aloneRafael Mendonça França2014-01-302-2/+8
|\ \ | | | | | | find_in_batches should not mutate its argument
| * | find_in_batches should not mutate its argumentMarc-Andre Lafortune2014-01-292-2/+8
| | |
* | | docs, `references` is only used with `includes`. Closes #13727.Yves Senn2014-01-301-9/+14
| |/ |/| | | | | | | | | | | There is no gain in `referencing` tables that are not used for preloading. Furthermore it will break if polymorphic associations are invloved. This is because `references_eager_loaded_tables?` uses all `reference_values` to decide wether to `eager_load` or `preload`.
* | AestheticRafael Mendonça França2014-01-293-13/+13
| |
* | Fixing issue with activerecord serialization not being able to dump a record ↵Mauricio Linhares2014-01-295-1/+52
|/ | | | after loading it from YAML - fixes #13861
* Merge pull request #13201 from marcandre/find_in_batch_enumeratorRafael Mendonça França2014-01-293-0/+27
|\ | | | | | | | | | | | | | | `find_in_batches` now returns an `Enumerator` Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/batches.rb
| * `find_in_batches` now returns an `Enumerator` when called without a block, ↵Marc-Andre Lafortune2013-12-063-0/+27
| | | | | | | | | | | | so that it can be chained with other `Enumerable` methods.
* | Mention find_each in find_in_batches doc [ci skip]Marc-Andre Lafortune2014-01-291-0/+2
| |
* | `enum` now raises on "dangerous" name conflictsGodfrey Chan2014-01-293-3/+113
| | | | | | | | | | | | | | | | | | Dangerous name conflicts includes instance or class method conflicts with methods defined within `ActiveRecord::Base` but not its ancestors, as well as conflicts with methods generated by other enums on the same class. Fixes #13389.
* | `scope` now raises on "dangerous" name conflictsGodfrey Chan2014-01-294-4/+95
| | | | | | | | | | | | | | | | | | | | Similar to dangerous attribute methods, a scope name conflict is dangerous if it conflicts with an existing class method defined within `ActiveRecord::Base` but not its ancestors. See also #13389. *Godfrey Chan*, *Philippe Creux*
* | Fixed a bug in AR::Base#respond_to?Godfrey Chan2014-01-292-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | Before: >> ActiveRecord::Base.respond_to?(:find_by_something) NoMethodError: undefined method `abstract_class?' for Object:Class After: >> ActiveRecord::Base.respond_to?(:find_by_something) => false
* | Correctly send the string given to lock! and reload(:lock) to the lock scope ↵Mauricio Linhares2014-01-293-1/+22
| | | | | | | | | | | | - fixes #13788 As per the documentation at lock!, if the :lock option is a string it should use the given SQL to generate the lock statement.
* | Handle aliased attributes in AR::Relation#select, #order, etc.Tsutomu Kuroda2014-01-294-1/+44
| | | | | | | | | | | | | | With this we can write `Model#select(:aliased)`, `Model#order(:aliased)`, `Model#reoder(aliased: :desc)`, etc. Supplementary work to 54122067acaad39b277a5363c6d11d6804c7bf6b.
* | Fix indent on test case [ci skip]Carlos Antonio da Silva2014-01-281-2/+2
| |
* | Merge pull request #13838 from vipulnsward/13197-fix-has-one-documentationDamien Mathieu2014-01-281-1/+2
|\ \ | | | | | | Add docs about behaviour of replacing a has_one associate object.
| * | Add docs about behaviour of replacing a has_one associate object, that the ↵Vipul A M2014-01-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | previous one is deleted even if the new one doesn't get persisted to database. Fixes #13197 . [ci skip]
* | | use the new clear_validators! api everywhere to reset validators in testsKuldeep Aggarwal2014-01-282-3/+3
| | |
* | | Display value when raising due to unscope() issuesWashington Luiz2014-01-271-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully make it easier to debug errors. e.g Before: RuntimeError: unscope(where: "deleted_at") failed: unscoping String is unimplemented. After: RuntimeError: unscope(where: "deleted_at") failed: unscoping String "'t'='t'" is unimplemented.
* | Merge pull request #13785 from kuldeepaggarwal/fix-find_with_multiple_idsYves Senn2014-01-242-9/+26
|\ \ | | | | | | Fix `ActiveRecord::RecordNotFound` error message with custom primary key
| * | Fix `ActiveRecord::RecordNotFound` error message with custom primary keyKuldeep Aggarwal2014-01-252-9/+26
| | |
* | | Remove unused assignment to fix warnings in enum test.Vipul A M2014-01-241-1/+0
| | |
* | | 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
| | | |
* | | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2014-01-221-2/+14
| | | |
* | | | 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-213-0/+36
|/ / / | | | | | | | | | Need to define #reset on CollectionProxy.
* | | Ensure AR #second, #third, etc. finders work through associationsJason Meller2014-01-219-85/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-216-4/+128
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 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-215-8/+53
| | |
| * | Make enum feature work with dirty methodsRafael Mendonça França2014-01-213-1/+76
| | | | | | | | | | | | | | | 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-214-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-213-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Active Record changelog wording and formatting. [ci skip]Yves Senn2014-01-211-5/+6
| | |
* | | Merge pull request #9969 from divineforest/fix-find-in-batchesYves Senn2014-01-213-6/+13
|\ \ \ | | | | | | | | Fail early with "Primary key not included in the custom select clause" i...