aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into adequaterecordAaron Patterson2014-04-1415-63/+151
|\
| * Merge pull request #14735 from byroot/idempotent-counter-cachesAaron Patterson2014-04-142-4/+26
| |\
| | * Make counter cache decrementation on destroy idempotentJean Boussier2014-04-132-4/+26
| * | docs, double meaning of `serialize` argument. Closes #14284.Yves Senn2014-04-141-5/+16
| * | again, read_attribute is public, so just call itAaron Patterson2014-04-131-1/+1
| * | read_attribute is public, so we should just call itAaron Patterson2014-04-131-1/+1
| |/
| * Merge pull request #14592 from laurocaetano/equality_between_relation_and_col...Rafael Mendonça França2014-04-132-0/+6
| |\
| | * Make the comparison between 'Relation' and 'AssociationRelation'Lauro Caetano2014-04-122-1/+5
| | * The comparison between `Relation` and `CollectionProxy` should be consistent.Lauro Caetano2014-04-111-0/+2
| * | don't bother with an offset if the offset is zeroAaron Patterson2014-04-121-6/+9
| * | only add the offset and index when we need toAaron Patterson2014-04-121-8/+9
| * | remove branching logic from calls to find_nthAaron Patterson2014-04-121-6/+10
| * | please use Ruby, not ActiveSupportAaron Patterson2014-04-111-1/+1
| |/
| * :scissors:Rafael Mendonça França2014-04-111-2/+2
| * Merge pull request #14711 from swoker/activerecord_fix_aggregate_methods_with...Rafael Mendonça França2014-04-112-3/+10
| |\
| | * fix exception on polymorphic associations with predicatesSimon Woker2014-04-111-0/+8
| | * Fix error for aggregate methods with select, see issue #13648Simon Woker2014-04-101-3/+2
| * | PostgreSQL, warn once per connection per missing OID. Closes #14275.Yves Senn2014-04-111-2/+2
| * | PostgreSQL, adapter automatically reloads it's type map. Closes #14678.Yves Senn2014-04-113-10/+22
| * | docs, make association `autosave: true` examples runnable. Closes #14700Yves Senn2014-04-111-6/+9
| * | Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548Rafael Mendonça França2014-04-102-3/+7
| |\ \
| | * | Fix insertion of records for hmt association with scope, fix #3548Ivan Antropov2013-11-172-3/+7
| * | | No need to call sendRafael Mendonça França2014-04-101-1/+1
| * | | Merge branch 'master' into rm-uuid-fixturesRafael Mendonça França2014-04-1020-80/+60
| |\ \ \ | | | |/ | | |/|
| | * | Only call uniq on the conditional that actually needs itCarlos Antonio da Silva2014-04-091-1/+1
| | * | Remove extra collect callCarlos Antonio da Silva2014-04-091-1/+1
| | * | Make the aggregate_reflections cache work with strings as its keys.Lauro Caetano2014-04-091-2/+2
| | * | No need to call `to_sym` on reflection name, since the cache now worksLauro Caetano2014-04-091-2/+2
| | * | Make the reflections cache work with strings as its keys.Lauro Caetano2014-04-091-2/+2
| * | | Merge pull request #12016 from roderickvd/uuid_fixesRafael Mendonça França2014-04-041-9/+24
| |\ \ \
| | * | | Auto-generate stable fixture UUIDs on PostgreSQL.Roderick van Domburg2014-01-071-9/+24
* | | | | use an array for bind params to simplify substitutionAaron Patterson2014-04-122-9/+9
* | | | | propogate bind values collected in arel to SQL generationAaron Patterson2014-04-111-1/+2
* | | | | decouple the factory method from the constructing modelAaron Patterson2014-04-102-5/+3
* | | | | remove intelligence from StatementCache#initializeAaron Patterson2014-04-102-11/+13
* | | | | stop caching the class on the statement cache objectAaron Patterson2014-04-102-7/+7
* | | | | fix ivar names and add reader methodsAaron Patterson2014-04-101-7/+6
* | | | | eagerly build the cacheable query builderAaron Patterson2014-04-101-13/+7
* | | | | eagerly build the bind mapAaron Patterson2014-04-101-8/+5
* | | | | eagerly build the relation objectAaron Patterson2014-04-101-8/+2
* | | | | remove dead codeAaron Patterson2014-04-101-7/+0
* | | | | speed up parameter substitutionAaron Patterson2014-04-091-2/+12
* | | | | tests still pass when caching unprepared statementsAaron Patterson2014-04-091-1/+0
* | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-091-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | The `source` option for `has_many => through` should accept StringLauro Caetano2014-04-091-1/+1
* | | | | remove the bind visitor since the collector handles substituting bind valuesAaron Patterson2014-04-091-6/+2
* | | | | push the collectors up to the abstract adapterAaron Patterson2014-04-093-40/+22
* | | | | sqlite3 tests passing againAaron Patterson2014-04-091-7/+8
* | | | | mysql tests are passing againAaron Patterson2014-04-091-1/+7
* | | | | all tests passing on mysql2Aaron Patterson2014-04-091-1/+0