Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #22125 from k0kubun/left_joins | Sean Griffin | 2015-10-30 | 2 | -1/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Alias left_joins to left_outer_joins | Takashi Kokubun | 2015-10-31 | 2 | -1/+6 | |
* | | | | | | don't sleep in tests | Aaron Patterson | 2015-10-30 | 1 | -10/+6 | |
* | | | | | | Merge pull request #22122 from samphilipd/sam/manual_locking_on_schema_migrat... | Sean Griffin | 2015-10-30 | 4 | -0/+199 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use advisory locks to prevent concurrent migrations | Sam Davies | 2015-10-30 | 4 | -0/+199 | |
* | | | | | | | Fix test failures caused by #12071 | Sean Griffin | 2015-10-30 | 1 | -10/+10 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #12071 from Crunch09/outer_joins | Sean Griffin | 2015-10-30 | 1 | -0/+74 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | added ActiveRecord::Relation#left_outer_joins | Florian Thomas | 2015-05-19 | 1 | -0/+74 | |
* | | | | | | Ensure `has_and_belongs_to_many` works with `belongs_to_required_by_default` | Sean Griffin | 2015-10-29 | 2 | -0/+14 | |
* | | | | | | Merge pull request #13008 from ktheory/sanitize_order | Sean Griffin | 2015-10-29 | 1 | -0/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Support SQL sanitization in AR::QueryMethods#order | Aaron Suggs | 2013-11-22 | 1 | -0/+5 | |
* | | | | | | | Never pass `nil` to `order` | Sean Griffin | 2015-10-29 | 1 | -6/+0 | |
* | | | | | | | Merge pull request #22106 from jamis/fix_default_fixture_class_names | Yves Senn | 2015-10-29 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | FixtureSet.fixture_class_names should have no default value | Jamis Buck | 2015-10-29 | 1 | -0/+14 | |
* | | | | | | | | Revert "Revert "Merge pull request #22026 from akihiro17/fix-preload-associat... | Yves Senn | 2015-10-29 | 1 | -0/+18 | |
* | | | | | | | | Revert "Merge pull request #22026 from akihiro17/fix-preload-association" | Sean Griffin | 2015-10-29 | 1 | -18/+0 | |
* | | | | | | | | Merge pull request #19501 from ccutrer/dry_sti_subclass_finding2 | Sean Griffin | 2015-10-29 | 5 | -3/+12 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix test failures caused by #19501 | Sean Griffin | 2015-10-29 | 2 | -0/+2 | |
| * | | | | | | | | Fix merge conflicts from #19501 | Sean Griffin | 2015-10-29 | 3 | -3/+10 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | DRY up STI subclass logic | Cody Cutrer | 2015-03-24 | 3 | -3/+10 | |
* | | | | | | | | | | Set `scope.reordering_value` to `true` if :reordering values are specified | akihiro17 | 2015-10-30 | 1 | -0/+18 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | tests, no every adapter supports "connection.version" | Yves Senn | 2015-10-29 | 2 | -22/+24 | |
* | | | | | | | | | Merge pull request #18548 from sebjacobs/support-bidirectional-destroy-depend... | Sean Griffin | 2015-10-28 | 5 | -0/+95 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add support for bidirectional destroy dependencies | Seb Jacobs | 2015-01-16 | 5 | -0/+95 | |
* | | | | | | | | | Merge pull request #18383 from scambra/habtm-with-where-includes-16032-for-ma... | Rafael Mendonça França | 2015-10-27 | 1 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Includes HABTM returns correct size now. It's caused by the join dependency | Sergio Cambra | 2015-01-07 | 1 | -0/+19 | |
* | | | | | | | | | Revert "Merge pull request #21994 from mtodd/inherit-scopes" | Rafael Mendonça França | 2015-10-27 | 2 | -3/+3 | |
* | | | | | | | | | Make inherited scope test fail | Matt Todd | 2015-10-26 | 2 | -3/+3 | |
* | | | | | | | | | Merge pull request #19686 from tsun1215/index_errors | Sean Griffin | 2015-10-26 | 4 | -0/+53 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Errors can be indexed with nested attributes | Michael Probber | 2015-04-17 | 4 | -0/+53 | |
* | | | | | | | | | | Merge pull request #19924 from iamvery/db-tasks-exit-status | Sean Griffin | 2015-10-26 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Exit with non-zero status when db:create fails | Jay Hayes | 2015-10-20 | 2 | -2/+2 | |
* | | | | | | | | | | | Tweaked wording used in some tests. | Sebastian McKenzie | 2015-10-25 | 1 | -4/+4 | |
* | | | | | | | | | | | Merge pull request #21950 from rafaelsales/issues/21922-fix-ar-group-by-attri... | Andrew White | 2015-10-22 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Refactor Calculations#execute_grouped_calculation and clean AR test case | Rafael Sales | 2015-10-22 | 1 | -1/+0 | |
| * | | | | | | | | | | | Fix generated projection fields in group by query | Rafael Sales | 2015-10-22 | 1 | -0/+5 | |
| |/ / / / / / / / / / | ||||||
* / / / / / / / / / / | Remove `#tables` extra args again | Ryuta Kamizono | 2015-10-22 | 2 | -4/+3 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Fix merge conflicts for #19938 | Sean Griffin | 2015-10-20 | 5 | -0/+24 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix for activerecord join dependency instantiate bug | Mehmet Emin İNAÇ | 2015-05-04 | 5 | -0/+24 | |
* | | | | | | | | | | | Merge pull request #20653 from repinel/allow-arel-select-count | Sean Griffin | 2015-10-20 | 1 | -0/+52 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Allow select with Arel and count as well as calculations with Arel | Roque Pinel | 2015-06-30 | 1 | -0/+52 | |
* | | | | | | | | | | | | Merge pull request #20957 from akihiro17/find-by-issue | Sean Griffin | 2015-10-20 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Don't cache arguments in #find_by if they are an ActiveRecord::Relation | akihiro17 | 2015-10-06 | 1 | -0/+6 | |
* | | | | | | | | | | | | | Fix test failures caused by d99db6b8b3e4 | Sean Griffin | 2015-10-20 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Qualify column names in calculation | Soutaro Matsumoto | 2015-10-20 | 1 | -0/+19 | |
* | | | | | | | | | | | | | Fix merge conflicts for #18856 | Sean Griffin | 2015-10-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Match table names exactly on MySQL | Matt Jones | 2015-02-08 | 3 | -15/+3 | |
* | | | | | | | | | | | | | | Merge pull request #21883 from tarzan/cache-key-too-precise | Sean Griffin | 2015-10-20 | 3 | -6/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | fixes #21815 | Maarten Jacobs | 2015-10-16 | 3 | -6/+39 | |
* | | | | | | | | | | | | | | | Do not cache prepared statements that are unlikely to have cache hits | Sean Griffin | 2015-10-20 | 2 | -2/+2 |