Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update new tests in cascaded_eager_loading_test.rb to work with the modified ↵ | Jon Leighton | 2010-10-31 | 1 | -6/+6 |
| | | | | fixtures in this branch | ||||
* | Fix bug with 0bb85ed9ffa9808926b46e8f7e59cab5b85ac19f which missed out a ↵ | Jon Leighton | 2010-10-31 | 1 | -1/+2 |
| | | | | fixtures declaration in cascaded_eager_loading_test.rb | ||||
* | Fix naughty trailing whitespace | Jon Leighton | 2010-10-31 | 21 | -259/+259 |
| | |||||
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-31 | 16 | -43/+121 |
|\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-10-30 | 4 | -5/+7 |
| |\ | |||||
| | * | reverting last change to javascript helper; needs more investigation | Aditya Sanghi | 2010-10-29 | 1 | -1/+1 |
| | | | |||||
| | * | fixed javascript helper doc to close issue #10 raised by jialin | Aditya Sanghi | 2010-10-29 | 1 | -1/+1 |
| | | | |||||
| | * | Changed environment.rb to application.rb | Ugis Ozols | 2010-10-25 | 1 | -1/+1 |
| | | | |||||
| | * | Reworded sentence using text from rails source code. | Ugis Ozols | 2010-10-25 | 1 | -1/+1 |
| | | | |||||
| | * | Changed environment.rb to application.rb | Ugis Ozols | 2010-10-25 | 1 | -3/+3 |
| | | | |||||
| | * | added tip about ruby-debug needing a different gem if using 1.9 [#190 ↵ | Rob Zolkos | 2010-10-24 | 1 | -0/+2 |
| | | | | | | | | | | | | state:resolved] | ||||
| * | | 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] | ||||
| * | | adding tests for #5234 and #5184. Tests were from Akira Matsuda. Thanks Akira! | Aaron Patterson | 2010-10-30 | 2 | -0/+11 |
| | | | |||||
| * | | no need to merge where values if no new where values have been added | Aaron Patterson | 2010-10-30 | 1 | -11/+13 |
| | | | |||||
| * | | ruby-debug19 does not work with 1.9.3, so I am removing it | Aaron Patterson | 2010-10-30 | 1 | -4/+0 |
| | | | |||||
| * | | Convert :primary_key in association to a string before comparing to column ↵ | Denis Odorcic | 2010-10-30 | 3 | -1/+9 |
| | | | | | | | | | | | | 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 | 2 | -11/+63 |
| | | | | | | | | | | | | 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 |
| | | | |||||
| * | | Added missing AS require to active_model/naming.rb | snusnu | 2010-10-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We saw a failing spec when running the DataMapper ActiveModel compliance specs for dm-active_model. ActiveModel::Naming#model_name relies on the Module#parents method defined in active_support/core_ext/module/introspection.rb Adding the appropriate require statement of course fixed our specs. | ||||
* | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-28 | 116 | -632/+6546 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | |||||
| * | | fisting test name | Aaron Patterson | 2010-10-27 | 1 | -1/+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 | 2 | -6/+13 |
| | | | |||||
| * | | Ensure that Rails.env is defined first | Andrew White | 2010-10-27 | 1 | -1/+1 |
| | | | |||||
| * | | 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 | 2 | -0/+12 |
| | | | |||||
| * | | add a session authorization setter to the pg connection | Aaron Patterson | 2010-10-26 | 2 | -1/+13 |
| | | | |||||
| * | | avoiding statement cache if there are no bind values | Aaron Patterson | 2010-10-26 | 2 | -0/+23 |
| | | | |||||
| * | | 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 | 2 | -7/+19 |
| | | | |||||
| * | | bind parameters are now typecast | Aaron Patterson | 2010-10-26 | 2 | -1/+17 |
| | | | |||||
| * | | basic bind parameters are working | Aaron Patterson | 2010-10-26 | 2 | -1/+13 |
| | | | |||||
| * | | initial exec() method is working in pg adapter | Aaron Patterson | 2010-10-26 | 2 | -0/+55 |
| | | | |||||
| * | | 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 | 4 | -5/+11 |
| | | | |||||
| * | | mysql tests are mostly passing | Aaron Patterson | 2010-10-26 | 3 | -20/+126 |
| | | |