Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9996 from mikz/master | Jon Leighton | 2013-04-05 | 1 | -0/+1 |
|\ | | | | | Association with inverse_of does not set the parent in association building block | ||||
| * | fix inverse_of association in block of new child | Michal Cichra | 2013-04-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes inconsistency when building children of association which has inverse_of set properly. When creating new association object with a block: parent.association.build do |child| child.parent.equal?(parent) # false end So the block the `child.parent` did not point to the same object. But when the object is created it points to same instance: child = parent.association.build child.parent.equal?(parent) # true | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] | ||||
| * | | explain method invertible_for [ci skip] | Neeraj Singh | 2013-03-29 | 1 | -1/+2 |
| | | | |||||
* | | | Do not use deprecate method [ci skip] | Neeraj Singh | 2013-03-29 | 1 | -1/+1 |
| | | | |||||
* | | | fix broken sentence [ci skip] | Neeraj Singh | 2013-03-29 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Adding a bang to method name of raise_on_type_mismatch. | wangjohn | 2013-03-21 | 1 | -1/+1 |
|/ | |||||
* | No need to send public methods | Akira Matsuda | 2013-02-26 | 1 | -1/+1 |
| | |||||
* | prevent mass assignment of polymorphic type when using `build` | Yves Senn | 2012-11-22 | 1 | -1/+2 |
| | | | | Closes #8265 | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-03 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb activerecord/lib/active_record/attribute_methods.rb guides/source/working_with_javascript_in_rails.md | ||||
| * | fix a typo in comments to ActiveRecord::Associations::Association.stale_state | Andrii Dovgaliuk | 2012-10-24 | 1 | -1/+1 |
| | | |||||
* | | Make caller attribute in deprecation methods optional | Alexey Gaziev | 2012-10-30 | 1 | -1/+1 |
| | | |||||
* | | Provide a call stack for deprecation warnings where needed. | Nikita Afanasenko | 2012-10-29 | 1 | -1/+1 |
|/ | | | | It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly. | ||||
* | Fix destructive side effects from marshaling an association caused by ↵ | Jeremy Kemper | 2012-09-25 | 1 | -5/+2 |
| | | | | 65843e1acc0c8d285ff79f8c9c49d4d1215440be | ||||
* | Remove mass_assignment_options from ActiveRecord | Guillermo Iguaran | 2012-09-16 | 1 | -3/+3 |
| | |||||
* | removes usage of Object#in? from the code base (the method remains defined ↵ | Xavier Noria | 2012-08-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | by Active Support) Selecting which key extensions to include in active_support/rails made apparent the systematic usage of Object#in? in the code base. After some discussion in https://github.com/rails/rails/commit/5ea6b0df9a36d033f21b52049426257a4637028d we decided to remove it and use plain Ruby, which seems enough for this particular idiom. In this commit the refactor has been made case by case. Sometimes include? is the natural alternative, others a simple || is the way you actually spell the condition in your head, others a case statement seems more appropriate. I have chosen the one I liked the most in each case. | ||||
* | load active_support/deprecation in active_support/rails | Xavier Noria | 2012-08-02 | 1 | -1/+0 |
| | |||||
* | load active_support/core_ext/object/inclusion in active_support/rails | Xavier Noria | 2012-08-02 | 1 | -1/+0 |
| | |||||
* | s/scoped/scope/ | Jon Leighton | 2012-08-01 | 1 | -1/+7 |
| | |||||
* | Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql." | Jon Leighton | 2012-08-01 | 1 | -0/+8 |
| | | | | | | | | | This reverts commit 3803fcce26b837c0117f7d278b83c366dc4ed370. Conflicts: activerecord/CHANGELOG.md It will be deprecated only in 4.0, and removed properly in 4.1. | ||||
* | Deprecate ActiveRecord::Base.scoped. | Jon Leighton | 2012-07-27 | 1 | -1/+1 |
| | | | | | | | It doesn't serve much purpose now that ActiveRecord::Base.all returns a Relation. The code is moved to active_record_deprecated_finders. | ||||
* | Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql. | Jon Leighton | 2012-07-20 | 1 | -8/+0 |
| | |||||
* | Represent association scope options as AR::Relations insternally. | Jon Leighton | 2012-07-13 | 1 | -5/+16 |
| | |||||
* | Allow associations to take a lambda which builds the scope | Jon Leighton | 2012-07-13 | 1 | -1/+5 |
| | |||||
* | Fix #5563. Should reflect the most recent change to either of association / id. | kennyj | 2012-04-13 | 1 | -1/+2 |
| | |||||
* | Some refactor for association. | kennyj | 2012-04-12 | 1 | -7/+1 |
| | | | | | | | * Remove unused association_class method. * Remove a unnecessary assignment. * Move @updated to BelongsToAssociation that only reference this instance variable. * Reset @stale_state at the reset method. I think this place is right place. | ||||
* | Get a properly aliased_table_name, when we use a polymorphic association. | kennyj | 2012-04-04 | 1 | -1/+1 |
| | |||||
* | Remove IdentityMap | Carlos Antonio da Silva | 2012-03-13 | 1 | -12/+1 |
| | |||||
* | Fix #5069 - Protect foreign key from mass assignment throught association ↵ | Jean Boussier | 2012-03-05 | 1 | -1/+2 |
| | | | | builder | ||||
* | Initialize @stale_state to nil in association | Carlos Antonio da Silva | 2012-03-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | This apparently fix the warning related to @new_record variable not being initialized in AR's test suit, when an association is built and the object is marshalled/loaded. See these tests in AR's base_test.rb: test_marshalling_with_associations test_marshalling_new_record_round_trip_with_associations Closes #3720. | ||||
* | added failing tests for has_many, has_one and belongs_to associations with ↵ | Jakub Kuźma | 2011-12-21 | 1 | -6/+1 |
| | | | | strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051 | ||||
* | Allow nested attributes in associations to update values in it's owner ↵ | Andrew Kaspick | 2011-12-14 | 1 | -0/+2 |
| | | | | object. Fixes a regression from 3.0.x | ||||
* | Fix private methods which are delegated to. This previously worked because ↵ | Jon Leighton | 2011-08-15 | 1 | -8/+8 |
| | | | | Module#delegate previously ignored method visibility. | ||||
* | Don't construct association scope in initializer. This yields a big ↵ | Jon Leighton | 2011-07-07 | 1 | -6/+10 |
| | | | | performance gain for cases where the association is never used to load the target, for example with preloading. Related: #1873. | ||||
* | Assign the association attributes to the associated record before the ↵ | Jon Leighton | 2011-06-30 | 1 | -0/+9 |
| | | | | before_initialize callback of the record runs. Fixes #1842. | ||||
* | Allow polymorphic has_one to work when the association is set before the ↵ | Jon Leighton | 2011-06-08 | 1 | -3/+1 |
| | | | | owner has been saved. Fixes #1524. | ||||
* | When you add a record to a polymorphic has_one, you should be able to access ↵ | Jon Leighton | 2011-06-08 | 1 | -1/+1 |
| | | | | the owner from the associated record | ||||
* | Remove `#among?` from Active Support | Prem Sichanugrist | 2011-04-13 | 1 | -1/+1 |
| | | | | | | After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now. It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`. | ||||
* | Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵ | David Heinemeier Hansson | 2011-04-12 | 1 | -1/+1 |
| | | | | suggestion! | ||||
* | Using Object#in? and Object#either? in various places | Prem Sichanugrist | 2011-04-11 | 1 | -1/+2 |
| | | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?. | ||||
* | Move the code which builds a scope for through associations into a generic ↵ | Jon Leighton | 2011-03-10 | 1 | -38/+6 |
| | | | | AssociationScope class which is capable of building a scope for any association. | ||||
* | Active Record typos. | R.T. Lechow | 2011-03-05 | 1 | -2/+2 |
| | |||||
* | Fix a couple of tests in join_model_test.rb which were failing when the ↵ | Jon Leighton | 2011-03-04 | 1 | -2/+2 |
| | | | | identity map is turned off | ||||
* | Rename target_klass to klass | Jon Leighton | 2011-02-21 | 1 | -7/+7 |
| | |||||
* | Delegate Association#options to the reflection, and replace ↵ | Jon Leighton | 2011-02-21 | 1 | -6/+6 |
| | | | | 'reflection.options' with 'options'. Also add through_options and source_options methods for through associations. | ||||
* | Associations - where possible, call attributes methods rather than directly ↵ | Jon Leighton | 2011-02-21 | 1 | -23/+23 |
| | | | | accessing the instance variables | ||||
* | Initialize @target instead asking if it is defined. | Emilio Tagua | 2011-02-18 | 1 | -1/+2 |
| | |||||
* | Reindent and remove wrong line left in merge by mistake. | Emilio Tagua | 2011-02-18 | 1 | -4/+3 |
| | |||||
* | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -0/+16 |
| | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | ||||
* | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 1 | -0/+246 |
manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. |