aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25179 from kamipo/reuse_result_of_associated_tableSean Griffin2016-05-301-2/+3
|\ | | | | Reuse a result of `table.associated_table(column)` in `AssociationQueryHandler.value_for`
| * Reuse a result of `table.associated_table(column)` in ↵Ryuta Kamizono2016-05-281-2/+3
| | | | | | | | `AssociationQueryHandler.value_for`
* | Exists shouldn't error when used with `includes`Sean Griffin2016-05-303-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `exists?` does some hackery where it assumes that we can join onto anything that we passed to `eager_load` or `includes`, which doesn't work if we are joining onto a polymorphic association. Actually figuring out if we want to include something would require knowledge deep within the join dependency module, which is hard to pull up. The simplest solution is just to pass a flag down that says we're not actually going to try to eager load any of the data. It's not the solution I'd like, but that code really needs to be untangled before we can do much with it. This is another attempt at 6d5b1fd which should address the concerns that led to reverting it in 4ecabed.
* | Tiny document fixes [ci skip]Robin Dupret2016-05-301-1/+1
| | | | | | | | | | | | Add a missing capital letter and avoid using absolute links to the API because they may refer to out-dated documentation on the Edge site.
* | Merge pull request #22240 from resource11/resource11-patch-1Arthur Nogueira Neves2016-05-291-4/+4
|\ \ | | | | | | Requesting documentation update
| * | Issue 22240: adds link to list of instance methods [ci skip]Kathleen McMahon2016-03-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Update associations.rb Update associations.rb updates link to instance methods [ci skip]
* | | Merge pull request #24965 from arthurnn/arthurnn/conn_apiArthur Nogueira Neves2016-05-294-25/+28
|\ \ \ | |_|/ |/| | Change some establish_connection logic
| * | Add to_hash to specificationArthur Neves2016-05-253-3/+6
| | |
| * | Remove `name` from `establish_connection`Arthur Neves2016-05-244-21/+17
| | | | | | | | | | | | | | | Instead of passing a separete name variable, we can make the resolver merge a name on the config, and use that before creating the Specification.
| * | Move establish_connection to handlerArthur Neves2016-05-243-14/+18
| | |
* | | Remove unused `association_for_table` private methodRyuta Kamizono2016-05-271-6/+0
| | | | | | | | | | | | `association_for_table` is unused since 50a8cdf.
* | | Fix `has_one` `enum` `where` queriesJon Moss2016-05-261-1/+2
|/ / | | | | | | Fixes #25128
* | [] and read_attribute are not aliases [ci skip]Benjamin Quorning2016-05-241-2/+0
| | | | | | | | | | | | The `#[]` method *used to be* an alias of `#read_attribute`, but since Rails 4 (10f6f90d9d1bbc9598bffea90752fc6bd76904cd), it will raise an exception for missing attributes. Saying that it is an alias is confusing.
* | Merge pull request #24862 from maclover7/jm-ar-fixesRafael França2016-05-211-2/+2
|\ \ | | | | | | Add missing `the`
| * | Add missing `the`Jon Moss2016-05-211-2/+2
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #25093 from Erol/activerecord-transaction-serialization-errorRafael França2016-05-213-3/+24
|\ \ \ | | | | | | | | Introduce AR::TransactionSerializationError for transaction serialization failures or deadlocks
| * | | Add AR::TransactionSerializationError for transaction serialization failures ↵Erol Fornoles2016-05-213-3/+24
| | | | | | | | | | | | | | | | or deadlocks
* | | | Merge pull request #24732 from y-yagi/update_record_specified_in_the_keyRafael França2016-05-211-1/+1
|\ \ \ \ | |/ / / |/| | | update record specified in key
| * | | update record specified in keyyuuji.yaginuma2016-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `#first_or_initialize` does not use attributes to data acquisition. Therefore, there is a possibility of updating the different record than the one specified in the key, I think this is not expected behavior.
* | | | Merge pull request #24958 from maclover7/fix-24955Rafael França2016-05-201-1/+5
|\ \ \ \ | | | | | | | | | | Fix ActiveRecord::LogSubscriber edge case
| * | | | Fix ActiveRecord::LogSubscriber edge caseJon Moss2016-05-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an attribute was of the binary type, and also was a Hash, it would previously not be logged, and instead raise an error saying that `bytesize` was not defined for the `attribute.value` (a `Hash`). Now, as is done on 4-2-stable, the attribute's database value is `bytesize`d, and then logged out to the terminal. Reproduction script: ```ruby require 'active_record' require 'minitest/autorun' require 'logger' ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') ActiveRecord::Base.logger = Logger.new(STDOUT) ActiveRecord::Schema.define do create_table :posts, force: true do |t| t.binary :preferences end end class Post < ActiveRecord::Base serialize :preferences end class BugTest < Minitest::Test def test_24955 Post.create!(preferences: {a: 1}) assert_equal 1, Post.count end end ```
* | | | | Merge pull request #24984 from kamipo/remove_magic_comment_in_schema.rbRafael França2016-05-201-4/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove magic comment in generated `schema.rb`
| * | | | | Remove magic comment in generated `schema.rb`Ryuta Kamizono2016-05-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5.0 has been dropped Ruby 1.9 support. I think no need magic comment anymore.
* | | | | | [ci skip] Update retrieve_connection_pool commentBenjamin Quorning2016-05-201-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After PR https://github.com/rails/rails/pull/24844 the documentation for `#retrieve_connection_pool` was out of date. This commit changes: - the reference from `@class_to_pool` to `@owner_to_pool`. - with newer Rubies, `#fetch` isn't significantly slower than `#[]`. Since Rails 5 requires Ruby >= 2.2.2, we can just use `#fetch` here.
* | | | | | Support for unified Integer class in Ruby 2.4+Jeremy Daer2016-05-187-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.4 unifies Fixnum and Bignum into Integer: https://bugs.ruby-lang.org/issues/12005 * Forward compat with new unified Integer class in Ruby 2.4+. * Backward compat with separate Fixnum/Bignum in Ruby 2.2 & 2.3. * Drops needless Fixnum distinction in docs, preferring Integer.
* | | | | | Merge pull request #24203 from sferik/count_with_blockKasper Timm Hansen2016-05-163-6/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Forward ActiveRecord::Relation#count to Enumerable#count if block given
| * | | | | | Forward ActiveRecord::Relation#count to Enumerable#count if block givenErik Michaels-Ober2016-03-193-6/+19
| | | | | | |
* | | | | | | Merge pull request #25009 from jahfer/suppressor-keep-stateSean Griffin2016-05-161-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Keep previous state around for nested calls to #suppress
| * | | | | | | Keep state around for nested calls to #suppressJahfer Husain2016-05-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a call to #suppress from the same class occurred inside another #suppress block, the suppression state would be set to false before the outer block completes. This change keeps the previous state around in memory and unwinds it as the blocks exit.
* | | | | | | | Merge pull request #23810 from xijo/fix_json_coder_when_mysql_strict_is_disabledSean Griffin2016-05-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug in JSON deserialization when column default is an empty string
| * | | | | | | | Fix bug in JSON deserialization when column default is an empty stringJohannes Opper2016-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `ActiveRecord::Coders::JSON` serialization is used and the default of the column returns `''` it raises the following error: ``` JSON::ParserError: A JSON text must at least contain two octets! ``` If MySQL is running in non-strict mode, it returns an empty string as column default for a text column: ```ruby def extract_default if blob_or_text_column? @default = null || strict ? nil : '' end end ``` Since `''` is invalid JSON, there shouldn't be an attempt to parse it, it should be treated like nil. ActiveRecord::Coders::JSON should behave consistently for all possible non-user-set column default values.
* | | | | | | | | Rails 5.1 point type should not raise exception if empty string is provided ↵bUg2016-05-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as value
* | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-05-141-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/configuring.md
| * | | | | | | | | Move comment up to the class, for both of the methods, and document on class ↵Vipul A M2016-05-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | level why we are doing this. [ci skip]
* | | | | | | | | | Add missing space and newline for clarityKang-Kyu Lee2016-05-121-3/+3
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Give more context from `AssociationMismatchError`Sean Griffin2016-05-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message that we give today makes this error difficult to debug if you receive it. I have no clue why we're printing the object ID of the class (the commit doesn't give context), but I've left it as it was deliberate.
* | | | | | | | | Fix false positive mutation detection when JSON is used with serializeSean Griffin2016-05-121-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When looking for mutation, we compare the serialized version of the value to the before_type_cast form. `Type::Serialized` was breaking this contract by passing the already serialized attribute to the subtype's mutation detection. This never manifested previously, as all mutable subtypes either didn't do anything in their `serialize` method, or had a way to detect double serialization (e.g. `is_a?(String)`). However, now that JSON types can handle string primitives, we need to avoid double serialization. Fixes #24993.
* | | | | | | | | Merge pull request #24980 from merhard/virtual-attribute-defaultSean Griffin2016-05-111-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Define ActiveRecord::Attribute::Null#type_cast
| * | | | | | | | Define ActiveRecord::Attribute::Null#type_castMatthew Erhard2016-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using ActiveRecord::Base.attribute to declare an attribute with a default value on a model where the attribute is not backed by the database would raise a NotImplementedError when model.save is called. The error originates from https://github.com/rails/rails/blob/59d252196b36f6afaafd231756d69ea21537cf5d/activerecord/lib/active_record/attribute.rb#L84. This is called from https://github.com/rails/rails/blob/59d252196b36f6afaafd231756d69ea21537cf5d/activerecord/lib/active_record/attribute.rb#L46 on an ActiveRecord::Attribute::Null object. This commit corrects the behavior by implementing ActiveRecord::Attribute::Null#type_cast. With ActiveRecord::Attribute::Null#type_cast defined, ActiveRecord::Attribute::Null#value (https://github.com/rails/rails/blob/59d252196b36f6afaafd231756d69ea21537cf5d/activerecord/lib/active_record/attribute.rb#L173..L175) can be replaced with its super method (https://github.com/rails/rails/blob/59d252196b36f6afaafd231756d69ea21537cf5d/activerecord/lib/active_record/attribute.rb#L36..L40). fixes #24979
* | | | | | | | | remove_connection should not remove parent connectionArthur Neves2016-05-111-1/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling remove_connection in a subclass, that should not fallback to the parent, otherwise it will remove the parent connection from the handler.
* | | | | | | | Merge pull request #24971 from arthurnn/arthurnn/dont_cache_specification_nameArthur Nogueira Neves2016-05-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Dont cache the conn_spec_name when empty
| * | | | | | | | Dont cache the conn_spec_name when emptyArthur Neves2016-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot cache the connection_specification_name when it doesnt exist. Thats because the parent value could change, and we should keep failling back to the parent. If we cache that in a children as an ivar, we would not fallback anymore in the next call, so the children would not get the new parent spec_name.
* | | | | | | | | Set conn_spec_name after removeArthur Neves2016-05-111-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `remove_connection` can reset the `connection_specification_name`, so we need to to set it after the remove_connection call on `establish_connection` method.
* | | | | | | | [ci skip] Update documents of `ConnectionHandler`yui-knk2016-05-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of #24844. The key of `@owner_to_pool` was changed from `klass.name` to `spec.name`. By this change "memory leaks in development mode" will not happen, bacause the equality of string is not changed by reloading of model files.
* | | | | | | | Make sure we reset the connection_specification_name onArthur Neves2016-05-101-1/+8
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove_connection When calling `remove_connection` on a model, we delete the pool so we also need to reset the `connection_specification_name` so it will fallback to the parent. This was the current behavior before rails 5, which will fallback to the parent connection pool. [fixes #24959] Special thanks to @jrafanie for working with me on this fix.
* | | | | | | Merge pull request #24950 from kamipo/should_quote_lock_nameRafael França2016-05-101-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Should quote `lock_name` to pass to `get_advisory_lock`
| * | | | | | | Should quote `lock_name` to pass to `get_advisory_lock`Ryuta Kamizono2016-05-101-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #24939 from Neodelf/again_with_loopXavier Noria2016-05-101-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Replacement cycle for readability
| * | | | | | | Replacement cycle for readabilityMolchanov Andrey2016-05-101-2/+1
| | | | | | | |
* | | | | | | | Add migration compatibility class for Rails 5.1Rafael Mendonça França2016-05-101-1/+4
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 08:55:51 +0000