Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 160 | -1320/+8646 |
|\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb activerecord/test/cases/associations/cascaded_eager_loading_test.rb | ||||
| * | Remove :cache => true on lookup templates initialization. | José Valim | 2010-10-14 | 7 | -53/+3 |
| | | |||||
| * | SReorganize autoloads slightly and move two files to lib/action_view root. | José Valim | 2010-10-14 | 5 | -11/+8 |
| | | |||||
| * | render :once should consider the current controller prefix. | José Valim | 2010-10-14 | 5 | -13/+41 |
| | | |||||
| * | Comment internal railties tasks. | José Valim | 2010-10-14 | 1 | -1/+1 |
| | | |||||
| * | Use railtie_name to correctly get name from plugins | Piotr Sarnacki | 2010-10-14 | 1 | -1/+1 |
| | | |||||
| * | Remove task for creating symlinks for railties | Piotr Sarnacki | 2010-10-14 | 2 | -76/+0 |
| | | |||||
| * | Update documentation for new tasks | Piotr Sarnacki | 2010-10-14 | 1 | -7/+8 |
| | | |||||
| * | Add task foo:install (where foo is plugin) as a shortcutinstall:migrations ↵ | Piotr Sarnacki | 2010-10-14 | 2 | -0/+30 |
| | | | | | | | | and foo:install:assets | ||||
| * | Added foo:install:assets task that copies assets from plugins public ↵ | Piotr Sarnacki | 2010-10-14 | 3 | -5/+47 |
| | | | | | | | | | | | | | | | | | | | | | | directory to application's public directory This is the most simple and naive approach: just copy every files from engine to app. The only exception is when file has changed, in that case developer will be asked if he wants to rename the field. There is no need to make this task more sophisticated as 3.1 will be shipped with better assets handling and it will be the default way to handle things. | ||||
| * | Do not treat information about skipped migrations as WARNINGs but as a ↵ | Piotr Sarnacki | 2010-10-14 | 3 | -6/+12 |
| | | | | | | | | NOTEs, also puts to stdin | ||||
| * | Revert "speeding up flattened version of OrderedHash.[]" | Aaron Patterson | 2010-10-13 | 1 | -2/+3 |
| | | | | | | | | This reverts commit 9c53e82d66d0c34b8f35609b7972f28521d5794d. | ||||
| * | speeding up flattened version of OrderedHash.[] | Aaron Patterson | 2010-10-13 | 1 | -3/+2 |
| | | |||||
| * | refactor delete a little | Aaron Patterson | 2010-10-13 | 1 | -4/+1 |
| | | |||||
| * | use unless instead of if ! | Aaron Patterson | 2010-10-13 | 1 | -1/+1 |
| | | |||||
| * | 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 |
| | | |||||
| * | 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. | ||||
| * | Add some tests for functionality in JoinAssociation which already exists but ↵ | Jon Leighton | 2010-10-13 | 7 | -12/+43 |
| | | | | | | | | was previously untested | ||||
| * | stop using deprecated arel API | Aaron Patterson | 2010-10-12 | 1 | -2/+2 |
| | | |||||
| * | getting started guide: deletes orphan <% end %>, reported by Michael L. Miller | Xavier Noria | 2010-10-12 | 1 | -1/+0 |
| | | |||||
| * | fixes spelling of jQuery and Prototype | Xavier Noria | 2010-10-12 | 1 | -1/+1 |
| | | |||||
| * | 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 | 3 | -5/+19 |
| | | |||||
| * | 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 |
| | |