aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6054 from flexoid/column-fixJon Leighton2012-05-051-3/+3
|\ | | | | Prevent creating valid time-like objects from blank string from db
| * Prevent creating valid time-like objects from blank string from dbEgor Lynko2012-05-051-3/+3
| | | | | | | | Issue #6045
* | Revert "Merge pull request #5494 from ↵Jon Leighton2012-05-053-35/+5
|/ | | | | | | armstrjare/active_record_relation_keep_association_join_context_on_merge" This reverts commit dcd04e76179611a9db28c9e391aa7d6c2a5b046a, reversing changes made to 58a49875df63729f07a9a81d1ee349087d258df5.
* Merge pull request #5494 from ↵Jon Leighton2012-05-053-5/+35
|\ | | | | | | | | armstrjare/active_record_relation_keep_association_join_context_on_merge ActiveRecord::Relation - maintain context of joined associations on merges
| * 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 should quote not a number and infinity correctly for float columns
| * | 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
|\ \ \ \ | | | | | | | | | | Documentation fix: Change the example for habtm association to use proc according to changelog
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change CollectionProxy#method_missing to use scoped.public_send, to avoid a problem described in issue #2508 when trying to use class methods with names like "open", that clash with private kernel methods. Also changed the dynamic matcher instantiator to send straight to scoped, to avoid another roundtrip to method_missing.
* | | | 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
| | | | | | | | | | | | | | | | and column names
* | | | Made `first` finder consistent among database engines by adding aMarcelo Silveira2012-05-021-2/+18
| | | | | | | | | | | | | | | | default order clause (fixes #5103)
* | | | 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 #4979
| * | | | delete_all raise an error if a limit is provided - fixes #4979Francesco Rodriguez2012-04-301-0/+2
| | | | |
* | | | | Merge pull request #6092 from ↵Aaron Patterson2012-05-011-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | jsanders/issue_4001_error_typecasting_non_integer_castable Don't type cast values that don't respond to to_i to 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
| | | | | | | | | | | | | | | | | | | | sort the exception names alphabetically
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. ActiveRecord::Base is not ActiveRecord::Relation 2. The order of records from an SQL query is uncertain without an ORDER clause 3. Run your own tests when submitting a pull request
* | | | | Add ActiveRecord::Base#idstwinturbo2012-04-301-0/+10
| |/ / / |/| | |
* | | | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-5/+3
|\ \ \ \ | | | | | | | | | | Remove some unused variable assignments
| * | | | 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
|/ / / | | | | | | | | | | | | Cleaned up "DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it."
* | | Merge pull request #5698 from dougcole/support_postgresql_partitioningAaron Patterson2012-04-273-9/+44
|\ \ \ | | | | | | | | Support postgresql partitioning by making INSERT RETURNING optional
| * | | 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
| | | |