Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | statements are cached, cache is cleared on reconnect | Aaron Patterson | 2010-10-26 | 1 | -2/+19 |
| | | |||||
| * | all mysql tests are passing | Aaron Patterson | 2010-10-26 | 1 | -2/+16 |
| | | |||||
| * | one more mysql test left! | Aaron Patterson | 2010-10-26 | 3 | -4/+10 |
| | | |||||
| * | mysql tests are mostly passing | Aaron Patterson | 2010-10-26 | 1 | -17/+65 |
| | | |||||
| * | find_one uses prepared statement cache | Aaron Patterson | 2010-10-26 | 2 | -1/+7 |
| | | |||||
| * | clearing statements on disconnect and reset | Aaron Patterson | 2010-10-26 | 1 | -0/+6 |
| | | |||||
| * | type casting bound value based on column associated with value | Aaron Patterson | 2010-10-26 | 1 | -1/+3 |
| | | |||||
| * | stop calling execute directly on the database connection | Aaron Patterson | 2010-10-26 | 1 | -2/+2 |
| | | |||||
| * | removing another execute | Aaron Patterson | 2010-10-26 | 1 | -1/+1 |
| | | |||||
| * | removing more execute calls | Aaron Patterson | 2010-10-26 | 1 | -2/+2 |
| | | |||||
| * | removing more calls to execute | Aaron Patterson | 2010-10-26 | 1 | -2/+2 |
| | | |||||
| * | removing some uses of execute | Aaron Patterson | 2010-10-26 | 1 | -4/+2 |
| | | |||||
| * | exec returns an AR::Result | Aaron Patterson | 2010-10-26 | 6 | -8/+61 |
| | | |||||
| * | adding bind_values to relations | Aaron Patterson | 2010-10-26 | 2 | -2/+9 |
| | | |||||
| * | adding bind value substitution | Aaron Patterson | 2010-10-26 | 1 | -0/+6 |
| | | |||||
| * | adding the abstract method | Aaron Patterson | 2010-10-26 | 1 | -0/+6 |
| | | |||||
| * | Revert "removing unused variable" | Aaron Patterson | 2010-10-26 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 3e4ede81d6b1ff3ea89eca33715a5a0d2f524dcf. | ||||
| * | refactor to remove `through_records` | Aaron Patterson | 2010-10-23 | 1 | -10/+7 |
| | | |||||
| * | removing dead code | Aaron Patterson | 2010-10-23 | 1 | -2/+0 |
| | |