aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Update AR reload doc for the case of manually set primary key attribute [ci s...Anatoli Makarevich2013-10-021-2/+11
* 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
* Merge pull request #12383 from marclennox/masterRafael Mendonça França2013-09-291-2/+2
|\
| * 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
|\ \
| * | Use TS::Cache instead of Mutex + Hash.thedarkone2013-09-281-12/+8
| |/
* | Merge pull request #11496 from jetthoughts/11376_has_many_assoc_respect_scope...Rafael Mendonça França2013-09-281-4/+0
|\ \
| * | Removed where_values_hash from AR::NullRelationPaul Nikitochkin2013-09-281-4/+0
| |/
* | Merge pull request #12396 from arthurnn/cleanup_logsubsRafael Mendonça França2013-09-281-11/+2
|\ \
| * | Cleanup identitymap logger from LogSubscriberArthur Neves2013-09-281-11/+2
| |/
* | 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
* | 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 callbacksArthur Neves2013-09-251-0/+1
* | | Merge branch 'master' into preloadAaron Patterson2013-09-259-29/+58
|\| |
| * | Merge pull request #12290 from kennyj/fix_12278Andrew White2013-09-241-3/+11
| |\ \
| | * | ActiveRecord::ConnectionAdapters::Column.string_to_time method respects strin...kennyj2013-09-251-3/+11
| * | | assign_attributes should return if argument is blank.wangjohn2013-09-241-0/+1
| |/ /
| * | 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 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.wangjohn2013-08-221-5/+16
| * | | | Merge pull request #10816 from bogdan/less-dirty-dirtyRafael Mendonça França2013-09-233-13/+8
| * | | | Merge pull request #11382 from kennyj/fix_10751-2Rafael Mendonça França2013-09-221-3/+6
| |\ \ \ \
| | * | | | 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 U...kennyj2013-05-081-3/+3
| * | | | | | Add back options argument in the ActiveRecord::Base.initialize methodRafael Mendonça França2013-09-211-2/+10
* | | | | | | 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
* | | | | | | always populate the preloaded records instance variable so we can removeAaron Patterson2013-09-252-10/+5
* | | | | | | 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
* | | | | | | 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
* | | | | | | we can't sort by lhs since the middle records have difference classesAaron Patterson2013-09-231-19/+19
* | | | | | | 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