Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-08 | 9 | -73/+65 |
|\ | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | Update the validates_uniqueness_of documentation to tell you to use a unique ↵ | Michael Koziarski | 2010-11-08 | 1 | -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 Simanovskis | 2010-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | adapter to correctly remove ASC/DESC Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | reduce duplication in assiciations #construct() | Aaron Patterson | 2010-11-06 | 1 | -9/+3 |
| | | |||||
| * | make sure we keep parent records in order | Aaron Patterson | 2010-11-06 | 1 | -6/+6 |
| | | |||||
| * | only call to_s on the association variable once | Aaron Patterson | 2010-11-05 | 1 | -2/+5 |
| | | |||||
| * | simplify instantiate in the join parts object | Aaron Patterson | 2010-11-05 | 1 | -8/+7 |
| | | |||||
| * | index is not used, so removing it | Aaron Patterson | 2010-11-05 | 1 | -1/+1 |
| | | |||||
| * | reduce method calls to the join base object | Aaron Patterson | 2010-11-05 | 1 | -4/+6 |
| | | |||||
| * | stop recursively calling exists? | Aaron Patterson | 2010-11-05 | 1 | -3/+5 |
| | | |||||
| * | Avoid warning: shadowing outer local variable | Santiago Pastorino | 2010-11-05 | 1 | -2/+2 |
| | | |||||
| * | Fixes queries using limits and punctuation in order, removes order("col1, ↵ | Santiago Pastorino | 2010-11-05 | 2 | -4/+4 |
| | | | | | | | | | | | | col2") usage in favor of order(["col1", "col2"}) [#4597 state:committed] | ||||
| * | renaming exec in the mysql adapter | Aaron Patterson | 2010-11-05 | 1 | -2/+2 |
| | | |||||
| * | renaming exec in the PG adapter | Aaron Patterson | 2010-11-05 | 1 | -3/+3 |
| | | |||||
| * | converted exec to exec_query for sqlite | Aaron Patterson | 2010-11-05 | 2 | -12/+12 |
| | | |||||
| * | Association Proxy should not undefine the default respond_to_missing | sblackstone | 2010-11-04 | 1 | -1/+1 |
| | | |||||
| * | Make should_record_timestamps? serialization aware rather than object#changed? | Pratik Naik | 2010-11-02 | 2 | -5/+1 |
| | | |||||
| * | Ensure save always updates timestamps when serialized attributes are present | Pratik Naik | 2010-11-02 | 1 | -0/+4 |
| | | |||||
* | | Fix naughty trailing whitespace | Jon Leighton | 2010-10-31 | 7 | -133/+133 |
| | | |||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-31 | 5 | -34/+68 |
|\| | | | | | | | | | | | 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 Patterson | 2010-10-30 | 2 | -6/+12 |
| | | | | | | | | where value hash based on table name [#5234 state:resolved] [#5184 state:resolved] | ||||
| * | no need to merge where values if no new where values have been added | Aaron Patterson | 2010-10-30 | 1 | -11/+13 |
| | | |||||
| * | Convert :primary_key in association to a string before comparing to column ↵ | Denis Odorcic | 2010-10-30 | 1 | -1/+1 |
| | | | | | | | | names, so that for example :primary_key => :another_pk works as well [#5605 state:resolved] | ||||
| * | refactoring find_join_association | Aaron Patterson | 2010-10-30 | 1 | -5/+6 |
| | | |||||
| * | Fix issues when including the same association multiple times and mixing ↵ | Ernie Miller | 2010-10-30 | 1 | -11/+37 |
| | | | | | | | | joins/includes together. | ||||
| * | Refactoring: replace the mix of variables like @finder_sql, @counter_sql, ↵ | Jon Leighton | 2010-10-30 | 11 | -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 Patterson | 2010-10-30 | 1 | -7/+6 |
| | | | | | | | | structures | ||||
| * | columns are always strings | Aaron Patterson | 2010-10-30 | 1 | -1/+1 |
| | | |||||
| * | no need to to_i, sqlite does that for us | Aaron Patterson | 2010-10-30 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-28 | 17 | -126/+386 |
|\| | | | | | | | | | | | | | | | 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 test | Aaron Patterson | 2010-10-27 | 1 | -9/+1 |
| | | |||||
| * | speeding up query cache | Aaron Patterson | 2010-10-27 | 2 | -5/+4 |
| | | |||||
| * | making query cache work with prepared statements | Aaron Patterson | 2010-10-27 | 1 | -6/+7 |
| | | |||||
| * | renaming bind_values to binds where it makes sense | Aaron Patterson | 2010-10-26 | 5 | -19/+19 |
| | | |||||
| * | adding backwards compatibility for non-prepare statement handling drivers | Aaron Patterson | 2010-10-26 | 4 | -2/+34 |
| | | |||||
| * | caching column values | Aaron Patterson | 2010-10-26 | 1 | -4/+11 |
| | | |||||
| * | setting the authorized session clears the statement cache | Aaron Patterson | 2010-10-26 | 1 | -0/+1 |
| | | |||||
| * | add a session authorization setter to the pg connection | Aaron Patterson | 2010-10-26 | 1 | -0/+5 |
| | | |||||
| * | avoiding statement cache if there are no bind values | Aaron Patterson | 2010-10-26 | 1 | -0/+11 |
| | | |||||
| * | folding async_exec to exec | Aaron Patterson | 2010-10-26 | 1 | -7/+0 |
| | | |||||
| * | clear cache before resetting the connection | Aaron Patterson | 2010-10-26 | 1 | -1/+1 |
| | | |||||
| * | prepare the statement before we cache the key | Aaron Patterson | 2010-10-26 | 1 | -2/+4 |
| | | |||||
| * | bind substitution is working properly | Aaron Patterson | 2010-10-26 | 1 | -7/+11 |
| | | |||||
| * | bind parameters are now typecast | Aaron Patterson | 2010-10-26 | 1 | -1/+3 |
| | | |||||
| * | basic bind parameters are working | Aaron Patterson | 2010-10-26 | 1 | -1/+1 |
| | | |||||
| * | initial exec() method is working in pg adapter | Aaron Patterson | 2010-10-26 | 1 | -0/+38 |
| | | |||||
| * | monkey patching with enumerable so we can call each | Aaron Patterson | 2010-10-26 | 1 | -10/+4 |
| | | |||||
| * | monkey patching Mysql::Stmt, calling free on the metadata | Aaron Patterson | 2010-10-26 | 1 | -4/+9 |
| | | |||||
| * | free the result after slurping | Aaron Patterson | 2010-10-26 | 1 | -0/+1 |
| | | |||||
| * | eliminating some calls to execute() | Aaron Patterson | 2010-10-26 | 1 | -5/+2 |
| | |