aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-0822-134/+144
|\ | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * Update the validates_uniqueness_of documentation to tell you to use a unique ↵Michael Koziarski2010-11-081-25/+17
| | | | | | | | | | | | index. The other options mentioned were not good ideas and disclaimed as such in the documentation.
| * use column names as order by complex function parameters, fix for postgresql ↵Raimonds Simanovskis2010-11-072-13/+3
| | | | | | | | | | | | adapter to correctly remove ASC/DESC Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * reduce duplication in assiciations #construct()Aaron Patterson2010-11-061-9/+3
| |
| * make sure we keep parent records in orderAaron Patterson2010-11-061-6/+6
| |
| * only call to_s on the association variable onceAaron Patterson2010-11-051-2/+5
| |
| * simplify instantiate in the join parts objectAaron Patterson2010-11-051-8/+7
| |
| * index is not used, so removing itAaron Patterson2010-11-051-1/+1
| |
| * reduce method calls to the join base objectAaron Patterson2010-11-051-4/+6
| |
| * stop recursively calling exists?Aaron Patterson2010-11-051-3/+5
| |
| * Avoid warning: shadowing outer local variableSantiago Pastorino2010-11-051-2/+2
| |
| * Fixes queries using limits and punctuation in order, removes order("col1, ↵Santiago Pastorino2010-11-055-8/+29
| | | | | | | | | | | | col2") usage in favor of order(["col1", "col2"}) [#4597 state:committed]
| * renaming exec in the mysql adapterAaron Patterson2010-11-052-15/+15
| |
| * renaming exec in the PG adapterAaron Patterson2010-11-053-14/+14
| |
| * converted exec to exec_query for sqliteAaron Patterson2010-11-054-27/+27
| |
| * Association Proxy should not undefine the default respond_to_missingsblackstone2010-11-041-1/+1
| |
| * ignoring certain SQL when using OracleAaron Patterson2010-11-031-0/+4
| |
| * select goes through exec(), so no method chaining for query countsAaron Patterson2010-11-031-12/+0
| |
| * use bind params in select with query monkeypatchAaron Patterson2010-11-031-2/+2
| |
| * Make should_record_timestamps? serialization aware rather than object#changed?Pratik Naik2010-11-022-5/+1
| |
| * Ensure save always updates timestamps when serialized attributes are presentPratik Naik2010-11-022-0/+18
| |
| * Add timestamps to TopicPratik Naik2010-11-023-6/+7
| |
* | Update new tests in cascaded_eager_loading_test.rb to work with the modified ↵Jon Leighton2010-10-311-6/+6
| | | | | | | | fixtures in this branch
* | Fix bug with 0bb85ed9ffa9808926b46e8f7e59cab5b85ac19f which missed out a ↵Jon Leighton2010-10-311-1/+2
| | | | | | | | fixtures declaration in cascaded_eager_loading_test.rb
* | Fix naughty trailing whitespaceJon Leighton2010-10-3121-259/+259
| |
* | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-3110-34/+113
|\| | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb
| * only returning where values for the corresponding relation, also filtering ↵Aaron Patterson2010-10-302-6/+12
| | | | | | | | where value hash based on table name [#5234 state:resolved] [#5184 state:resolved]
| * adding tests for #5234 and #5184. Tests were from Akira Matsuda. Thanks Akira!Aaron Patterson2010-10-302-0/+11
| |
| * no need to merge where values if no new where values have been addedAaron Patterson2010-10-301-11/+13
| |
| * Convert :primary_key in association to a string before comparing to column ↵Denis Odorcic2010-10-303-1/+9
| | | | | | | | names, so that for example :primary_key => :another_pk works as well [#5605 state:resolved]
| * refactoring find_join_associationAaron Patterson2010-10-301-5/+6
| |
| * Fix issues when including the same association multiple times and mixing ↵Ernie Miller2010-10-302-11/+63
| | | | | | | | joins/includes together.
| * Refactoring: replace the mix of variables like @finder_sql, @counter_sql, ↵Jon Leighton2010-10-3011-159/+146
| | | | | | | | 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.
| * only do string substitution on column names once, remove intermediate data ↵Aaron Patterson2010-10-301-7/+6
| | | | | | | | structures
| * columns are always stringsAaron Patterson2010-10-301-1/+1
| |
| * no need to to_i, sqlite does that for usAaron Patterson2010-10-301-2/+2
| |
* | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-2839-209/+811
|\| | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/test/schema/schema.rb
| * select_all() should always return an array, so no need to testAaron Patterson2010-10-271-9/+1
| |
| * fisting test nameAaron Patterson2010-10-271-1/+1
| |
| * speeding up query cacheAaron Patterson2010-10-272-5/+4
| |
| * making query cache work with prepared statementsAaron Patterson2010-10-272-6/+13
| |
| * renaming bind_values to binds where it makes senseAaron Patterson2010-10-265-19/+19
| |
| * adding backwards compatibility for non-prepare statement handling driversAaron Patterson2010-10-264-2/+34
| |
| * caching column valuesAaron Patterson2010-10-261-4/+11
| |
| * setting the authorized session clears the statement cacheAaron Patterson2010-10-262-0/+12
| |
| * add a session authorization setter to the pg connectionAaron Patterson2010-10-262-1/+13
| |
| * avoiding statement cache if there are no bind valuesAaron Patterson2010-10-262-0/+23
| |
| * folding async_exec to execAaron Patterson2010-10-261-7/+0
| |
| * clear cache before resetting the connectionAaron Patterson2010-10-261-1/+1
| |
| * prepare the statement before we cache the keyAaron Patterson2010-10-261-2/+4
| |