Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Remove return guard and use code convetions | Rafael Mendonça França | 2012-11-20 | 1 | -7/+11 | |
| | | ||||||
* | | Postgresql doesn't accepts limits on text columns. | Victor Costan | 2012-11-20 | 4 | -0/+35 | |
| | | ||||||
* | | Be a bit less conservative with mysql in adapter | Carlos Antonio da Silva | 2012-11-19 | 1 | -1/+1 | |
| | | ||||||
* | | Remove not needed begin..end from AR#save | Carlos Antonio da Silva | 2012-11-19 | 1 | -5/+3 | |
| | | ||||||
* | | 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 | 3 | -2/+31 | |
|\ \ | | | | | | | | | | | | | | | | | | | 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 | 3 | -2/+31 | |
| | | | | | | | | | | | | 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 | 3 | -0/+23 | |
| | | | ||||||
* | | | 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 | 2 | -14/+3 | |
| | | | ||||||
* | | | Bump mysql gem version to the newly 2.9.0, fix build. | Carlos Antonio da Silva | 2012-11-17 | 1 | -1/+1 | |
| | | | ||||||
* | | | 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 | 2 | -3/+1 | |
|/ / | ||||||
* | | Add a deprecation before removing find_table_name | Alexey Muranov | 2012-11-17 | 1 | -0/+6 | |
| | | | | | | The `ActiveRecord::Fixtures::find_table_name` method was removed from "master" almost a year ago, but it was never deprecated. Here it comes back, more dead than alive. | |||||
* | | Fix some AR changelog entries [ci skip] | Carlos Antonio da Silva | 2012-11-16 | 1 | -6/+5 | |
| | | ||||||
* | | Test for has_many bug on unsaved records | George Brocklehurst | 2012-11-16 | 1 | -0/+7 | |
| | | | | | | | | See issue #7950. | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-17 | 22 | -204/+204 | |
|\ \ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb | |||||
| * | | 1.9 Syntax related changes | AvnerCohen | 2012-11-10 | 15 | -93/+93 | |
| | | | ||||||
| * | | 1.9 hash syntax changes | AvnerCohen | 2012-11-08 | 7 | -111/+111 | |
| | | | ||||||
* | | | arel columns can be used for grouping so that "weird" column names are usable | Aaron Patterson | 2012-11-15 | 3 | -0/+11 | |
| | | | ||||||
* | | | stop hardcoding FrontBase adapter conditionals | Aaron Patterson | 2012-11-15 | 1 | -1/+1 | |
| | | | ||||||
* | | | stop passing *args to generate aliases | Aaron Patterson | 2012-11-15 | 1 | -4/+2 | |
| | | | ||||||
* | | | create fewer relation objects | Aaron Patterson | 2012-11-15 | 1 | -3/+6 | |
| | | | ||||||
* | | | 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 | 3 | -2/+19 | |
|\ \ \ \ | | | | | | | | | | | `#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 | 3 | -1/+18 | |
| | | | | | | | | | | | | | | | | | | | | Closes #7551 | |||||
| * | | | | cleanup, removed whitespace from CHANGELOG | Yves Senn | 2012-11-12 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Add a regression test on #8195 | Nikita Afanasenko | 2012-11-13 | 1 | -0/+7 | |
| |/ / / |/| | | | ||||||
* | | | | only clear caches if we are actually connected to the database | Aaron Patterson | 2012-11-12 | 1 | -2/+4 | |
| | | | | ||||||
* | | | | Merge and add tests related to 5215 | Vipul A M | 2012-11-12 | 3 | -18/+25 | |
|/ / / | ||||||
* | | | Remove duplicated ConnectionHandling extension in AR::Base | Carlos Antonio da Silva | 2012-11-11 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | Thanks @toretore. https://github.com/rails/rails/commit/9e4c41c903e8e58721f2c41776a8c60ddba7a0a9#commitcomment-2134706 | |||||
* | | | Make ActiveRecord::Delegation#method_missing threadsafe | Jon Leighton | 2012-11-10 | 1 | -3/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two threads may be in method_missing at the same time. If so, they might both try to define the same delegator method. Such a situation probably wouldn't result in a particularly spectacular bug as one method would probably just be overridden by an identical method, but it could cause warnings to pop up. (It could be worse if method definition is non-atomic in a particular implementation.) (We will also need this mutex shortly anyway, see #8127.) | |||||
* | | | Do not create useless database transaction when building `has_one` association. | Bogdan Gusiev | 2012-11-10 | 3 | -1/+24 | |
| | | | ||||||
* | | | Keep the code related to serialization in Serialization module. | Nikita Afanasenko | 2012-11-10 | 2 | -9/+13 | |
| | | | | | | | | | | | | We should not need any `serialized_attributes` checks outside `ActiveRecord::AttributeMethods::Serialization` module. | |||||
* | | | Gracefully handle upgrading apps with mass assigment configs | Andrew White | 2012-11-09 | 1 | -0/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Most apps upgrading from 3.x will have options for mass assigment in their application.rb and environments/*.rb config files. Rather than just raising a NoMethodError when copying the config, this commit adds a warning message until either the protected_attributes gem is installed or the relevant config options are removed. | |||||
* | | | Remove not used load hooks for active_record_config | Carlos Antonio da Silva | 2012-11-09 | 2 | -6/+0 | |
| | | | | | | | | | | | | | | | These were removed with ActiveRecord::Model in https://github.com/rails/rails/commit/9e4c41c903e8e58721f2c41776a8c60ddba7a0a9#L15L156 | |||||
* | | | fix warnings | Jon Leighton | 2012-11-09 | 1 | -1/+1 | |
| | | | ||||||
* | | | Properly deprecate ConnectionHandler#connection_pools | Jon Leighton | 2012-11-09 | 3 | -8/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -2/+19 | |
|\ \ \ | | | | | | | | | :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 | 6 | -2/+19 | |
| | | | | ||||||
* | | | | Delegate all calculations to the scope. | Jon Leighton | 2012-11-09 | 3 | -4/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | Nullify the relation at a more general level. | Jon Leighton | 2012-11-09 | 3 | -7/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to avoid hacks like the "return 0 if owner.new_record?" in #count (which this commit removes). Also, the relevant foreign key may actually be present even on a new owner record, in which case we *don't* want a null relation. This logic is encapsulated in the #null_scope? method. We also need to make sure that the CollectionProxy is not 'infected' with the NullRelation module, or else the methods from there will override the definitions in CollectionProxy, leading to incorrect results. Hence the nullify: false option to CollectionAssociation#scope. (This feels a bit nasty but I can't think of a better way.) | |||||
* | | | | Relations built off collection associations with an unsaved owner should be ↵ | Jon Leighton | 2012-11-09 | 2 | -2/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null relations For example, the following should not run any query on the database: Post.new.comments.where(body: 'omg').to_a # => [] Fixes #5215. | |||||
* | | | | Clean up gemspecs | Vinny Diehl | 2012-11-08 | 1 | -10/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Organized the gemspec files a bit. * Made quotes more consistent (single quotes dominated, so I used that). * Moved license line down a line, separating it logically, and removed the extra whitespace before its = operator. * Minor whitespace fixes. |