Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #8291 from senny/8265_build_with_polymorphic_association | Rafael Mendonça França | 2012-11-22 | 1 | -0/+8 | |
|\ | | | | | | | | | | | | | prevent mass assignment of polymorphic type when using `build` Conflicts: activerecord/CHANGELOG.md | |||||
| * | prevent mass assignment of polymorphic type when using `build` | Yves Senn | 2012-11-22 | 1 | -0/+8 | |
| | | | | | | | | Closes #8265 | |||||
* | | Deprecate Relation#sum with a block. | Carlos Antonio da Silva | 2012-11-21 | 2 | -2/+10 | |
| | | | | | | | | | | | | | | To perform a sum calculation over the array of elements, use to_a.sum(&block). Please check the discussion in f9cb645dfcb5cc89f59d2f8b58a019486c828c73 for more context. | |||||
* | | Revert "Yield only one argument instead of splatting." | Carlos Antonio da Silva | 2012-11-21 | 1 | -16/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f9cb645dfcb5cc89f59d2f8b58a019486c828c73. Conflicts: activerecord/CHANGELOG.md Revert "Allow blocks for count with ActiveRecord::Relation. Document and test that sum allows blocks" This reverts commit 9cc2bf69ce296b7351dc612a8366193390a305f3. Conflicts: activerecord/lib/active_record/relation/calculations.rb | |||||
* | | Move migration test together with other join table tests | Carlos Antonio da Silva | 2012-11-21 | 2 | -7/+6 | |
|/ | ||||||
* | Merge pull request #7716 from steveklabnik/issue_7715 | Rafael Mendonça França | 2012-11-21 | 1 | -0/+7 | |
|\ | | | | | Coerce strings in create_join_table. | |||||
| * | Coerce strings in create_join_table. | Steve Klabnik | 2012-11-21 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | If you accidentally pass a string and a symbol, this breaks. So we coerce them both to strings. Fixes #7715 | |||||
* | | Merge pull request #6245 from bogdan/bc_timestamp | Rafael Mendonça França | 2012-11-21 | 1 | -0/+9 | |
|\ \ | | | | | | | Postgresql adapter: fix handling of BC timestamps | |||||
| * | | Fix postgresql adapter to handle bc timestamps correctly | Bogdan Gusiev | 2012-11-21 | 1 | -0/+9 | |
| | | | ||||||
* | | | Refactoring, testing and documenting pg_connection.distinct | Semyon Perepelitsa | 2012-11-21 | 1 | -0/+29 | |
|/ / | ||||||
* | | Postgresql doesn't accepts limits on text columns. | Victor Costan | 2012-11-20 | 2 | -0/+23 | |
| | | ||||||
* | | Initialize accessors to remove some warnings in Ruby 2.0 | Carlos Antonio da Silva | 2012-11-19 | 2 | -7/+4 | |
| | | ||||||
* | | Merge pull request #3023 from Tho85/preserve_sti_type | Rafael Mendonça França | 2012-11-18 | 1 | -1/+12 | |
|\ \ | | | | | | | | | | | | | | | | | | | AR::Base.becomes should not change the STI type Conflicts: activerecord/CHANGELOG.md | |||||
| * | | AR::Base.becomes should not change the STI type | Thomas Hollstegge | 2012-11-17 | 1 | -1/+12 | |
| | | | | | | | | | | | | If you want to change the STI type too, use AR::Base.becomes! instead | |||||
* | | | Add rename_index to change_table. | Jarek Radosz | 2012-11-19 | 1 | -0/+7 | |
| | | | ||||||
* | | | Ensure ordering to make the test pass with postgresql | Carlos Antonio da Silva | 2012-11-18 | 1 | -4/+5 | |
| | | | ||||||
* | | | Add test to ensure preloading works as expected with "select" and "includes". | Dieter Komendera | 2012-11-18 | 1 | -0/+13 | |
| | | | | | | | | | | | | This didn't work in rails 3.1. See #2303 for more information and original pull request. | |||||
* | | | Remove not used require and some useless test comments | Carlos Antonio da Silva | 2012-11-17 | 1 | -12/+3 | |
| | | | ||||||
* | | | Fix typo in module name and make #in_time_zone private | Carlos Antonio da Silva | 2012-11-17 | 3 | -3/+5 | |
| | | | ||||||
* | | | Extract #in_time_zone helper method duplication to a module | Carlos Antonio da Silva | 2012-11-17 | 3 | -24/+17 | |
| | | | ||||||
* | | | Simplify helper method in attribute methods test | Carlos Antonio da Silva | 2012-11-17 | 1 | -3/+1 | |
| | | | ||||||
* | | | Remove return guard | Carlos Antonio da Silva | 2012-11-17 | 1 | -1/+0 | |
|/ / | ||||||
* | | Test for has_many bug on unsaved records | George Brocklehurst | 2012-11-16 | 1 | -0/+7 | |
| | | | | | | | | See issue #7950. | |||||
* | | arel columns can be used for grouping so that "weird" column names are usable | Aaron Patterson | 2012-11-15 | 2 | -0/+7 | |
| | | ||||||
* | | Assert the query result instead of checking for nothing raised | Carlos Antonio da Silva | 2012-11-13 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | Nothing should be raised anyway :smile: Thanks @spastorino :heart: https://github.com/rails/rails/pull/8202/files#r2112067 | |||||
* | | Merge pull request #8202 from nikitug/regression_test_on_dynamic_finder_result | Carlos Antonio da Silva | 2012-11-13 | 2 | -0/+13 | |
|\ \ | | | | | | | Regression test for #7238 | |||||
| * | | Regression test for #7238 | Nikita Afanasenko | 2012-11-13 | 2 | -0/+13 | |
| | | | ||||||
* | | | Merge pull request #8176 from senny/7551_pluck_with_select | Rafael Mendonça França | 2012-11-13 | 1 | -0/+6 | |
|\ \ \ | | | | | | | | | `#pluck` can be used on a relation with `select` clause (#7551) | |||||
| * | | | `#pluck` can be used on a relation with `select` clause. | Yves Senn | 2012-11-12 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | Closes #7551 | |||||
* | | | | Add a regression test on #8195 | Nikita Afanasenko | 2012-11-13 | 1 | -0/+7 | |
| |/ / |/| | | ||||||
* | | | Merge and add tests related to 5215 | Vipul A M | 2012-11-12 | 3 | -18/+25 | |
|/ / | ||||||
* | | Do not create useless database transaction when building `has_one` association. | Bogdan Gusiev | 2012-11-10 | 1 | -0/+6 | |
| | | ||||||
* | | Properly deprecate ConnectionHandler#connection_pools | Jon Leighton | 2012-11-09 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | Rather than just changing it and hoping for the best. Requested by @jeremy: https://github.com/rails/rails/commit/ba1544d71628abff2777c9c514142d7e9a159111#commitcomment-2106059 | |||||
* | | Merge pull request #8116 from senny/7993_configure_counter_cache_for_has_many | Jon Leighton | 2012-11-09 | 2 | -0/+9 | |
|\ \ | | | | | | | :counter_cache option for to support custom named counter caches | |||||
| * | | :counter_cache option for to support custom named counter caches. Closes #7993 | Yves Senn | 2012-11-04 | 2 | -0/+9 | |
| | | | ||||||
* | | | Delegate all calculations to the scope. | Jon Leighton | 2012-11-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | So that the scope may be a NullRelation and return a result without executing a query. Fixes #7928 | |||||
* | | | CollectionProxy#pluck issues no query for a new_record? owner | Jon Leighton | 2012-11-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | Fixes #8102. I couldn't find a nicer way to deal with this than delegate the call to #scope, which will be a NullRelation when we want it to be. | |||||
* | | | Relations built off collection associations with an unsaved owner should be ↵ | Jon Leighton | 2012-11-09 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null relations For example, the following should not run any query on the database: Post.new.comments.where(body: 'omg').to_a # => [] Fixes #5215. | |||||
* | | | Add test to avoid regression of 58e48d5292242f000dc8a87fdbb1c0ccdcf286d8 | Gabriel Sobrinho & Ricardo Henrique | 2012-11-08 | 1 | -0/+11 | |
|/ / | ||||||
* | | Ensure nested attributes is restored in case of a test failure | Carlos Antonio da Silva | 2012-11-03 | 1 | -1/+1 | |
| | | ||||||
* | | Simplify query conditions a bit in nested attributes test | Carlos Antonio da Silva | 2012-11-03 | 1 | -5/+3 | |
| | | | | | | | | Also refactor the test a bit. | |||||
* | | Check if the options value is present before to send the deprecation | Rafael Mendonça França | 2012-11-03 | 1 | -2/+2 | |
| | | | | | | | | message | |||||
* | | Deprecate passing a string as third argument of `add_index` | Rafael Mendonça França | 2012-11-02 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | This was there due historical reasons since 7dc45818dc43c163700efc9896a0f3feafa31138 to give the user the possibility to create unique indexes passing "UNIQUE" as the third argument | |||||
* | | Raise an ArgumentError when passing an invalid option to add_index | Rafael Mendonça França | 2012-11-02 | 1 | -0/+6 | |
| | | | | | | | | Closes #8104 | |||||
* | | Fix issue with collection associations and first(n)/last(n) | Carlos Antonio da Silva | 2012-11-01 | 1 | -0/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling first(n) or last(n) in a collection, Active Record was improperly trying to set the inverse of instance in case that option existed. This change was introduced by fdf4eae506fa9895e831f569bed3c4aa6a999a22. In such cases we don't need to do that "manually", since the way collection will be loaded will already handle that, so we just skip setting the inverse association when any argument is given to first(n)/last(n). The test included ensures that these scenarios will have the inverse of instance set properly. Fixes #8087, Closes #8094. Squashed cherry-pick from d37d40b and c368b66. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/collection_association.rb | |||||
* | | Remove extre count, preheat already happens during setup | Carlos Antonio da Silva | 2012-10-31 | 1 | -1/+0 | |
| | | ||||||
* | | Fix find_in_batches against string IDs when start option is not specified. | Alexis Bernard | 2012-10-31 | 1 | -0/+9 | |
| | | ||||||
* | | Fix `attributes_before_type_cast` for serialised attributes. | Nikita Afanasenko | 2012-10-31 | 1 | -3/+13 | |
| | | | | | | | | Public method `attributes_before_type_cast` used to return internal AR structure (ActiveRecord::AttributeMethods::Serialization::Attribute), patch fixes this. Now behaves like `read_attribute_before_type_cast` and returns unserialised values. | |||||
* | | Fix #6951. Use query cache/uncache, when using not only database.yml but ↵ | kennyj | 2012-10-31 | 1 | -0/+11 | |
| | | | | | | | | also DATABASE_URL. | |||||
* | | include_root_in_json allows inheritance. | kennyj | 2012-10-31 | 1 | -0/+16 | |
| | |