Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-19 | 9 | -30/+23 |
|\ | |||||
| * | "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 |
| | | |||||
| * | 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> | ||||
| * | 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 | 1 | -2/+2 |
| | | |||||
| * | Revert 0c0b0aa0f223523331afdc157fb3992a121bf497 which introduced a security ↵ | Michael Koziarski | 2010-10-15 | 1 | -9/+8 |
| | | | | | | | | | | | | | | | | | | | | 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 | 4 | -194/+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 | 1 | -2/+13 |
| | | | |||||
* | | | 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 | 1 | -5/+2 |
| | | | | | | | | | | | | 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 | 3 | -8/+14 |
| | | | | | | | | | | | | 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 | 3 | -8/+8 |
| | | | | | | | | | | | | through associations | ||||
* | | | Properly support conditions on any of the reflections involved in a nested ↵ | Jon Leighton | 2010-10-19 | 3 | -76/+119 |
| | | | | | | | | | | | | 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 | 5 | -9/+40 |
| | | | |||||
* | | | Fix small bug which was shown by the last commit | Jon Leighton | 2010-10-15 | 1 | -1/+1 |
| | | | |||||
* | | | Support preloading nested through associations (using the default ↵ | Jon Leighton | 2010-10-15 | 1 | -61/+76 |
| | | | | | | | | | | | | multi-query strategy) | ||||
* | | | Added ↵ | Jon Leighton | 2010-10-14 | 1 | -2/+6 |
| | | | | | | | | | | | | 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 | 15 | -121/+113 |
|\| | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Update the ActiveRecord tests to not set unused options | Carl Lerche | 2010-10-13 | 1 | -15/+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 |
| | | | |||||
| * | | Delete unused methods in JoinAssociation | Jon Leighton | 2010-10-13 | 1 | -8/+0 |
| | | | |||||
| * | | Renaming and formatting changes in JoinDependency | Jon Leighton | 2010-10-13 | 2 | -49/+56 |
| | | | |||||
| * | | Refactor JoinDependency and friends so that a JoinAssociation can produce an ↵ | Jon Leighton | 2010-10-13 | 2 | -157/+266 |
| | | | | | | | | | | | | arbitrary number of joins, which will be needed in order to support nested through associations. | ||||
| * | | stop using deprecated arel API | Aaron Patterson | 2010-10-12 | 1 | -2/+2 |
| | | | |||||
| * | | dry up column type testing | Aaron Patterson | 2010-10-12 | 1 | -5/+5 |
| | | | |||||
| * | | all columns respond to string_to_binary, so no need to check respond_to? | Aaron Patterson | 2010-10-12 | 2 | -2/+11 |
| | | | |||||
| * | | drying up true and false cases | Aaron Patterson | 2010-10-12 | 1 | -3/+7 |
| | | | |||||
| * | | reducing comparisons in when statements | Aaron Patterson | 2010-10-12 | 1 | -6/+6 |
| | | | |||||
| * | | removing intermediate variables | Aaron Patterson | 2010-10-12 | 1 | -2/+1 |
| | | | |||||
| * | | reduce the number of times we test for the column variable | Aaron Patterson | 2010-10-12 | 1 | -2/+5 |
| | | | |||||
| * | | refactoring date / time / datetime when statement | Aaron Patterson | 2010-10-12 | 1 | -11/+8 |
| | | | |||||
| * | | fixing case / when indentation | Aaron Patterson | 2010-10-12 | 1 | -20/+20 |
| | | | |||||
| * | | we should always cast the value based on the column | Aaron Patterson | 2010-10-11 | 1 | -1/+1 |
| | | | |||||
| * | | removing freeze | Aaron Patterson | 2010-10-11 | 1 | -3/+3 |
| | | |