aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix naughty trailing whitespaceJon Leighton2010-10-3121-259/+259
|
* Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-3116-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/docrailsXavier Noria2010-10-304-5/+7
| |\
| | * reverting last change to javascript helper; needs more investigationAditya Sanghi2010-10-291-1/+1
| | |
| | * fixed javascript helper doc to close issue #10 raised by jialinAditya Sanghi2010-10-291-1/+1
| | |
| | * Changed environment.rb to application.rbUgis Ozols2010-10-251-1/+1
| | |
| | * Reworded sentence using text from rails source code.Ugis Ozols2010-10-251-1/+1
| | |
| | * Changed environment.rb to application.rbUgis Ozols2010-10-251-3/+3
| | |
| | * added tip about ruby-debug needing a different gem if using 1.9 [#190 ↵Rob Zolkos2010-10-241-0/+2
| | | | | | | | | | | | state:resolved]
| * | 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
| | |
| * | ruby-debug19 does not work with 1.9.3, so I am removing itAaron Patterson2010-10-301-4/+0
| | |
| * | 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
| | |
| * | Added missing AS require to active_model/naming.rbsnusnu2010-10-301-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_throughJon Leighton2010-10-28116-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 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
| | |
| * | Ensure that Rails.env is defined firstAndrew White2010-10-271-1/+1
| | |
| * | 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
| | |
| * | bind substitution is working properlyAaron Patterson2010-10-262-7/+19
| | |
| * | bind parameters are now typecastAaron Patterson2010-10-262-1/+17
| | |
| * | basic bind parameters are workingAaron Patterson2010-10-262-1/+13
| | |
| * | initial exec() method is working in pg adapterAaron Patterson2010-10-262-0/+55
| | |
| * | monkey patching with enumerable so we can call eachAaron Patterson2010-10-261-10/+4
| | |
| * | monkey patching Mysql::Stmt, calling free on the metadataAaron Patterson2010-10-261-4/+9
| | |
| * | free the result after slurpingAaron Patterson2010-10-261-0/+1
| | |
| * | eliminating some calls to execute()Aaron Patterson2010-10-261-5/+2
| | |
| * | statements are cached, cache is cleared on reconnectAaron Patterson2010-10-261-2/+19
| | |
| * | all mysql tests are passingAaron Patterson2010-10-261-2/+16
| | |
| * | one more mysql test left!Aaron Patterson2010-10-264-5/+11
| | |
| * | mysql tests are mostly passingAaron Patterson2010-10-263-20/+126
| | |
| * | find_one uses prepared statement cacheAaron Patterson2010-10-262-1/+7
| | |
| * | clearing statements on disconnect and resetAaron Patterson2010-10-261-0/+6
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 18:17:50 +0000