aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22125 from k0kubun/left_joinsSean Griffin2015-10-305-3/+10
|\
| * Alias left_joins to left_outer_joinsTakashi Kokubun2015-10-315-3/+10
* | don't sleep in testsAaron Patterson2015-10-301-10/+6
* | Merge pull request #22122 from samphilipd/sam/manual_locking_on_schema_migrat...Sean Griffin2015-10-308-23/+322
|\ \
| * | Use advisory locks to prevent concurrent migrationsSam Davies2015-10-308-23/+322
* | | Fix test failures caused by #12071Sean Griffin2015-10-301-10/+10
| |/ |/|
* | Merge pull request #12071 from Crunch09/outer_joinsSean Griffin2015-10-306-5/+139
|\ \
| * | added ActiveRecord::Relation#left_outer_joinsFlorian Thomas2015-05-196-5/+139
* | | Ensure `has_and_belongs_to_many` works with `belongs_to_required_by_default`Sean Griffin2015-10-293-2/+16
* | | Add a changelog entry for #13008Sean Griffin2015-10-291-0/+4
* | | Merge pull request #13008 from ktheory/sanitize_orderSean Griffin2015-10-292-0/+12
|\ \ \
| * | | Support SQL sanitization in AR::QueryMethods#orderAaron Suggs2013-11-222-0/+12
* | | | Merge pull request #19511 from larskanis/replace_const_conn_paramsSean Griffin2015-10-291-7/+2
|\ \ \ \
| * | | | PostgreSQL, Replace static connection param list by the one built into libpq.Lars Kanis2015-03-251-7/+2
* | | | | Don't disable errors when turning standard_conforming_strings onHarry Marr2015-10-292-12/+10
* | | | | Never pass `nil` to `order`Sean Griffin2015-10-295-22/+7
* | | | | Merge pull request #22106 from jamis/fix_default_fixture_class_namesYves Senn2015-10-292-3/+15
|\ \ \ \ \
| * | | | | FixtureSet.fixture_class_names should have no default valueJamis Buck2015-10-292-3/+15
* | | | | | Add CHANGELOG entry for #22101 [ci skip]Andrew White2015-10-291-0/+10
* | | | | | Revert "Revert "Merge pull request #22026 from akihiro17/fix-preload-associat...Yves Senn2015-10-293-0/+28
* | | | | | Merge pull request #22101 from gocardless/ar-pgbouncer-fixAndrew White2015-10-291-4/+5
|\ \ \ \ \ \
| * | | | | | Check standard_conforming_strings is not readonlyHarry Marr2015-10-291-1/+1
| * | | | | | Avoid disabling postgres errorsHarry Marr2015-10-281-4/+5
| |/ / / / /
* | | | | | Revert "Merge pull request #22026 from akihiro17/fix-preload-association"Sean Griffin2015-10-293-28/+0
* | | | | | Merge pull request #19501 from ccutrer/dry_sti_subclass_finding2Sean Griffin2015-10-296-23/+30
|\ \ \ \ \ \
| * | | | | | Fix a stylistic nitpick in #19501Sean Griffin2015-10-291-3/+3
| * | | | | | Fix test failures caused by #19501Sean Griffin2015-10-293-1/+3
| * | | | | | Fix merge conflicts from #19501Sean Griffin2015-10-294-23/+28
| |\ \ \ \ \ \
| | * | | | | | DRY up STI subclass logicCody Cutrer2015-03-244-22/+29
* | | | | | | | Set `scope.reordering_value` to `true` if :reordering values are specifiedakihiro172015-10-303-0/+28
|/ / / / / / /
* | | | | | | tests, no every adapter supports "connection.version"Yves Senn2015-10-292-22/+24
* | | | | | | Merge pull request #18548 from sebjacobs/support-bidirectional-destroy-depend...Sean Griffin2015-10-287-0/+116
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add support for bidirectional destroy dependenciesSeb Jacobs2015-01-167-1/+119
* | | | | | | Fix Typo in EagerLoadPolymorphicError [ci skip]Alex Myers2015-10-271-1/+1
* | | | | | | Merge pull request #18383 from scambra/habtm-with-where-includes-16032-for-ma...Rafael Mendonça França2015-10-273-1/+40
|\ \ \ \ \ \ \
| * | | | | | | Includes HABTM returns correct size now. It's caused by the join dependencySergio Cambra2015-01-073-2/+41
* | | | | | | | fix typo in `db:purge` description [ci skip]yuuji.yaginuma2015-10-281-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | [ci skip] Aline code examples in AR changelogyui-knk2015-10-271-17/+14
* | | | | | | Revert "Merge pull request #21994 from mtodd/inherit-scopes"Rafael Mendonça França2015-10-272-3/+3
* | | | | | | Make inherited scope test failMatt Todd2015-10-262-3/+3
* | | | | | | [ci skip] Add doc for preloader_forschneems2015-10-261-0/+4
* | | | | | | [ci skip] Clarify doc for preloaders_for_oneschneems2015-10-261-0/+5
* | | | | | | [ci skip] Add doc to preloaders_onschneems2015-10-261-0/+1
* | | | | | | Merge pull request #19686 from tsun1215/index_errorsSean Griffin2015-10-267-4/+91
|\ \ \ \ \ \ \
| * | | | | | | Errors can be indexed with nested attributesMichael Probber2015-04-177-4/+91
* | | | | | | | Merge pull request #19924 from iamvery/db-tasks-exit-statusSean Griffin2015-10-265-5/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Update changelog with db rake task exit status fixJay Hayes2015-10-201-0/+4
| * | | | | | | | Exit with non-zero status when db:drop failsJay Hayes2015-10-201-1/+2
| * | | | | | | | Exit with non-zero status when db:create failsJay Hayes2015-10-203-3/+4
| * | | | | | | | Fix test of drop failureJay Hayes2015-10-201-1/+5