Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Honor distinct option when used with count operation after group clause ↵ | Marcelo Giorgi | 2010-10-11 | 1 | -4/+8 |
| | | | | | | | | [#5721 state:resolved] | ||||
| * | reorder removed in favor of except(:order).order | Santiago Pastorino | 2010-10-11 | 3 | -21/+3 |
| | | |||||
| * | Updated DOCS for engines and added a couple TODOs. Also, commented internal ↵ | José Valim | 2010-10-11 | 1 | -1/+1 |
| | | | | | | | | railties rake tasks description. | ||||
| * | Always pull in version for frameworks (standardize autoload / require / none) | wycats | 2010-10-10 | 1 | -2/+2 |
| | | |||||
| * | Rename rake railties:copy_migrations to rake railties:install:migrations and ↵ | Piotr Sarnacki | 2010-10-09 | 1 | -23/+25 |
| | | | | | | | | fix it to work with new copying strategy | ||||
| * | Add callback on skipped migration while copying migrations | Piotr Sarnacki | 2010-10-09 | 1 | -7/+20 |
| | | |||||
| * | Change the method for copying migrations, do not add scope. | Piotr Sarnacki | 2010-10-09 | 1 | -9/+9 |
| | | | | | | | | | | | | | | The purpose of this change is to allow copying fail on the same names. Migrations change database and they should be treated with caution, if 2 migrations are named the same it's much better to skip migration and allow user decide if it should be copied or not. | ||||
| * | removing false comment | Aaron Patterson | 2010-10-07 | 1 | -2/+0 |
| | | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-10-06 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix serialization :include option name | Evgeniy Dolzhenko | 2010-10-01 | 1 | -1/+1 |
| | | | |||||
| * | | fix ruby 1.9 deadlock problem, fixes #5736 add connection pool tests | Hemant Kumar | 2010-10-06 | 1 | -8/+6 |
| | | | |||||
| * | | Provide a cleaner syntax for paths configuration that does not rely on ↵ | José Valim | 2010-10-06 | 1 | -3/+3 |
| | | | | | | | | | | | | method_missing. | ||||
* | | | Add ↵ | Jon Leighton | 2010-10-13 | 1 | -3/+28 |
| | | | | | | | | | | | | test_has_many_through_has_and_belongs_to_many_with_has_many_source_reflection and make it work | ||||
* | | | Refactoring ThroughAssociationScope#construct_through_joins | Jon Leighton | 2010-10-13 | 1 | -54/+62 |
| | | | |||||
* | | | First bit of support for habtm in through assocs - ↵ | Jon Leighton | 2010-10-13 | 2 | -23/+67 |
| | | | | | | | | | | | | test_has_many_through_has_many_with_has_and_belongs_to_many_source_reflection now passes | ||||
* | | | Hook ThroughAssociationScope up to use the AliasTracker class | Jon Leighton | 2010-10-13 | 1 | -9/+30 |
| | | | |||||
* | | | Some small tweaks on the last commit | Jon Leighton | 2010-10-12 | 2 | -19/+12 |
| | | | |||||
* | | | Extract aliasing code from JoinDependency and JoinAssociation into a ↵ | Jon Leighton | 2010-10-12 | 2 | -41/+83 |
| | | | | | | | | | | | | separate AliasTracker class. This can then be used by ThroughAssociationScope as well. |