aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* extract adapter savepoint implementations into `abstract/savepoints.rb`.Yves Senn2013-09-306-46/+27
|
* change the savepoint interface to allow passing the name.Yves Senn2013-09-304-21/+21
|
* Make `.next_migration_number` reusable for third party AR generators.Yves Senn2013-09-302-8/+20
|
* Merge pull request #12383 from marclennox/masterRafael Mendonça França2013-09-291-2/+2
|\ | | | | Fixed issue #12327
| * Fixed issue #12327Marc Lennox2013-09-271-2/+2
| |
* | Merge pull request #12398 from thedarkone/thread-safety-stuffRafael Mendonça França2013-09-281-12/+8
|\ \ | | | | | | Thread safety fixes
| * | Use TS::Cache instead of Mutex + Hash.thedarkone2013-09-281-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ça2013-09-281-4/+0
|\ \ | | | | | | | | | | | | jetthoughts/11376_has_many_assoc_respect_scope_on_build Removed where_values_hash from AR::NullRelation
| * | Removed where_values_hash from AR::NullRelationPaul Nikitochkin2013-09-281-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_logsubsRafael Mendonça França2013-09-281-11/+2
|\ \ | | | | | | Cleanup identitymap logger from LogSubscriber
| * | Cleanup identitymap logger from LogSubscriberArthur Neves2013-09-281-11/+2
| |/ | | | | | | Also renaming ivar @odd_or_even to @odd
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-281-1/+1
|\ \ | |/ |/|
| * `skiping` => `skipping`Vipul A M2013-09-171-1/+1
| |
* | fix .find when inverse is setArthur Neves2013-09-251-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_callbacksRafael Mendonça França2013-09-251-0/+1
|\ \ | | | | | | Make sure inverse_of is visible on the has_many callbacks
| * | Make sure inverse_of is visible on the has_many callbacksArthur Neves2013-09-251-0/+1
| | |
* | | Merge branch 'master' into preloadAaron Patterson2013-09-259-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_12278Andrew White2013-09-241-3/+11
| |\ \ | | | | | | | | Closes #12278. AR::ConnectionAdapters::Column.string_to_time method respects string with timezone.
| | * | ActiveRecord::ConnectionAdapters::Column.string_to_time method respects ↵kennyj2013-09-251-3/+11
| | | | | | | | | | | | | | | | string with timezone. Closes #12278.
| * | | assign_attributes should return if argument is blank.wangjohn2013-09-241-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_nilRafael Mendonça França2013-09-241-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.wangjohn2013-06-251-1/+3
| | | |
| * | | Deprecate unused quoted_locking_column method.kennyj2013-09-241-0/+1
| | | |
| * | | Merge pull request #11987 from wangjohn/schema_dumper_optionsRafael Mendonça França2013-09-231-5/+16
| |\ \ \ | | | | | | | | | | Creating options for schema dumper.
| | * | | Creating options for schema dumper.wangjohn2013-08-221-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-dirtyRafael Mendonça França2013-09-233-13/+8
| | | | | | | | | | | | | | | | | | | | Make AM::Dirty less dirty to plugin into AR or other library
| * | | | Merge pull request #11382 from kennyj/fix_10751-2Rafael Mendonça França2013-09-221-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.kennyj2013-07-101-3/+6
| | | | | |
| * | | | | Merge pull request #10500 from kennyj/fix_10450Rafael Mendonça França2013-09-221-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 ↵kennyj2013-05-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | UUID primary key.
| * | | | | | Add back options argument in the ActiveRecord::Base.initialize methodRafael Mendonça França2013-09-211-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 methodAaron Patterson2013-09-251-4/+0
| | | | | | |
* | | | | | | extract association resetting to a methodAaron Patterson2013-09-251-9/+16
| | | | | | |
* | | | | | | hash insertion order doesn't matter anymore, so only loop over theAaron Patterson2013-09-251-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | owners once
* | | | | | | always populate the preloaded records instance variable so we can removeAaron Patterson2013-09-252-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the @associated_records_by_owner ivar
* | | | | | | keep preloaded records in a list rather than extract from a hashAaron Patterson2013-09-253-16/+21
| | | | | | |
* | | | | | | push slice loading to it's own method so we can remove the type castingAaron Patterson2013-09-242-24/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | code
* | | | | | | guarantee that `klass` is not nil inside the preloader objectsAaron Patterson2013-09-242-5/+12
| | | | | | |
* | | | | | | eliminate unused ivarAaron Patterson2013-09-241-1/+0
| | | | | | |
* | | | | | | all records have a preloaded, so eliminate that conditionalAaron Patterson2013-09-241-11/+7
| | | | | | |
* | | | | | | eliminate the `loaded?` conditionalAaron Patterson2013-09-243-12/+7
| | | | | | |
* | | | | | | push preloaded test up to the factory method so we can eliminateAaron Patterson2013-09-243-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | conditionals from the individual preloaded classes
* | | | | | | we can't sort by lhs since the middle records have difference classesAaron Patterson2013-09-231-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and possibly different rules for finding those objects
* | | | | | | pass the preloader down so we only have to construct oneAaron Patterson2013-09-237-21/+21
| | | | | | |
* | | | | | | reuse the same preloader object for each associationAaron Patterson2013-09-231-2/+2
| | | | | | |
* | | | | | | remove state from the preloaderAaron Patterson2013-09-233-28/+18
| | | | | | |
* | | | | | | pass the scope all the way down to the constructorsAaron Patterson2013-09-231-10/+10
| | | | | | |
* | | | | | | only do the should_reset test onceAaron Patterson2013-09-231-6/+6
| | | | | | |
* | | | | | | fix variable names and speed up relation orderingAaron Patterson2013-09-232-16/+12
| | | | | | |
* | | | | | | hm:t preloading will respect order set on the RHS associationAaron Patterson2013-09-235-8/+53
| | | | | | |