aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #26980 from ↵Sean Griffin2016-11-176-13/+19
|\ | | | | | | | | kamipo/respect_new_records_for_collection_proxy_distinct Respect new records for `CollectionProxy#uniq`
| * Respect new records for `CollectionProxy#uniq`Ryuta Kamizono2016-11-136-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently if `CollectionProxy` has more than one new record, `CollectionProxy#uniq` result is incorrect. And `CollectionProxy#uniq` was aliased to `distinct` in a1bb6c8b06db. But the `uniq` method and the `SELECT DISTINCT` method are different methods. The doc in `CollectionProxy` is for the `SELECT DISTINCT` method, not for the `uniq` method. Therefore, reverting the alias in `CollectionProxy` to fix the inconsistency and to have the both methods.
* | Fix mucking of connection_config leading to issues in prepared_statementsVipul A M2016-11-171-3/+3
| |
* | Fix PG prepared statement testVipul A M2016-11-171-1/+2
| |
* | docs, add `update_all` example with SQL fragment. [ci skip]Yves Senn2016-11-161-0/+3
| | | | | | | | | | | | The relation method `update_all` allows you to pass a SQL fragment. The functionality is already mentioned in the prose but the examples section does not cover it.
* | Support AC::Parameters for PG HStoreJon Moss2016-11-153-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported via #26904, there is a regression in how values for Postgres' HStore column type are being processed, beginning in Rails 5. Currently, the way that Active Record checks whether or not values need to be serialized and put into the correct storage format is whether or not it is a `Hash` object. Since `ActionController::Parameters` no longer inherits from `Hash` in Rails 5, this conditional now returns false. To remedy this, we are now checking to see whether the `value` parameters being passed in responds to a certain method, and then calling the `serialize` method, except this time with a real Hash object. Keeping things DRY! Fixes #26904.
* | Refactor `NullRelation#calculate`Ryuta Kamizono2016-11-161-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ```ruby def calculate(operation, _column_name) if [:count, :sum].include? operation group_values.any? ? Hash.new : 0 elsif [:average, :minimum, :maximum].include?(operation) && group_values.any? Hash.new else nil end end ``` After: ```ruby def calculate(operation, _column_name) case operation when :count, :sum group_values.any? ? Hash.new : 0 when :average, :minimum, :maximum group_values.any? ? Hash.new : nil end end ```
* | Fix style violationsRafael Mendonça França2016-11-141-1/+1
| |
* | Merge pull request #27030 from kamipo/avoid_build_preloaderRafael França2016-11-131-2/+3
|\ \ | | | | | | Avoid `build_preloader` if preloading is not needed
| * | Avoid `build_preloader` if preloading is not neededRyuta Kamizono2016-11-141-2/+3
| | |
* | | Call `spawn` and bang method for `none`Ryuta Kamizono2016-11-141-1/+1
| | | | | | | | | | | | All query methods calls `spawn` and bang method, but only `none` is not.
* | | Fix NameError: undefined local variable or method `result`Ryuta Kamizono2016-11-141-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caused by 007e50d8e5a900547471b6c4ec79d9d217682c5d. https://github.com/rails/rails/pull/26925 was closed in favor of dcb364e. But dcb364e is only fixed sqlite3 adapter and still broken mysql2 adapter with `prepared_statements: true` (`exec_stmt_and_free`). ```diff diff --git a/activerecord/test/config.example.yml b/activerecord/test/config.example.yml index 58e2d45..7b3c1a6 100644 --- a/activerecord/test/config.example.yml +++ b/activerecord/test/config.example.yml @@ -56,9 +56,11 @@ connections: username: rails encoding: utf8 collation: utf8_unicode_ci + prepared_statements: true arunit2: username: rails encoding: utf8 + prepared_statements: true oracle: arunit: ``` ``` % be rake test_mysql2 --verbose ... Using mysql2 /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb:90: warning: assigned but unused variable - result /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb:101:in `block in exec_stmt_and_free': NameError: undefined local variable or method `result' for #<ActiveRecord::ConnectionAdapters::Mysql2Adapter:0x007fe2c50eb140>: SELECT `ar_internal_metadata`.* FROM `ar_internal_metadata` WHERE `ar_internal_metadata`.`key` = ? LIMIT ? (ActiveRecord::StatementInvalid) from /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb:586:in `block in log' ... ```
* | Merge pull request #27024 from vipulnsward/changelog-editsAndrew White2016-11-131-7/+7
|\ \ | | | | | | Changelog edits
| * | Changelog editsVipul A M2016-11-121-7/+7
| | |
* | | Merge pull request #26905 from bogdanvlviv/docsAndrew White2016-11-1315-23/+24
|\ \ \ | |_|/ |/| | Add missing `+` around a some literals.
| * | Add missing `+` around a some literals.bogdanvlviv2016-10-2715-23/+24
| | | | | | | | | | | | | | | | | | Mainly around `nil` [ci skip]
* | | Merge pull request #27019 from djpowers/patch-1Jon Moss2016-11-121-2/+2
|\ \ \ | | | | | | | | Fix spelling in API documentation
| * | | Fix spelling in API docsDave Powers2016-11-121-2/+2
| | |/ | |/| | | | | | | [ci skip]
* / | Add `:nodoc` to `table_structure`Ryuta Kamizono2016-11-121-9/+2
|/ / | | | | | | | | | | | | | | Follow up to #27008. `table_structure` is an internal method so it is better to hide it in the doc. And alias `table_structure` to `column_definitions` to remove the duplicated `columns` method in the sqlite3 adapter.
* | Refactor column initialization into `new_column_from_field`Kir Shatrov2016-11-114-38/+48
| | | | | | | | that accepts results of SHOW FIELDS
* | Merge pull request #26978 from matthewd/query-cache-poolMatthew Draper2016-11-104-4/+73
|\ \ | | | | | | Configure query caching (per thread) on the connection pool
| * | Configure query caching (per thread) on the connection poolMatthew Draper2016-11-064-2/+71
| | |
| * | Try harder to avoid making a connection while releasing itMatthew Draper2016-11-061-2/+2
| | | | | | | | | | | | connected? doesn't mean what we need here.
* | | Mysql2::Client::FOUND_ROWS should be defined in all currently supported ↵Akira Matsuda2016-11-101-6/+4
| | | | | | | | | | | | versions of mysql2
* | | Add ActiveRecord::Base.connection_pool.statPavel2016-11-093-0/+47
|/ /
* | Merge pull request #26909 from matthewd/query-cache-connectionMatthew Draper2016-11-064-40/+75
|\ \ | | | | | | Clear query cache during checkin, instead of an execution callback
| * | Clear query cache during checkin, instead of an execution callbackMatthew Draper2016-10-274-40/+75
| | | | | | | | | | | | | | | | | | | | | It doesn't make sense for the query cache to persist while a connection moves through the pool and is assigned to a new thread. [Samuel Cochran & Matthew Draper]
* | | Merge pull request #26972 from ↵Rafael França2016-11-052-8/+17
|\ \ \ | | | | | | | | | | | | | | | | kamipo/avoid_unscope_order_when_limit_value_present Avoid `unscope(:order)` when `limit_value` is presented for `count`
| * | | Avoid `unscope(:order)` when `limit_value` is presented for `count`Ryuta Kamizono2016-11-062-8/+17
| | | | | | | | | | | | | | | | | | | | If `limit_value` is presented, records fetching order is very important for performance. Should not unscope the order in the case.
* | | | Erubis is not actually used in ARAkira Matsuda2016-11-061-2/+2
|/ / /
* | | Use different name for main and thread connection variable.Charles Oliver Nutter2016-11-041-5/+5
| | | | | | | | | | | | | | | | | | Under JRuby, the updates of the one shared variable interleaved, causing threads to pick up each others' connections. I'm amazed this worked on MRI.
* | | Don't assign default attributes until after loading schemaSean Griffin2016-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If the call to `.define_attribute_methods` actually ends up loading the schema (*very* hard to do, as it requires the object being created without `allocate` having been called, but it can be done by manually calling `initialize` from inside `marshal_load` if you're crazy), the value of `_default_attributes` will change from that call.
* | | Merge pull request #26455 from kamipo/move_test_quoting_classesArthur Nogueira Neves2016-11-032-13/+4
|\ \ \ | | | | | | | | Move `test_quoting_classes` into `test/cases/quoting_test.rb`
| * | | Move `test_quoting_classes` into `test/cases/quoting_test.rb`Ryuta Kamizono2016-10-292-13/+4
| | | |
* | | | Merge pull request #24202 from Sen-Zhang/fix_datetime_errorArthur Nogueira Neves2016-11-033-1/+13
|\ \ \ \ | | | | | | | | | | fix datatime error
| * | | | fix datatime errorSen-Zhang2016-11-013-1/+13
| | | | |
* | | | | Fixes TypeError Exception when cache counter value equals nil (#26940)Daniel E. Garcia Shulman2016-11-022-1/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | * Fixes TypeError when cache counter value equals nil * Test case for counter cache on unloaded has_many association
* | | | Merge pull request #26451 from kamipo/remove_target_uniq_sizeSean Griffin2016-11-011-5/+1
|\ \ \ \ | | | | | | | | | | Remove unnecessary `target.uniq.size` in `CollectionAssociation#size`
| * | | | Remove unnecessary `target.uniq.size` in `CollectionAssociation#size`Ryuta Kamizono2016-10-291-5/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `association_scope` have `distinct_value`, same record cannot exist in `target`. https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/associations/collection_association.rb#L419-L424 ```ruby def add_to_target(record, skip_callbacks = false, &block) if association_scope.distinct_value index = @target.index(record) end replace_on_target(record, index, skip_callbacks, &block) end ```
* | | | Merge pull request #26453 from kamipo/remove_unused_internal_dependent_optionSean Griffin2016-11-011-4/+1
|\ \ \ \ | | | | | | | | | | Remove unused internal `:dependent` option in `CollectionAssociation#delete`
| * | | | Remove unused internal `:dependent` option in `CollectionAssociation#delete`Ryuta Kamizono2016-10-291-4/+1
| |/ / / | | | | | | | | | | | | | | | | The internal `:dependent` option was introduced at #10604. But currently unused.
* | | | Allow `autosave: true` to be used with inverse ofSean Griffin2016-11-015-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the changes in #25337, double save bugs are pretty much impossible, so we can just lift this restriction with pretty much no change. There were a handful of cases where we were relying on specific quirks in tests that had to be updated. The change to has_one associations was due to a particularly interesting test where an autosaved has_one association was replaced with a new child, where the child failed to save but the test wanted to check that the parent id persisted to `nil`. I think this is almost certainly the wrong behavior, and I may change that behavior later. But ultimately the root cause was because we never remove the parent in memory when nullifying the child. This makes #23197 no longer needed, but it is what we'll do to fix some issues on 5.0 Close #23197
* | | | Deprecate the behavior of AR::Dirty inside of after_(create|update|save) ↵Sean Griffin2016-11-0118-53/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callbacks We pretty frequently get bug reports that "dirty is broken inside of after callbacks". Intuitively they are correct. You'd expect `Model.after_save { puts changed? }; model.save` to do the same thing as `model.save; puts model.changed?`, but it does not. However, changing this goes much farther than just making the behavior more intuitive. There are a _ton_ of places inside of AR that can be drastically simplified with this change. Specifically, autosave associations, timestamps, touch, counter cache, and just about anything else in AR that works with callbacks have code to try to avoid "double save" bugs which we will be able to flat out remove with this change. We introduce two new sets of methods, both with names that are meant to be more explicit than dirty. The first set maintains the old behavior, and their names are meant to center that they are about changes that occurred during the save that just happened. They are equivalent to `previous_changes` when called outside of after callbacks, or once the deprecation cycle moves. The second set is the new behavior. Their names imply that they are talking about changes from the database representation. The fact that this is what we really care about became clear when looking at `BelongsTo.touch_record` when tests were failing. I'm unsure that this set of methods should be in the public API. Outside of after callbacks, they are equivalent to the existing methods on dirty. Dirty itself is not deprecated, nor are the methods inside of it. They will only emit the warning when called inside of after callbacks. The scope of this breakage is pretty large, but the migration path is simple. Given how much this can improve our codebase, and considering that it makes our API more intuitive, I think it's worth doing.
* | | | allow ActiveRecord::Core#slice to use array argCohen Carlisle2016-10-313-1/+15
| | | |
* | | | Remove a confusing commentyui-knk2016-10-311-1/+0
| | | | | | | | | | | | | | | | | | | | These comment sometimes explain a face which does not match the face.
* | | | Fix the order of `create_table` to match a comment about `:inverse_of` optionsyui-knk2016-10-311-4/+4
|/ / / | | | | | | | | | | | | In ActiveRecord test :men, :faces, :interests and :zines tables are used for `:inverse_of` test cases, not `:wheels`.
* | | Add more rubocop rules about whitespacesRafael Mendonça França2016-10-2997-356/+356
| | |
* | | Fix the variable scoping issue I introduced in ↵Matthew Draper2016-10-281-2/+2
| | | | | | | | | | | | 007e50d8e5a900547471b6c4ec79d9d217682c5d
* | | Merge PR #19759Arthur Neves2016-10-283-1/+24
|\ \ \ | | | | | | | | | | | | Fix for has_and_belongs_to_many & has_many_through associations
| * | | Fix for has_and_belongs_to_many & has_many_through associations while ↵Mehmet Emin İNAÇ2016-02-133-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partial_writes is false This will fix #19663 Also with this fix, active record does not fire unnecassary update queries while partial_writes is true