aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6054 from flexoid/column-fixJon Leighton2012-05-051-3/+3
|\
| * Prevent creating valid time-like objects from blank string from dbEgor Lynko2012-05-051-3/+3
* | Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...Jon Leighton2012-05-053-35/+5
|/
* Merge pull request #5494 from armstrjare/active_record_relation_keep_associat...Jon Leighton2012-05-053-5/+35
|\
| * Allow ActiveRecord::Relation merges to maintain context of joined associationsJared Armstrong2012-05-043-5/+35
* | Duplicate column_defaults properly (closes #6115)Piotr Sarnacki2012-05-041-1/+4
* | Change unless + ! into ifPiotr Sarnacki2012-05-041-1/+1
* | Merge pull request #3713 from kf8a/masterAaron Patterson2012-05-041-2/+7
|\ \
| * | postgresql adapter handles quoting of not a number (NaN) and InfinitySven Bohm2011-11-211-2/+7
* | | extract deprecated dynamic methodsJon Leighton2012-05-041-140/+38
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-043-12/+18
|\ \ \
| * | | Add empty rows to improve readability. [ci skip]Edward Tsech2012-05-011-0/+2
| * | | Add few lines to describe how aggregation part caching works. [ci skip]Edward Tsech2012-05-011-0/+4
| * | | simpler wording and explanationsHrvoje Šimić2012-05-012-11/+11
| * | | Lowercase.Ben Pickles2012-05-011-1/+1
* | | | Merge pull request #5650 from sekrett/masterVijay Dev2012-05-041-1/+1
|\ \ \ \
| * | | | Change the example for habtm association to use proc according to changelogAlexander Zubkov2012-03-291-1/+1
* | | | | actually don't need to expand the aggregates at allJon Leighton2012-05-041-11/+1
* | | | | #to_sym is unnecessaryJon Leighton2012-05-041-3/+3
* | | | | de-globalise methodJon Leighton2012-05-043-9/+6
* | | | | extract code from AR::BaseJon Leighton2012-05-042-33/+29
* | | | | clean up implementation of dynamic methods. use method compilation etc.Jon Leighton2012-05-045-211/+202
| |_|_|/ |/| | |
* | | | Fix issue with private kernel methods and collection associations. Closes #2508Carlos Antonio da Silva2012-05-021-2/+2
* | | | Use arel nodes instead of raw sqlMarcelo Silveira2012-05-022-4/+7
* | | | Use Array#first instead of Array#[0]Marcelo Silveira2012-05-021-5/+5
* | | | Introducing `take` as a replacement to the old behavior of `first`Marcelo Silveira2012-05-022-1/+28
* | | | Document `last`, check for primary key on default order and use quoted table ...Marcelo Silveira2012-05-021-2/+5
* | | | Made `first` finder consistent among database engines by adding aMarcelo Silveira2012-05-021-2/+18
* | | | Refactored remove_columnEdgars Beigarts2012-05-023-4/+2
* | | | Merge pull request #6089 from frodsan/delete_all_limitAaron Patterson2012-05-011-0/+2
|\ \ \ \
| * | | | delete_all raise an error if a limit is provided - fixes #4979Francesco Rodriguez2012-04-301-0/+2
* | | | | Merge pull request #6092 from jsanders/issue_4001_error_typecasting_non_integ...Aaron Patterson2012-05-011-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Don't type cast values that don't respond to to_i to 1James Sanders & Jason Noble2012-04-301-1/+1
| |/ / /
* | | | more edits [ci skip]Vijay Dev2012-05-011-1/+1
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-012-10/+11
|\ \ \ \
| * | | | add ActiveRecord::RecordInvalid to exceptionsHrvoje Šimić2012-04-301-9/+10
| * | | | More using <tt>x</tt> instead of +x+ when the latter renders improperly.Mark Rushakoff2012-04-271-1/+1
* | | | | return value of block is returnedAaron Patterson2012-04-301-2/+5
* | | | | only yield to finder block if something is foundAaron Patterson2012-04-301-1/+1
* | | | | Fix PR #6091Andrew White2012-04-301-1/+1
* | | | | Add ActiveRecord::Base#idstwinturbo2012-04-301-0/+10
| |/ / / |/| | |
* | | | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-5/+3
|\ \ \ \
| * | | | Remove unused assignmentsMark Rushakoff2012-04-291-5/+3
| |/ / /
* | | | Removed extraneous .present? check for AR::Base#reloadJeremy Friesen2012-04-291-1/+1
* | | | Removed deprecation warning for #find as a result of AR::Base#reloadJeremy Friesen2012-04-291-1/+7
|/ / /
* | | Merge pull request #5698 from dougcole/support_postgresql_partitioningAaron Patterson2012-04-273-9/+44
|\ \ \
| * | | refactor configuration of insert_returningDoug Cole2012-04-071-14/+4
| * | | pick better names and add a little documentationDoug Cole2012-04-011-8/+16
| * | | refactorDoug Cole2012-03-311-13/+8
| * | | update mysql for new exec_insert signatureDoug Cole2012-03-311-1/+1