aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #27108 from matthewd/allocate-connections-after-blockingMatthew Draper2016-11-252-25/+17
|\ | | | | Distribute connections to previously blocked threads when we're done
| * Distribute connections to previously blocked threads when we're doneMatthew Draper2016-11-252-25/+17
| | | | | | | | | | | | Two methods block new connections; we were already doing the right thing for clear_reloadable_connections, but it's better placed in with_new_connections_blocked, where it can work for disconnect too.
* | Add test for collection *_ids= setter when association primary key setDominic Cleal2016-11-244-1/+23
| | | | | | | | | | | | | | | | Fixes casting of IDs to the data type of the association primary key, rather than then the data type of the model's primary key. (Tests use a string primary key on the association, rather than an int.) Tests issue #20995
* | Restore RecordNotFound when *_ids= can't find records by IDDominic Cleal2016-11-244-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c9fb19 changed the behaviour of the _ids= setters for associations to raise an AssociationTypeMismatch when unknown IDs are given: Class: <ActiveRecord::AssociationTypeMismatch> Message: <"Developer(#43811860) expected, got NilClass(#16732720)"> This restores the original ActiveRecord::RecordNotFound exception with a much clearer error message: Class: <ActiveRecord::RecordNotFound> Message: <"Couldn't find all Developers with 'id': (1, -9999) [WHERE \"contracts\".\"company_id\" = ?] (found 1 results, but was looking for 2)"> Fixes #25719
* | For `PostgreSQL >= 9.4` use `gen_random_uuid()`Yaw Boakye2016-11-226-22/+86
| | | | | | | | | | | | | | | | | | | | Since 9.4, PostgreSQL recommends using `pgcrypto`'s `gen_random_uuid()` to generate version 4 UUIDs instead of the functions in the `uuid-ossp` extension. These changes uses the appropriate UUID function depending on the underlying PostgreSQL server's version, while maintaining `uuid_generate_v4()` in older migrations.
* | Introduce `reload_<association>` reader for singular associations.Yves Senn2016-11-225-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch brings back the functionality of passing true to the association proxy. The behavior was deprecated with #20888 and scheduled for removal in Rails 5.1. The deprecation mentioned that instead of `Article.category(true)` one should use `article#reload.category`. Unfortunately the alternative does not expose the same behavior as passing true to the reader did. Specifically reloading the parent record throws unsaved changes and other caches away. Passing true only affected the association. This is problematic and there is no easy workaround. I propose to bring back the old functionality by introducing this new reader method for singular associations.
* | update bin/test scripts to prevent double runs.Yves Senn2016-11-211-2/+0
| | | | | | | | | | The test runner was updated to make use of autorun. This caused the `bin/test` scripts to run Minitest twice.
* | changelog entry for fc4c15d [ci skip]Yves Senn2016-11-211-0/+5
| | | | | | | | https://github.com/rails/rails/commit/fc4c15d823b112cc440cbd9a4288e1a389c138da
* | `eager_autoload` needs to be triggered for nested constants.Yves Senn2016-11-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `ActiveRecord::Associations.eager_load!` is called, it eager loads the `Preloader` but does not trigger a `eager_load!` on the `Preloader` itself. A eager loaded component is responsible to forward the `eager_load!` call to nested constants that make use of `eager_autoload` as well. This will also resolve the occasional `NameError` that we've observed in production: ``` NameError: uninitialized constant ActiveRecord::Associations::Preloader::BelongsTo ```
* | Fix prepared statements disabled test againPrathamesh Sonpatki2016-11-202-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Due to `assert_nothing_raised` this test was not really testing anything. - So updated it to assert that the query gives expected result. - Also in general we can use `connection.unprepared_statement` for testing queries w/o prepared statements but it can't be used in this case. This test cases was added because when prepared_statements config is set to false, then DetermineIfPreparableVisitor module does not extended by Arel visitor resulting into an error. Ref: https://github.com/rails/rails/pull/22748. - Because DetermineIfPreparableVisitor module does not get added to the visitor chain only if prepared_statements is false while **setting up connection**, not when `unprepared_statement` is used. - I have also added an assertion for making sure that prepared_config is set to false from the start, so that nobody accidentally removes the connection setup using `arunit_without_prepared_statements` and replaces it with stubs or unprepared_statement.
* | Fix typo s/with/without/Ryuta Kamizono2016-11-202-2/+2
| | | | | | | | Follow up to #27109.
* | Merge pull request #27109 from prathamesh-sonpatki/fix-prepared-statements-testKasper Timm Hansen2016-11-193-5/+9
|\ \ | |/ |/| Fix tests for prepared_statements: false and queries hitting `#select_all`
| * Fix tests for prepared_statements: false and queries hitting `#select_all`Prathamesh Sonpatki2016-11-193-5/+9
| | | | | | | | | | | | | | | | | | | | - The query needs to be executed for hitting `select_all` so made sure that query gets executed. - Also instead of changing instance variable, just add new configuration for prepared_statements: false and use it for this test. - This way we don't have to touch the internals of AR code and still disable prepared statements config for this test.
* | Merge pull request #27057 from kamipo/fix_race_conditionMatthew Draper2016-11-191-6/+7
|\ \ | |/ |/| | | Fix the race condition caused by `with_new_connections_blocked`
| * Fix the race condition caused by `with_new_connections_blocked`Ryuta Kamizono2016-11-181-8/+4
| | | | | | | | | | | | `with_new_connections_blocked` was introduced at #14938. But the method sometimes causes `@new_cons_enabled = false` then never toggled to true.
* | Merge pull request #26981 from kamipo/should_not_except_order_for_existsRafael França2016-11-172-2/+3
|\ \ | | | | | | Should except `:distinct` rather than `:order` for `exists?`
| * | Should except `:distinct` rather than `:order` for `exists?`Ryuta Kamizono2016-11-092-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Records fetching order is very important for performance if `limit` is presented. Should not except the order in the case. And `exists?` replaces select list to `1 AS one` therefore `:distinct` is useless (`DISTINCT 1 AS one`). And PostgreSQL raises the following error if `:distinct` and `:order` are used in the same time. ``` ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list ```
* | | Merge pull request #27076 from y-yagi/fix_postgresql_array_encodingSean Griffin2016-11-172-4/+4
|\ \ \ | | | | | | | | use `force_encoding` instread of `encode!` to avoid `UndefinedConversionError`
| * | | use `force_encoding` instread of `encode!` to avoid `UndefinedConversionError`yuuji.yaginuma2016-11-172-4/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `PG::TextEncoder::Array#encode` returns the encoded value with `ASCII-8BIT`. But in some cases, trying to convert `ASCII-8BIT` to `UTF-8` cause an error. ```ruby "{\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB}".encode!(Encoding::UTF_8) # => Encoding::UndefinedConversionError: "\xE3" from ASCII-8BIT to UTF-8 ``` Should use `force_encoding` to avoid this error. Follow up to 7ba3a48df5bfdc5e98506bb829f937e03b55a5b3 Ref: https://github.com/rails/rails/pull/23619#issuecomment-189924036
* | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 02:26:24 +0000