aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Respect the :primary_key option on the through_reflection of (non-nested) ↵Jon Leighton2010-10-193-8/+8
| | | | through associations
* Properly support conditions on any of the reflections involved in a nested ↵Jon Leighton2010-10-193-76/+119
| | | | 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-155-9/+40
|
* Fix small bug which was shown by the last commitJon Leighton2010-10-151-1/+1
|
* Support preloading nested through associations (using the default ↵Jon Leighton2010-10-151-61/+76
| | | | multi-query strategy)
* Added ↵Jon Leighton2010-10-141-2/+6
| | | | 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-1414-119/+111
|\ | | | | | | | | | | 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
| * Update the ActiveRecord tests to not set unused optionsCarl Lerche2010-10-131-15/+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
| |
| * Delete unused methods in JoinAssociationJon Leighton2010-10-131-8/+0
| |
| * Renaming and formatting changes in JoinDependencyJon Leighton2010-10-132-49/+56
| |
| * Refactor JoinDependency and friends so that a JoinAssociation can produce an ↵Jon Leighton2010-10-132-157/+266
| | | | | | | | arbitrary number of joins, which will be needed in order to support nested through associations.
| * stop using deprecated arel APIAaron Patterson2010-10-121-2/+2
| |
| * dry up column type testingAaron Patterson2010-10-121-5/+5
| |
| * all columns respond to string_to_binary, so no need to check respond_to?Aaron Patterson2010-10-122-2/+11
| |
| * drying up true and false casesAaron Patterson2010-10-121-3/+7
| |
| * reducing comparisons in when statementsAaron Patterson2010-10-121-6/+6
| |
| * removing intermediate variablesAaron Patterson2010-10-121-2/+1
| |
| * reduce the number of times we test for the column variableAaron Patterson2010-10-121-2/+5
| |
| * refactoring date / time / datetime when statementAaron Patterson2010-10-121-11/+8
| |
| * fixing case / when indentationAaron Patterson2010-10-121-20/+20
| |
| * we should always cast the value based on the columnAaron Patterson2010-10-111-1/+1
| |
| * removing freezeAaron Patterson2010-10-111-3/+3
| |
| * Honor distinct option when used with count operation after group clause ↵Marcelo Giorgi2010-10-111-4/+8
| | | | | | | | [#5721 state:resolved]
| * reorder removed in favor of except(:order).orderSantiago Pastorino2010-10-113-21/+3
| |
| * Updated DOCS for engines and added a couple TODOs. Also, commented internal ↵José Valim2010-10-111-1/+1
| | | | | | | | railties rake tasks description.
| * Rename rake railties:copy_migrations to rake railties:install:migrations and ↵Piotr Sarnacki2010-10-091-23/+25
| | | | | | | | fix it to work with new copying strategy
| * Add callback on skipped migration while copying migrationsPiotr Sarnacki2010-10-091-7/+20
| |
| * Change the method for copying migrations, do not add scope.Piotr Sarnacki2010-10-091-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 commentAaron Patterson2010-10-071-2/+0
| |
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-061-1/+1
| |\
| | * Fix serialization :include option nameEvgeniy Dolzhenko2010-10-011-1/+1
| | |
| * | fix ruby 1.9 deadlock problem, fixes #5736 add connection pool testsHemant Kumar2010-10-061-8/+6
| | |
| * | Provide a cleaner syntax for paths configuration that does not rely on ↵José Valim2010-10-061-3/+3
| | | | | | | | | | | | method_missing.
* | | Add ↵Jon Leighton2010-10-131-3/+28
| | | | | | | | | | | | test_has_many_through_has_and_belongs_to_many_with_has_many_source_reflection and make it work
* | | Refactoring ThroughAssociationScope#construct_through_joinsJon Leighton2010-10-131-54/+62
| | |
* | | First bit of support for habtm in through assocs - ↵Jon Leighton2010-10-132-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 classJon Leighton2010-10-131-9/+30
| | |
* | | Some small tweaks on the last commitJon Leighton2010-10-122-19/+12
| | |
* | | Extract aliasing code from JoinDependency and JoinAssociation into a ↵Jon Leighton2010-10-122-41/+83
| | | | | | | | | | | | separate AliasTracker class. This can then be used by ThroughAssociationScope as well.
* | | Add a commented, failing test for using a habtm in a has many through ↵Jon Leighton2010-10-121-46/+50
| | | | | | | | | | | | association. I want to refactor how aliasing works first.
* | | Adding test_has_many_through_has_one_with_has_many_through_source_reflection ↵Jon Leighton2010-10-121-1/+1
| | | | | | | | | | | | and modifying ThroughAssociationScope to make it work correctly.
* | | Support has_one through assocs as the source associationJon Leighton2010-10-121-10/+21
| | |
* | | Refactoring to remove duplication introduced by the last commitJon Leighton2010-10-101-160/+145
| | |
* | | Add support for nested through associations in JoinAssociation. Hence ↵Jon Leighton2010-10-092-89/+89
| | | | | | | | | | | | Foo.joins(:bar) will work for through associations. There is some duplicated code now, which will be refactored.
* | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-069-65/+95
|\| |