aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Remove tab chars before commands to be runÉtienne Barrié2016-07-201-4/+4
|
* Merge pull request #25885 from kamipo/fix_explain_logging_with_bindsRafael França2016-07-201-9/+20
|\ | | | | Fix explain logging with binds
| * Fix explain logging with bindsRyuta Kamizono2016-07-201-9/+20
| | | | | | | | `binds` is an array of a query attribute since Active Record 5.0.
* | Add `exists?` and `update_all` to `CollectionProxy` for respects an ↵Ryuta Kamizono2016-07-201-5/+1
|/ | | | | | association scope Fixes #25732.
* Merge pull request #25578 from ↵Rafael França2016-07-205-17/+30
|\ | | | | | | | | kamipo/move_warning_about_composite_primary_key_to_attribute_methods_primary_key Move the warning about composite primary key to `AttributeMethods::PrimaryKey`
| * Move the warning about composite primary key to `AttributeMethods::PrimaryKey`Ryuta Kamizono2016-07-025-17/+30
| | | | | | | | | | | | | | | | | | | | | | Actually schema dumper/creation supports composite primary key (#21614). Therefore it should not show the warning about composite primary key in connection adapter. This change moves the warning to `AttributeMethods::PrimaryKey` and suppress the warning for habtm join table. Fixes #25388.
* | Merge pull request #25889 from kamipo/do_not_dup_binds_in_to_sqlRafael França2016-07-201-1/+1
|\ \ | | | | | | Do not `binds.dup` in `connection#to_sql`
| * | Do not `binds.dup` in `connection#to_sql`Ryuta Kamizono2016-07-191-1/+1
| | | | | | | | | | | | Because `connection#to_sql` does not mutate `binds`.
* | | Merge pull request #25888 from kamipo/use_conn_to_sql_for_construct_sqlRafael França2016-07-201-10/+5
|\ \ \ | | | | | | | | Use `connection#to_sql` for construct an SQL
| * | | Use `connection#to_sql` for construct an SQLRyuta Kamizono2016-07-191-10/+5
| |/ /
* | | Merge pull request #25849 from suginoy/fix_merge_in_scopeRafael Mendonça França2016-07-201-1/+1
|\ \ \ | | | | | | | | | | | | Fix the calling `merge` method at first in a scope
| * | | Fix the calling `merge` method at first in a scopesuginoy2016-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the order of method chaining `merge` and other query method such as `joins` should produce the same result. ```ruby class Topic < ApplicationRecord scope :safe_chaininig, -> { joins(:comments).merge(Comment.newest) } scope :unsafe_chaininig, -> { merge(Comment.newest).joins(:comments) } #=> NoMethodError end ```
* | | | Merge pull request #25828 from bogdanvlviv/ref_default_sequence_nameRafael França2016-07-201-3/+3
|\ \ \ \ | | | | | | | | | | Refactored method `ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements#default_sequence_name`. Refactored test `HasManyAssociationsTest#test_do_not_call_callbacks_for_delete_all`.
| * | | | Refactored method ↵bogdanvlviv2016-07-171-3/+3
| | | | | | | | | | | | | | | | | | | | `ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements#default_sequence_name`
* | | | | Merge pull request #25834 from ↵Rafael França2016-07-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | alpaca-tc/fixes_multiparameter_attributes_on_time_with_time_zone_aware_attributes Fix bug in method AR TimeZoneConverter#set_time_zone_without_conversion
| * | | | | Fixes multiparameter attributes conversion with time_zone_aware_attributes ↵alpaca-tc2016-07-191-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | and invalid params
* | | | | Merge pull request #25869 from kamipo/specificiation_id_was_renamed_to_spec_nameRafael França2016-07-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | `specificiation_id` was renamed to `spec_name`
| * | | | | `specificiation_id` was renamed to `spec_name`Ryuta Kamizono2016-07-181-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #25868 from kamipo/fix_payload_class_name_to_spec_nameRafael França2016-07-202-9/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Fix `payload[:class_name]` to `payload[:spec_name]`
| * | | | Fix `payload[:class_name]` to `payload[:spec_name]`Ryuta Kamizono2016-07-172-9/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | Follow up to #20818. `retrieve_connection` is passed `spec_name` instead of `klass` since #24844.
* | / / Pass `type_casted_binds` to log subscriber for logging bind values properlyRyuta Kamizono2016-07-195-24/+19
| |/ / |/| | | | | | | | Address to https://github.com/rails/rails/commit/5a302bf553af0e6fedfc63299fc5cd6e79599ef3#commitcomment-18288388.
* | | Logging type casted bindsRyuta Kamizono2016-07-191-1/+5
| | | | | | | | | | | | Fixes #22398.
* | | [ci skip] Fix grammar in AR::AssociationsAlex Kitchens2016-07-181-13/+13
| | |
* | | deprecates the error_on_ignored_order_or_limit instance readerXavier Noria2016-07-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Albeit the previous existence of this method is not seen in the patch itself, the declaration mattr_accessor :error_on_ignored_order_or_limit, instance_writer: false was present before. It was removed recently in 210012f.
* | | Remove mattr_accessor for deprecated config `error_on_ignored_order_or_limit`.Prathamesh Sonpatki2016-07-181-1/+8
|/ / | | | | | | | | - It adds lot of warnings while running the tests. After https://github.com/rails/rails/commit/451437c6f57e66cc7586ec966e530493927098c7 it is not needed. - Added reader method with deprecation warning for backward compatibility.
* | Check if the logger exists before trying to use itRafael Mendonça França2016-07-171-1/+1
| |
* | Merge pull request #20818 from ↵Rafael França2016-07-172-0/+43
|\ \ | | | | | | | | | | | | jeremywadsack/use_transactional_fixtures_all_databases Use notification to ensure that lazy-loaded model classes have transactions
| * | Create connection.active_record notification and use that to ensure that lazy-Jeremy Wadsack2016-07-122-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loaded model classes have their connections wrapped in transactions. See #17776 In Rails 4 config.eager_load was changed to false in the test environment. This means that model classes that connect to alternate databases with establish_connection are not loaded at start up. If use_transactional_fixtures is enabled, transactions are wrapped around the connections that have been established only at the start of the test suite. So model classes loaded later don't have transactions causing data created in the alternate database not to be removed. This change resolves that by creating a new connection.active_record notification that gets fired whenever a connection is established. I then added a subscriber after we set up transactions in the test environment to listen for additional connections and wrap those in transactions as well.
* | | Merge pull request #25815 from greysteil/add-newline-between-structure-versionsRafael França2016-07-161-2/+2
|\ \ \ | | | | | | | | Add newline between each migration in `structure.sql`
| * | | Add newline between each migration in `structure.sql`Grey Baker2016-07-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Keeps schema migration inserts as a single commit, so we still get all of the benefits of https://github.com/rails/rails/commit/42dd2336b31a8d98776d039a2b9fd7f834156a78, but allows for easier git diff-ing. Fixes #25504.
* | | | [ci skip] fix a typoYamaguchi.Tomoki2016-07-151-1/+1
|/ / /
* | | small reword [ci skip]Xavier Noria2016-07-141-3/+3
| | |
* | | removes a unnecessary limit callXavier Noria2016-07-131-1/+0
| | | | | | | | | | | | | | | We are setting a limit unconditionally just below, which overrides any existing one anyway.
* | | adds support for limits in batch processingXavier Noria2016-07-132-44/+83
|/ /
* | Merge pull request #25794 from mechanicles/rails-to-RailsRafael França2016-07-122-2/+2
|\ \ | | | | | | rails -> Rails [ci skip]
| * | rails -> Rails [ci skip]Santosh Wadghule2016-07-122-2/+2
| | |
* | | Always prefer class types to query types when casting `group`Sean Griffin2016-07-112-6/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | | | When `group` is used in combination with any calculation method, the resulting hash uses the grouping expression as the key. Currently we're incorrectly always favoring the type reported by the query, instead of the type known by the class. This causes differing behavior depending on whether the adaptor actually gives proper types with the query or not. After this change, the behavior will be the same on all adaptors -- we see if we know the type from the class, fall back to the type from the query, and finally fall back to the identity type. Fixes #25595
* | fix to_param to maximize contentRob Biedenharn2016-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation states that parameter values longer than 20 characters will be truncated by words, but the example shows that a parameter based on "David Heinemeier Hansson" (with id: 125) becomes "125-david" when "David Heinemeier".length == 16 so why so short? The answer lies in the use of the #truncate option omission: nil which seems to have been intended to mean "nothing", but which actually causes the default string "..." to be used. This causes #truncate to cleave words until the "..." can be added and still remain within the requested size of 20 characters. The better option is omission: '' (which is probably what was originally intended). Furthermore, since the use of #parameterize will remove non-alphanumeric characters, we can maximize the useful content of the output by calling parameterize first and then giving truncate a separator: /-/ rather than a space.
* | [ci skip] Update documentation in AR SchemaStatementsAlex Kitchens2016-07-071-12/+12
| | | | | | | | This includes minor grammar fixes throughout the file.
* | Merge pull request #25707 from matthewd/double-reapMatthew Draper2016-07-072-10/+39
|\ \ | | | | | | Don't reap connections that have already been reassigned
| * | Make connection stealing more explicitMatthew Draper2016-07-062-5/+23
| | |
| * | Reduce locking by taking ownership of stale connectionsMatthew Draper2016-07-061-9/+8
| | | | | | | | | | | | | | | | | | This way, we aren't racing other threads, so we don't need to re-check the conditional. And we no longer need to hold the lock while calling remove (which can choose to make a new connection while we wait).
| * | Re-check that the connection is still stale before we reap itMatthew Draper2016-07-061-0/+2
| | | | | | | | | | | | | | | | | | | | | A concurrent thread may have also detected it to be stale, and already released (or even reassigned) it by now. Fixes #25585
| * | Check connection ownership before allowing a thread to release itMatthew Draper2016-07-061-1/+11
| | | | | | | | | | | | | | | A thread can only release a connection if it owns it, or it's owned by a thread that has died.
* | | [ci skip] Update ConnectionPool documentation for readabilityAlex Kitchens2016-07-061-21/+21
| | |
* | | Merge pull request #25668 from kamipo/use_squish_rather_than_strip_heredocRafael França2016-07-052-4/+4
|\ \ \ | | | | | | | | Use `squish` rather than `strip_heredoc`
| * | | Use `squish` rather than `strip_heredoc`Ryuta Kamizono2016-07-042-4/+4
| |/ /
* | | Merge pull request #25680 from ↵Rafael França2016-07-041-7/+5
|\ \ \ | | | | | | | | | | | | | | | | HermanHiddema/fix/unnecessary-nesting-in-handle-dependency Fixed unnecessary nesting in handle_dependency
| * | | Fixed unnecessary nesting in handle_dependencyHerman Hiddema2016-07-041-7/+5
| |/ / | | | | | | | | | | | | This nested if checked the same value as the containing case statement. Moved the code in the if/else into when/else in the containing case.
* / / fix respond_to? documentationKivanio Barbosa2016-07-041-7/+7
|/ /