aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Result sets never override a model's column typeSean Griffin2014-05-293-1/+51
* Merge pull request #15397 from sgrif/sg-column-classYves Senn2014-05-295-6/+15
|\
| * Ensure we always use instances of the adapter specific column classSean Griffin2014-05-285-6/+15
* | Use github url for homepage of log4r [ci skip]Zachary Scott2014-05-281-1/+1
|/
* Merge pull request #15392 from arthurnn/move_open_transactionsRafael Mendonça França2014-05-282-4/+4
|\
| * Keep closer to other methods that touch @transactionArthur Neves2014-05-282-4/+4
* | Maintain column order when overriding existing columnsSean Griffin2014-05-282-3/+13
|/
* Merge pull request #15389 from sgrif/sg-property-inheritanceRafael Mendonça França2014-05-282-5/+26
|\
| * Ensure custom properties work correctly with inheritanceSean Griffin2014-05-282-5/+26
* | Merge pull request #15370 from sgrif/sg-type-namespaceRafael Mendonça França2014-05-2841-643/+592
|\ \
| * | Move types to the top level `ActiveRecord` namespaceSean Griffin2014-05-2741-643/+592
* | | Formatting of content from b1db615 [ci skip]Zachary Scott2014-05-281-3/+7
* | | Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_errorZachary Scott2014-05-281-0/+3
|\ \ \ | |_|/ |/| |
| * | Initial doc for TransactionIsolationError [ci skip]Gaurav Sharma2014-05-281-0/+3
* | | Merge pull request #15387 from sgrif/sg-remove-column-coderSantiago Pastorino2014-05-282-34/+1
|\ \ \ | |/ / |/| |
| * | Remove unused `Column#coder`Sean Griffin2014-05-282-34/+1
| |/
* / pg, keep `hstore` and `json` attributes as `Hash` in @attributes.Yves Senn2014-05-285-2/+39
|/
* Merge pull request #15374 from sgrif/sg-private-propertiesRafael Mendonça França2014-05-2712-30/+12
|\
| * Remove AR Properties from the public APISean Griffin2014-05-2712-30/+12
* | Add CHANGELOG entry for #15269 [ci skip]Rafael Mendonça França2014-05-271-0/+4
* | Merge pull request #15269 from arunagw/aa-fixes-8930Rafael Mendonça França2014-05-271-1/+1
|\ \
| * | rake railties:install:migrations respects the order of railtiesArun Agrawal2014-05-271-1/+1
* | | Add test case for clear mappingsAkshay Vishnoi2014-05-281-0/+10
* | | Test Case - Change method nameAkshay Vishnoi2014-05-281-1/+1
* | | Merge pull request #15371 from sgrif/sg-silence-deprecation-warningRafael Mendonça França2014-05-271-0/+3
|\ \ \
| * | | Silence deprecation warning in testSean Griffin2014-05-271-0/+3
| | |/ | |/|
* | | Merge pull request #14834 from al2o3cr/issue14155Aaron Patterson2014-05-273-2/+31
|\ \ \ | |/ / |/| |
| * | WIP: pass existing joins to construct_join_dependencyMatt Jones2014-05-163-2/+31
* | | Merge pull request #15295 from sgrif/sg-deprecate-decimalsRafael Mendonça França2014-05-277-2/+29
|\ \ \
| * | | Deprecate decimal columns being automatically treated as integersSean Griffin2014-05-277-2/+29
* | | | Merge pull request #15358 from arthurnn/redefine_habtm_fixRafael Mendonça França2014-05-273-25/+46
|\ \ \ \
| * | | | Fix redefine a has_and_belongs_to_many inside inherited classArthur Neves2014-05-273-25/+46
* | | | | Merge pull request #15359 from kuldeepaggarwal/f-remove-unwanted_to_symYves Senn2014-05-271-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove unwanted `to_sym` call.Kuldeep Aggarwal2014-05-261-1/+1
* | | | | Fix syntax error from 5eae77cZachary Scott2014-05-261-1/+1
* | | | | Move test to the proper fileRafael Mendonça França2014-05-262-7/+7
* | | | | Add test case for b13d260Rafael Mendonça França2014-05-261-0/+9
* | | | | Merge pull request #15301 from zzak/issue_15212Rafael Mendonça França2014-05-261-0/+1
|\ \ \ \ \
| * | | | | Skip if the association was already loaded.Zachary Scott2014-05-241-0/+1
* | | | | | Merge pull request #15353 from sgrif/sg-mysql-conditionRafael Mendonça França2014-05-261-2/+0
|\ \ \ \ \ \
| * | | | | | Remove unnecessary branch from quoting in MysqlSean Griffin2014-05-261-2/+0
* | | | | | | Typo in AR CHANGELOG [ci skip]Zachary Scott2014-05-261-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Add a public API to allow users to specify column typesSean Griffin2014-05-2617-22/+194
|/ / / / /
* | | | | Allow empty arrays in where predicatesSean Griffin2014-05-261-0/+2
* | | | | Merge pull request #15351 from sgrif/sg-allowed-typesRafael Mendonça França2014-05-261-4/+9
|\ \ \ \ \
| * | | | | Extract types which don't require additional typecasting to a methodSean Griffin2014-05-261-4/+9
* | | | | | Merge pull request #15300 from arthurnn/refactor_reflectionsRafael Mendonça França2014-05-2616-34/+85
|\ \ \ \ \ \
| * | | | | | Refactoring .reflections public method.Arthur Neves2014-05-264-9/+28
| * | | | | | Use .to_s on _reflections lookupArthur Neves2014-05-242-2/+2
| * | | | | | Merge pull request #15210 from arthurnn/fix_hbtm_reflectionArthur Neves2014-05-2416-30/+62
| | |/ / / / | |/| | | |