aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #3023 from Tho85/preserve_sti_typeRafael Mendonça França2012-11-183-2/+31
|\ \ | | | | | | | | | | | | | | | | | | AR::Base.becomes should not change the STI type Conflicts: activerecord/CHANGELOG.md
| * | AR::Base.becomes should not change the STI typeThomas Hollstegge2012-11-173-2/+31
| | | | | | | | | | | | If you want to change the STI type too, use AR::Base.becomes! instead
* | | Add rename_index to change_table.Jarek Radosz2012-11-193-0/+23
| | |
* | | Ensure ordering to make the test pass with postgresqlCarlos Antonio da Silva2012-11-181-4/+5
| | |
* | | Add test to ensure preloading works as expected with "select" and "includes".Dieter Komendera2012-11-181-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 commentsCarlos Antonio da Silva2012-11-172-14/+3
| | |
* | | Bump mysql gem version to the newly 2.9.0, fix build.Carlos Antonio da Silva2012-11-171-1/+1
| | |
* | | Fix typo in module name and make #in_time_zone privateCarlos Antonio da Silva2012-11-173-3/+5
| | |
* | | Extract #in_time_zone helper method duplication to a moduleCarlos Antonio da Silva2012-11-173-24/+17
| | |
* | | Simplify helper method in attribute methods testCarlos Antonio da Silva2012-11-171-3/+1
| | |
* | | Remove return guardCarlos Antonio da Silva2012-11-172-3/+1
|/ /
* | Add a deprecation before removing find_table_nameAlexey Muranov2012-11-171-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 Silva2012-11-161-6/+5
| |
* | Test for has_many bug on unsaved recordsGeorge Brocklehurst2012-11-161-0/+7
| | | | | | | | See issue #7950.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-1722-204/+204
|\ \ | | | | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb
| * | 1.9 Syntax related changesAvnerCohen2012-11-1015-93/+93
| | |
| * | 1.9 hash syntax changesAvnerCohen2012-11-087-111/+111
| | |
* | | arel columns can be used for grouping so that "weird" column names are usableAaron Patterson2012-11-153-0/+11
| | |
* | | stop hardcoding FrontBase adapter conditionalsAaron Patterson2012-11-151-1/+1
| | |
* | | stop passing *args to generate aliasesAaron Patterson2012-11-151-4/+2
| | |
* | | create fewer relation objectsAaron Patterson2012-11-151-3/+6
| | |
* | | Assert the query result instead of checking for nothing raisedCarlos Antonio da Silva2012-11-131-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_resultCarlos Antonio da Silva2012-11-132-0/+13
|\ \ \ | | | | | | | | Regression test for #7238
| * | | Regression test for #7238Nikita Afanasenko2012-11-132-0/+13
| | | |
* | | | Merge pull request #8176 from senny/7551_pluck_with_selectRafael Mendonça França2012-11-133-2/+19
|\ \ \ \ | | | | | | | | | | `#pluck` can be used on a relation with `select` clause (#7551)
| * | | | `#pluck` can be used on a relation with `select` clause.Yves Senn2012-11-123-1/+18
| | | | | | | | | | | | | | | | | | | | Closes #7551
| * | | | cleanup, removed whitespace from CHANGELOGYves Senn2012-11-121-1/+1
| | | | |
* | | | | Add a regression test on #8195Nikita Afanasenko2012-11-131-0/+7
| |/ / / |/| | |
* | | | only clear caches if we are actually connected to the databaseAaron Patterson2012-11-121-2/+4
| | | |
* | | | Merge and add tests related to 5215Vipul A M2012-11-123-18/+25
|/ / /
* | | Remove duplicated ConnectionHandling extension in AR::BaseCarlos Antonio da Silva2012-11-111-1/+0
| | | | | | | | | | | | | | | Thanks @toretore. https://github.com/rails/rails/commit/9e4c41c903e8e58721f2c41776a8c60ddba7a0a9#commitcomment-2134706
* | | Make ActiveRecord::Delegation#method_missing threadsafeJon Leighton2012-11-101-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 Gusiev2012-11-103-1/+24
| | |
* | | Keep the code related to serialization in Serialization module.Nikita Afanasenko2012-11-102-9/+13
| | | | | | | | | | | | We should not need any `serialized_attributes` checks outside `ActiveRecord::AttributeMethods::Serialization` module.
* | | Gracefully handle upgrading apps with mass assigment configsAndrew White2012-11-091-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_configCarlos Antonio da Silva2012-11-092-6/+0
| | | | | | | | | | | | | | | These were removed with ActiveRecord::Model in https://github.com/rails/rails/commit/9e4c41c903e8e58721f2c41776a8c60ddba7a0a9#L15L156
* | | fix warningsJon Leighton2012-11-091-1/+1
| | |
* | | Properly deprecate ConnectionHandler#connection_poolsJon Leighton2012-11-093-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_manyJon Leighton2012-11-096-2/+19
|\ \ \ | | | | | | | | :counter_cache option for to support custom named counter caches
| * | | :counter_cache option for to support custom named counter caches. Closes #7993Yves Senn2012-11-046-2/+19
| | | |
* | | | Delegate all calculations to the scope.Jon Leighton2012-11-093-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? ownerJon Leighton2012-11-092-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 Leighton2012-11-093-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 Leighton2012-11-092-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 gemspecsVinny Diehl2012-11-081-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.
* | | | Add test to avoid regression of 58e48d5292242f000dc8a87fdbb1c0ccdcf286d8Gabriel Sobrinho & Ricardo Henrique2012-11-081-0/+11
| | | |
* | | | Remove not used indifferent_access requires from Base and FinderMethodsCarlos Antonio da Silva2012-11-072-3/+0
| | | |
* | | | Use cached quoted_table_name instead of going through the connectionCarlos Antonio da Silva2012-11-071-1/+1
| | | |
* | | | Remove block given check from private find_with_idsCarlos Antonio da Silva2012-11-071-2/+0
| | | | | | | | | | | | | | | | | | | | This is already handled by #find, it's a duplicate check, since find_with_ids is not called from anywhere else.
* | | | stop raising so many exceptionsAaron Patterson2012-11-071-1/+5
| | | |