Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename nested_has_many_through_associations_test.rb because it does not only ↵ | Jon Leighton | 2010-10-19 | 1 | -1/+1 |
| | | | | concern has_many associations | ||||
* | Add explicit ordering in relations_test.rb, as the lack of this was causing ↵ | Jon Leighton | 2010-10-19 | 1 | -9/+9 |
| | | | | failures against postgres | ||||
* | Add explicit ordering to nested_has_many_through_associations_test.rb as ↵ | Jon Leighton | 2010-10-19 | 1 | -32/+37 |
| | | | | this was causing failures under postgres | ||||
* | Remove obsolete require to active_record/associations/nested_has_many_through | Jon Leighton | 2010-10-19 | 1 | -1/+0 |
| | |||||
* | Fix typo | Jon Leighton | 2010-10-19 | 1 | -1/+1 |
| | |||||
* | Remove obsolete autoload | Jon Leighton | 2010-10-19 | 1 | -1/+0 |
| | |||||
* | Add a CHANGELOG entry about nested through associations | Jon Leighton | 2010-10-19 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-19 | 13 | -44/+65 |
|\ | |||||
| * | "instance_methods" includes public and protected | Aaron Patterson | 2010-10-19 | 1 | -1/+1 |
| | | |||||
| * | Use ALTER INDEX syntax to rename an index | Michał Łomnicki | 2010-10-19 | 1 | -0/+4 |
| | | |||||
| * | Merge CHANGELOGs from 3-0-stable | Santiago Pastorino | 2010-10-18 | 1 | -0/+4 |
| | | |||||
| * | No need for parenthesis here | Santiago Pastorino | 2010-10-17 | 1 | -1/+1 |
| | | |||||
| * | no need to check for nil | Neeraj Singh | 2010-10-17 | 2 | -4/+4 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | replace if ! with unless | Neeraj Singh | 2010-10-17 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | should sort these ids before asserting they are equal! | Aaron Patterson | 2010-10-15 | 1 | -1/+1 |
| | | |||||
| * | testing that symbols work as sql literals | Aaron Patterson | 2010-10-15 | 1 | -0/+5 |
| | | |||||
| * | in regexps, the dot in a character class is not a metacharacter | Xavier Noria | 2010-10-15 | 2 | -3/+3 |
| | | |||||
| * | #transaction on the instance level should take options as well | Carl Lerche | 2010-10-14 | 2 | -2/+23 |
| | | |||||
| * | Revert 0c0b0aa0f223523331afdc157fb3992a121bf497 which introduced a security ↵ | Michael Koziarski | 2010-10-15 | 2 | -23/+20 |
| | | | | | | | | | | | | | | | | | | | | vulnerability. This addresses CVE-2010-3933 Conflicts: activerecord/lib/active_record/nested_attributes.rb | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-10-14 | 1 | -10/+0 |
| |\ | |||||
| | * | Remove doc for debugging callbacks. Methods don't exist in Rails master | Rafael Mendonça França | 2010-10-13 | 1 | -10/+0 |
| | | | |||||
* | | | Add some API documentation about nested through associations | Jon Leighton | 2010-10-19 | 1 | -8/+52 |
| | | | |||||
* | | | Add some comments for ThroughReflection#through_reflection_chain | Jon Leighton | 2010-10-19 | 1 | -1/+10 |
| | | | |||||
* | | | Remove various comments and code which were just being used during the ↵ | Jon Leighton | 2010-10-19 | 5 | -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.rb | Jon Leighton | 2010-10-19 | 5 | -2/+80 |
| | | | |||||
* | | | Fix broken test | Jon Leighton | 2010-10-19 | 1 | -1/+5 |
| | | | |||||
* | | | Small refactoring | Jon Leighton | 2010-10-19 | 1 | -6/+2 |
| | | | |||||
* | | | Support the :primary_key option on a through reflection in a nested through ↵ | Jon Leighton | 2010-10-19 | 6 | -7/+32 |
| | | | | | | | | | | | | association | ||||
* | | | Bugfix/refactoring | Jon Leighton | 2010-10-19 | 3 | -11/+20 |
| | | | |||||
* | | | Remove unused methods | Jon Leighton | 2010-10-19 | 1 | -11/+0 |
| | | | |||||
* | | | Support for :primary_key option on the source reflection of a through ↵ | Jon Leighton | 2010-10-19 | 10 | -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 Leighton | 2010-10-19 | 9 | -11/+65 |
| | | | | | | | | | | | | through associations | ||||
* | | | Properly support conditions on any of the reflections involved in a nested ↵ | Jon Leighton | 2010-10-19 | 16 | -98/+235 |
| | | | | | | | | | | | | through association | ||||
* | | | Refactoring: replace the mix of variables like @finder_sql, @counter_sql, ↵ | Jon Leighton | 2010-10-17 | 11 | -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 only | Jon Leighton | 2010-10-15 | 6 | -9/+82 |
| | | | |||||
* | | | Fix small bug which was shown by the last commit | Jon Leighton | 2010-10-15 | 1 | -1/+1 |
| | | | |||||
* | | | Add assertions for nested through associations loaded by includes with ↵ | Jon Leighton | 2010-10-15 | 1 | -81/+75 |
| | | | | | | | | | | | | conditions (uses the single-query strategy). Currently one failure to fix. | ||||
* | | | Support preloading nested through associations (using the default ↵ | Jon Leighton | 2010-10-15 | 2 | -122/+216 |
| | | | | | | | | | | | | multi-query strategy) | ||||
* | | | Remove unnecessary requires from nested_has_many_through_associations_test.rb | Jon Leighton | 2010-10-14 | 1 | -6/+0 |
| | | | |||||
* | | | Add test_has_one_through_has_one_through_with_belongs_to_source_reflection | Jon Leighton | 2010-10-14 | 7 | -4/+31 |
| | | | |||||
* | | | Add test_has_many_through_belongs_to_with_has_many_through_source_reflection ↵ | Jon Leighton | 2010-10-14 | 2 | -2/+15 |
| | | | | | | | | | | | | (which already passes) | ||||
* | | | Add test_has_many_through_has_many_through_with_belongs_to_source_reflection ↵ | Jon Leighton | 2010-10-14 | 2 | -1/+13 |
| | | | | | | | | | | | | (which already works) | ||||
* | | | Added ↵ | Jon Leighton | 2010-10-14 | 5 | -4/+30 |
| | | | | | | | | | | | | test_has_many_through_has_many_with_has_many_through_habtm_source_reflection and make it pass | ||||
* | | | Fix bug in previous refactoring | Jon Leighton | 2010-10-14 | 1 | -6/+6 |
| | | | |||||
* | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-14 | 29 | -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 Sarnacki | 2010-10-14 | 1 | -1/+1 |
| | | | | | | | | | | | | NOTEs, also puts to stdin | ||||
| * | | clear any stale connections before messing with threaded tests | Aaron Patterson | 2010-10-13 | 1 | -0/+1 |
| | | | |||||
| * | | Update the ActiveRecord tests to not set unused options | Carl Lerche | 2010-10-13 | 3 | -19/+0 |
| | | | | | | | | | This makes a test fail, but it is revealing a bug in Arel master. | ||||
| * | | Update the PostgreSQL adapter documentation | Carl Lerche | 2010-10-13 | 1 | -2/+0 |
| | | | |||||
| * | | rb_thread_select should always be used in DB drivers when available. | Carl Lerche | 2010-10-13 | 1 | -1/+1 |
| | | |