Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | decouple belongs_to callback definition from the builder instance. | Aaron Patterson | 2013-10-02 | 1 | -4/+4 |
| | | | | All the information is on the reflection, so just get it there. | ||||
* | add_before_destroy_callbacks doesn't depend on the instance, so push it | Aaron Patterson | 2013-10-02 | 2 | -5/+5 |
| | | | | to the class. | ||||
* | valid_options doesn't depend on the instance, so push it to the class | Aaron Patterson | 2013-10-02 | 4 | -8/+8 |
| | |||||
* | use the information on the reflection to determine whether callbacks should ↵ | Aaron Patterson | 2013-10-02 | 1 | -4/+5 |
| | | | | be added | ||||
* | association builder is no longer needed for counter cache, so remove it | Aaron Patterson | 2013-10-02 | 1 | -7/+6 |
| | |||||
* | push constructable? on to the reflection | Aaron Patterson | 2013-10-02 | 5 | -18/+22 |
| | |||||
* | name is on the reflection, so just use the reflection | Aaron Patterson | 2013-10-02 | 1 | -2/+2 |
| | |||||
* | decouple define_callback from the instance | Aaron Patterson | 2013-10-02 | 1 | -2/+4 |
| | |||||
* | improving `reload` doc wording. #12418 [ci skip] | Yves Senn | 2013-10-02 | 1 | -1/+2 |
| | |||||
* | Update AR reload doc for the case of manually set primary key attribute [ci ↵ | Anatoli Makarevich | 2013-10-02 | 1 | -2/+11 |
| | | | | skip] | ||||
* | extract adapter savepoint implementations into `abstract/savepoints.rb`. | Yves Senn | 2013-09-30 | 6 | -46/+27 |
| | |||||
* | change the savepoint interface to allow passing the name. | Yves Senn | 2013-09-30 | 4 | -21/+21 |
| | |||||
* | Merge pull request #12383 from marclennox/master | Rafael Mendonça França | 2013-09-29 | 1 | -2/+2 |
|\ | | | | | Fixed issue #12327 | ||||
| * | Fixed issue #12327 | Marc Lennox | 2013-09-27 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #12398 from thedarkone/thread-safety-stuff | Rafael Mendonça França | 2013-09-28 | 1 | -12/+8 |
|\ \ | | | | | | | Thread safety fixes | ||||
| * | | Use TS::Cache instead of Mutex + Hash. | thedarkone | 2013-09-28 | 1 | -12/+8 |
| |/ | | | | | | | TS::Cache#compute_if_absent guarantees that only a single thread will get to execute the provided block for a given key. | ||||
* | | Merge pull request #11496 from ↵ | Rafael Mendonça França | 2013-09-28 | 1 | -4/+0 |
|\ \ | | | | | | | | | | | | | jetthoughts/11376_has_many_assoc_respect_scope_on_build Removed where_values_hash from AR::NullRelation | ||||
| * | | Removed where_values_hash from AR::NullRelation | Paul Nikitochkin | 2013-09-28 | 1 | -4/+0 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to build associated records for owners which has not been saved need to get where values to use as default attributes. But for new record owner uses `ActiveRecord::NullRelation` which override `where_values_hash` to return empty hash stub. `where_values_hash` is not used to invoke any sql query, but good to build others chains (even will be never executed) like: ```ruby post = Post.new admin_comment = post.admin_comments.build assert_equal 'Admin', admin_comment.author ``` Closes #11376, #11676, #11675 | ||||
* | | Merge pull request #12396 from arthurnn/cleanup_logsubs | Rafael Mendonça França | 2013-09-28 | 1 | -11/+2 |
|\ \ | | | | | | | Cleanup identitymap logger from LogSubscriber | ||||
| * | | Cleanup identitymap logger from LogSubscriber | Arthur Neves | 2013-09-28 | 1 | -11/+2 |
| |/ | | | | | | | Also renaming ivar @odd_or_even to @odd | ||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-09-28 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | `skiping` => `skipping` | Vipul A M | 2013-09-17 | 1 | -1/+1 |
| | | |||||
* | | fix .find when inverse is set | Arthur Neves | 2013-09-25 | 1 | -5/+4 |
| | | | | | | | | .find([1]) should return an Array of entries, even when a invese object is in memory already | ||||
* | | Merge pull request #12359 from arthurnn/inverse_on_callbacks | Rafael Mendonça França | 2013-09-25 | 1 | -0/+1 |
|\ \ | | | | | | | Make sure inverse_of is visible on the has_many callbacks | ||||
| * | | Make sure inverse_of is visible on the has_many callbacks | Arthur Neves | 2013-09-25 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' into preload | Aaron Patterson | 2013-09-25 | 9 | -29/+58 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (62 commits) Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag Add CHANGELOG entry for #12344 Add regression test to #12343 Fix typo in number_to_human docs: you -> your [Documentation] Add a missing validation to I18n docs Use the given name in html_options for the hidden field in collection_check_boxes assign_attributes should return if argument is blank. No need the else clause Use join to concat the both side of the AST Add a CHANGELOG entry about Web Console inclusion added column type to example in section 2.3 Include web-console in new projects Gemfile ActiveRecord::ConnectionAdapters::Column.string_to_time method respects string with timezone. Closes #12278. add test_scoped_root_as_name Getting Started Guide: update RubyGems Guides link [ci skip] Deprecate unused quoted_locking_column method. Update references to wycats/thor to erikhuda/thor. bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows Fix the model name in the association basics guides We shouldn't override PostgreSQLAdapter's superclass inheritance while monkeypatching ... | ||||
| * | | Merge pull request #12290 from kennyj/fix_12278 | Andrew White | 2013-09-24 | 1 | -3/+11 |
| |\ \ | | | | | | | | | Closes #12278. AR::ConnectionAdapters::Column.string_to_time method respects string with timezone. | ||||
| | * | | ActiveRecord::ConnectionAdapters::Column.string_to_time method respects ↵ | kennyj | 2013-09-25 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | string with timezone. Closes #12278. | ||||
| * | | | assign_attributes should return if argument is blank. | wangjohn | 2013-09-24 | 1 | -0/+1 |
| |/ / | | | | | | | | | | | | | | | | If you are passed an empty hash, then assign_attributes doesn't need to do any work and can just return early. This should fix the failing Agile Web Development tests. | ||||
| * | | Merge pull request #9860 from wangjohn/update_attributes_throws_error_with_nil | Rafael Mendonça França | 2013-09-24 | 1 | -1/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Raising an error when nil is passed to update_attributes. Conflicts: activerecord/CHANGELOG.md | ||||
| | * | | Raising an error when nil or non-hash is passed to update_attributes. | wangjohn | 2013-06-25 | 1 | -1/+3 |
| | | | | |||||
| * | | | Deprecate unused quoted_locking_column method. | kennyj | 2013-09-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #11987 from wangjohn/schema_dumper_options | Rafael Mendonça França | 2013-09-23 | 1 | -5/+16 |
| |\ \ \ | | | | | | | | | | | Creating options for schema dumper. | ||||
| | * | | | Creating options for schema dumper. | wangjohn | 2013-08-22 | 1 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | These options make it easier to change the config from ActiveRecord::Base to use something else inside of the SchemaDumper. | ||||
| * | | | | Merge pull request #10816 from bogdan/less-dirty-dirty | Rafael Mendonça França | 2013-09-23 | 3 | -13/+8 |
| | | | | | | | | | | | | | | | | | | | | Make AM::Dirty less dirty to plugin into AR or other library | ||||
| * | | | | Merge pull request #11382 from kennyj/fix_10751-2 | Rafael Mendonça França | 2013-09-22 | 1 | -3/+6 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dump UUID default functions to schema.rb [2nd version]. Fixes #10751. Conflicts: activerecord/CHANGELOG.md | ||||
| | * | | | | Migration dump UUID default functions to schema.rb. Fixes #10751. | kennyj | 2013-07-10 | 1 | -3/+6 |
| | | | | | | |||||
| * | | | | | Merge pull request #10500 from kennyj/fix_10450 | Rafael Mendonça França | 2013-09-22 | 1 | -3/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug in when using has_many association with :inverse_of option and UUID primary key. Conflicts: activerecord/CHANGELOG.md | ||||
| | * | | | | | Fixed a bug in when using has_many association with :inverse_of option and ↵ | kennyj | 2013-05-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | UUID primary key. | ||||
| * | | | | | | Add back options argument in the ActiveRecord::Base.initialize method | Rafael Mendonça França | 2013-09-21 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make easier to hook protected_attributes gem in our code without making that gem fragile to change in Rails code base. Closes #12243 | ||||
* | | | | | | | remove initialize method | Aaron Patterson | 2013-09-25 | 1 | -4/+0 |
| | | | | | | | |||||
* | | | | | | | extract association resetting to a method | Aaron Patterson | 2013-09-25 | 1 | -9/+16 |
| | | | | | | | |||||
* | | | | | | | hash insertion order doesn't matter anymore, so only loop over the | Aaron Patterson | 2013-09-25 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | owners once | ||||
* | | | | | | | always populate the preloaded records instance variable so we can remove | Aaron Patterson | 2013-09-25 | 2 | -10/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the @associated_records_by_owner ivar | ||||
* | | | | | | | keep preloaded records in a list rather than extract from a hash | Aaron Patterson | 2013-09-25 | 3 | -16/+21 |
| | | | | | | | |||||
* | | | | | | | push slice loading to it's own method so we can remove the type casting | Aaron Patterson | 2013-09-24 | 2 | -24/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | code | ||||
* | | | | | | | guarantee that `klass` is not nil inside the preloader objects | Aaron Patterson | 2013-09-24 | 2 | -5/+12 |
| | | | | | | | |||||
* | | | | | | | eliminate unused ivar | Aaron Patterson | 2013-09-24 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | all records have a preloaded, so eliminate that conditional | Aaron Patterson | 2013-09-24 | 1 | -11/+7 |
| | | | | | | | |||||
* | | | | | | | eliminate the `loaded?` conditional | Aaron Patterson | 2013-09-24 | 3 | -12/+7 |
| | | | | | | |