aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Rename nested_has_many_through_associations_test.rb because it does not only ↵Jon Leighton2010-10-191-1/+1
| | | | concern has_many associations
* Add explicit ordering in relations_test.rb, as the lack of this was causing ↵Jon Leighton2010-10-191-9/+9
| | | | failures against postgres
* Add explicit ordering to nested_has_many_through_associations_test.rb as ↵Jon Leighton2010-10-191-32/+37
| | | | this was causing failures under postgres
* Remove obsolete require to active_record/associations/nested_has_many_throughJon Leighton2010-10-191-1/+0
|
* Fix typoJon Leighton2010-10-191-1/+1
|
* Remove obsolete autoloadJon Leighton2010-10-191-1/+0
|
* Add a CHANGELOG entry about nested through associationsJon Leighton2010-10-191-0/+2
|
* Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-1913-44/+65
|\
| * "instance_methods" includes public and protectedAaron Patterson2010-10-191-1/+1
| |
| * Use ALTER INDEX syntax to rename an indexMichał Łomnicki2010-10-191-0/+4
| |
| * Merge CHANGELOGs from 3-0-stableSantiago Pastorino2010-10-181-0/+4
| |
| * No need for parenthesis hereSantiago Pastorino2010-10-171-1/+1
| |
| * no need to check for nilNeeraj Singh2010-10-172-4/+4
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * replace if ! with unlessNeeraj Singh2010-10-171-1/+1
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * should sort these ids before asserting they are equal!Aaron Patterson2010-10-151-1/+1
| |
| * testing that symbols work as sql literalsAaron Patterson2010-10-151-0/+5
| |
| * in regexps, the dot in a character class is not a metacharacterXavier Noria2010-10-152-3/+3
| |
| * #transaction on the instance level should take options as wellCarl Lerche2010-10-142-2/+23
| |
| * Revert 0c0b0aa0f223523331afdc157fb3992a121bf497 which introduced a security ↵Michael Koziarski2010-10-152-23/+20
| | | | | | | | | | | | | | | | | | | | vulnerability. This addresses CVE-2010-3933 Conflicts: activerecord/lib/active_record/nested_attributes.rb
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-141-10/+0
| |\
| | * Remove doc for debugging callbacks. Methods don't exist in Rails masterRafael Mendonça França2010-10-131-10/+0
| | |
* | | Add some API documentation about nested through associationsJon Leighton2010-10-191-8/+52
| | |
* | | Add some comments for ThroughReflection#through_reflection_chainJon Leighton2010-10-191-1/+10
| | |
* | | Remove various comments and code which were just being used during the ↵Jon Leighton2010-10-195-199/+0
| | | | | | | | | | | | development of nested through association support (OMFGZ, I might just have nearly finished this\!
* | | Add explicit tests for the nested through association changes in reflection.rbJon Leighton2010-10-195-2/+80
| | |
* | | Fix broken testJon Leighton2010-10-191-1/+5
| | |
* | | Small refactoringJon Leighton2010-10-191-6/+2
| | |
* | | Support the :primary_key option on a through reflection in a nested through ↵Jon Leighton2010-10-196-7/+32
| | | | | | | | | | | | association
* | | Bugfix/refactoringJon Leighton2010-10-193-11/+20
| | |
* | | Remove unused methodsJon Leighton2010-10-191-11/+0
| | |
* | | Support for :primary_key option on the source reflection of a through ↵Jon Leighton2010-10-1910-18/+41
| | | | | | | | | | | | association, where the source is a has_one or has_many
* | | Respect the :primary_key option on the through_reflection of (non-nested) ↵Jon Leighton2010-10-199-11/+65
| | | | | | | | | | | | through associations
* | | Properly support conditions on any of the reflections involved in a nested ↵Jon Leighton2010-10-1916-98/+235
| | | | | | | | | | | | through association
* | | Refactoring: replace the mix of variables like @finder_sql, @counter_sql, ↵Jon Leighton2010-10-1711-154/+138
| | | | | | | | | | | | etc with just a single scope hash (created on initialization of the proxy). This is now used consistently across all associations. Therefore, all you have to do to ensure finding/counting etc is done correctly is implement the scope correctly.
* | | Make sure nested through associations are read onlyJon Leighton2010-10-156-9/+82
| | |
* | | Fix small bug which was shown by the last commitJon Leighton2010-10-151-1/+1
| | |
* | | Add assertions for nested through associations loaded by includes with ↵Jon Leighton2010-10-151-81/+75
| | | | | | | | | | | | conditions (uses the single-query strategy). Currently one failure to fix.
* | | Support preloading nested through associations (using the default ↵Jon Leighton2010-10-152-122/+216
| | | | | | | | | | | | multi-query strategy)
* | | Remove unnecessary requires from nested_has_many_through_associations_test.rbJon Leighton2010-10-141-6/+0
| | |
* | | Add test_has_one_through_has_one_through_with_belongs_to_source_reflectionJon Leighton2010-10-147-4/+31
| | |
* | | Add test_has_many_through_belongs_to_with_has_many_through_source_reflection ↵Jon Leighton2010-10-142-2/+15
| | | | | | | | | | | | (which already passes)
* | | Add test_has_many_through_has_many_through_with_belongs_to_source_reflection ↵Jon Leighton2010-10-142-1/+13
| | | | | | | | | | | | (which already works)
* | | Added ↵Jon Leighton2010-10-145-4/+30
| | | | | | | | | | | | test_has_many_through_has_many_with_has_many_through_habtm_source_reflection and make it pass
* | | Fix bug in previous refactoringJon Leighton2010-10-141-6/+6
| | |
* | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-1429-163/+450
|\| | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb activerecord/test/cases/associations/cascaded_eager_loading_test.rb
| * | Do not treat information about skipped migrations as WARNINGs but as a ↵Piotr Sarnacki2010-10-141-1/+1
| | | | | | | | | | | | NOTEs, also puts to stdin
| * | clear any stale connections before messing with threaded testsAaron Patterson2010-10-131-0/+1
| | |
| * | Update the ActiveRecord tests to not set unused optionsCarl Lerche2010-10-133-19/+0
| | | | | | | | | This makes a test fail, but it is revealing a bug in Arel master.
| * | Update the PostgreSQL adapter documentationCarl Lerche2010-10-131-2/+0
| | |
| * | rb_thread_select should always be used in DB drivers when available.Carl Lerche2010-10-131-1/+1
| | |