aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into pr/18316Mingdong Luo2015-01-31213-1875/+2822
|\
| * Attribute assignment and type casting has nothing to do with columnsSean Griffin2015-01-3115-113/+153
| * changed deleted_tables list to setHyonjee Joo2015-01-311-1/+2
| * Merge pull request #18512 from vipulnsward/18492-fixtures-with-stiAaron Patterson2015-01-317-12/+46
| |\
| | * Fixes #18492Vipul A M2015-01-147-12/+46
| * | Remove `AttributeSet#initialized_keys`Sean Griffin2015-01-312-6/+2
| * | Merge pull request #18700 from nygrenh/better-required-messageAaron Patterson2015-01-312-3/+23
| |\ \
| | * | Provide a better error message on :required associationHenrik Nygren2015-01-282-3/+23
| * | | unify CHANGELOG format. [ci skip]Yves Senn2015-01-311-3/+5
| * | | Remove most type related predicates from `Column`Sean Griffin2015-01-3026-101/+134
| * | | Remove most uses of `Column#cast_type`Sean Griffin2015-01-306-22/+48
| * | | Fix a state leak in `autosave_association_test`Sean Griffin2015-01-301-0/+5
| * | | Always perform validations on nested attribute associationsSean Griffin2015-01-304-5/+22
| * | | Post.all.or(anything) == Post.allSean Griffin2015-01-293-7/+7
| * | | Fixed AR::Relation#group method when argument is a SQL reserved keywordBogdan Gusiev2015-01-293-13/+27
| * | | Don't error when grouped calculations return 0 recordsSean Griffin2015-01-282-1/+6
| * | | Merge Pull Request #16052 Added #or to ActiveRecord::RelationSean Griffin2015-01-288-1/+166
| |\ \ \
| | * | | Bring the implementation of Relation#or up to speedSean Griffin2015-01-285-44/+48
| | * | | Added #or to ActiveRecord::RelationMatthew Draper2015-01-286-1/+162
| * | | | Always convert strings to UTF-8, regardless of column type in SQLiteSean Griffin2015-01-282-12/+7
| |/ / /
| * / / Don't redefine autosave association callbacks in nested attrsSean Griffin2015-01-286-1/+20
| |/ /
| * | Remove Relation#bind_paramsSean Griffin2015-01-2730-130/+116
| * | Merge pull request #18588 from thegcat/patch-1Rafael Mendonça França2015-01-271-1/+1
| |\ \
| | * | fix typo still cause -> still causesFelix Schäfer2015-01-271-1/+1
| * | | All subclasses of `Attribute` should be private constantsSean Griffin2015-01-271-1/+1
| * | | Use an `Attribute` object to represent a bind valueSean Griffin2015-01-2711-41/+38
| * | | Don't rely on the internal representation of join valuesSean Griffin2015-01-272-2/+6
| * | | Minor refactorings on `Relation#build_joins`Sean Griffin2015-01-271-26/+13
| * | | `WhereClause#predicates` does not need to be publicSean Griffin2015-01-2711-126/+48
| * | | Use the `WhereClause` ast building logic for havingSean Griffin2015-01-271-4/+1
| * | | Move where grouping into `WhereClause`Sean Griffin2015-01-273-11/+59
| * | | Unify access to bind values on RelationSean Griffin2015-01-276-21/+13
| * | | Restore useful documentation removed atRafael Mendonça França2015-01-271-0/+6
| * | | Merge pull request #18622 from take/patch-1Abdelkader Boudih2015-01-271-20/+0
| |\ \ \
| | * | | Update model_schema.rb [ci skip]Takehiro Adachi2015-01-271-20/+0
| * | | | Move the `from` bind logic to a `FromClause` classSean Griffin2015-01-265-22/+53
| * | | | Remove `Relation#bind_values=`Sean Griffin2015-01-264-12/+10
| * | | | Remove unused `bind` and `bind!` methods from `Relation`Sean Griffin2015-01-262-18/+0
| * | | | Remove `Relation#build_where`Sean Griffin2015-01-261-6/+0
| * | | | Go through normal `where` logic in `AssociationScope`Sean Griffin2015-01-263-53/+33
| * | | | Ensure the type caster object given to Arel is always marshallableSean Griffin2015-01-261-3/+4
| * | | | Generate a query that makes sense when testing having clausesSean Griffin2015-01-261-3/+4
| * | | | Change `having_values` to use the `WhereClause` classSean Griffin2015-01-265-10/+31
| * | | | Improve consistency of counter caches updating in memorySean Griffin2015-01-265-7/+29
| * | | | Test association was eager loaded, rather than reaching into internalsSean Griffin2015-01-262-4/+4
| * | | | Move flattening records added to an association farther outSean Griffin2015-01-262-1/+11
| * | | | Move method to private sectionCarlos Antonio da Silva2015-01-261-7/+7
| * | | | Remove `where_values` and `where_values=`Sean Griffin2015-01-251-8/+0
| * | | | Correct the implementation for `unscope(:where)`Sean Griffin2015-01-251-5/+8
| * | | | Move `where_values_hash` over to `WhereClause`Sean Griffin2015-01-252-16/+23