aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Remove obsolete require to active_record/associations/nested_has_many_throughJon Leighton2010-10-191-1/+0
|
* Fix typoJon Leighton2010-10-191-1/+1
|
* Remove obsolete autoloadJon Leighton2010-10-191-1/+0
|
* Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-199-30/+23
|\
| * "instance_methods" includes public and protectedAaron Patterson2010-10-191-1/+1
| |
| * Use ALTER INDEX syntax to rename an indexMichał Łomnicki2010-10-191-0/+4
| |
| * No need for parenthesis hereSantiago Pastorino2010-10-171-1/+1
| |
| * no need to check for nilNeeraj Singh2010-10-172-4/+4
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * replace if ! with unlessNeeraj Singh2010-10-171-1/+1
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * in regexps, the dot in a character class is not a metacharacterXavier Noria2010-10-152-3/+3
| |
| * #transaction on the instance level should take options as wellCarl Lerche2010-10-141-2/+2
| |
| * Revert 0c0b0aa0f223523331afdc157fb3992a121bf497 which introduced a security ↵Michael Koziarski2010-10-151-9/+8
| | | | | | | | | | | | | | | | | | | | vulnerability. This addresses CVE-2010-3933 Conflicts: activerecord/lib/active_record/nested_attributes.rb
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-141-10/+0
| |\
| | * Remove doc for debugging callbacks. Methods don't exist in Rails masterRafael Mendonça França2010-10-131-10/+0
| | |
* | | Add some API documentation about nested through associationsJon Leighton2010-10-191-8/+52
| | |
* | | Add some comments for ThroughReflection#through_reflection_chainJon Leighton2010-10-191-1/+10
| | |
* | | Remove various comments and code which were just being used during the ↵Jon Leighton2010-10-194-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.rbJon Leighton2010-10-191-2/+13
| | |
* | | Small refactoringJon Leighton2010-10-191-6/+2
| | |
* | | Support the :primary_key option on a through reflection in a nested through ↵Jon Leighton2010-10-191-5/+2
| | | | | | | | | | | | association
* | | Bugfix/refactoringJon Leighton2010-10-193-11/+20
| | |
* | | Remove unused methodsJon Leighton2010-10-191-11/+0
| | |
* | | Support for :primary_key option on the source reflection of a through ↵Jon Leighton2010-10-193-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 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
| | |