aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Add missing require for zlibLars Kanis2016-10-011-0/+1
| | | | | | | | | Zlib is used to generate the advisory lock since commit 2c2a8755460 . Using the Migrator fails since then, when it is called without the rails context: NameError: uninitialized constant ActiveRecord::Migrator::Zlib This patch fixes the above error.
* Merge pull request #26584 from Shopify/cached-query-nameRafael França2016-09-303-6/+16
|\ | | | | Preserve cached queries name in AS notifications
| * Preserve cached queries name in AS notificationsJean Boussier2016-09-223-6/+16
| |
* | Don't skip in-memory insertion of associations when loaded in validateSean Griffin2016-09-292-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by 6d0d83a33f59d9415685852cf77818c41e2e2700. While the bug it's trying to fix is handled if the association is loaded in an after_(create|save) callback, it doesn't handle any cases that load the association before the persistence takes place (validation, or before_* filters). Instead of caring about the timing of persistence, we can just ensure that we're not double adding the record instead. The test from that commit actually broke, but it was not because the bug has been re-introduced. It was because `Bulb` in our test suite is doing funky things that look like STI but isn't STI, so equality comparison didn't happen as the loaded model was of a different class. Fixes #26661.
* | Merge pull request #26653 from Neodelf/new_branch_nameJon Moss2016-09-281-1/+1
|\ \ | | | | | | [ci skip] Use right format text
| * | [ci skip] Use right format textAndrey Molchanov2016-09-281-1/+1
| | |
* | | Merge pull request #26629 from kamipo/fix_doc_formatJon Moss2016-09-261-3/+3
|\ \ \ | | | | | | | | Fix doc format for `RecordFetchWarning` [ci skip]
| * | | Fix doc format for `RecordFetchWarning` [ci skip]Ryuta Kamizono2016-09-271-3/+3
| | | |
* | | | Use xor to avoid allocations in `AR::Core#hash`Sean Griffin2016-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not as good a solution as actually hashing both values, but Ruby doesn't expose that capability other than allocating the array. Unless we were to do something silly like have a thread local array that is re-used, I don't see any other way to do this without allocation. This solution may not be perfect, but it should reasonably avoid collisions to the extent that we need.
* | | | [ci skip] Update PG adapter documentationAlex Kitchens2016-09-261-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Per discussion in pull request #26622: "Let's change it to PG::Error. The more specific classes mentioned are subclasses, and the fact the raised exception is a PG::UndefinedColumn doesn't change the fact that it's also a PG::Error." - matthewd
* | | Merge pull request #26622 from alexcameron89/pg_result_docJon Moss2016-09-251-4/+4
|\ \ \ | | | | | | | | [ci skip] Clarify Postgresql Documentation
| * | | [ci skip] Clarify Postgresql DocumentationAlex Kitchens2016-09-251-4/+4
| | | | | | | | | | | | | | | | | | | | This clarifies the object that +ActiveRecord::Base.connection.execute+ will return when using Postgresql.
* | | | Fix code formatting in `#save` RDoc [ci skip]Adam Crownoble2016-09-251-2/+2
|/ / / | | | | | | Noticed that the `validate: false` option for `ActiveRecord::Persistence#save` and `#save!` were not formatted as code like the other examples in the documentation.
* | | Serialize JSON attribute value nil as SQL NULL, not JSON 'null'Trung Duc Tran2016-09-231-1/+5
| | | | | | | | | | | | | | | | | | Test: JSON attribute value nil can be used in where(attr: nil) Add changelog entry
* | | Return true if attribute is not changed for update_attributePrathamesh Sonpatki2016-09-231-1/+2
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | - If the attribute is not changed, then update_attribute does not run SQL query, this effectively means that no change was made to the attribute. - This change was made in https://github.com/rails/rails/commit/0fcd4cf5 to avoid a SQL call. - But the change resulted into `nil` being returned when there was no change in the attribute value. - This commit corrects the behavior to return true if there is no change in attribute value. This is same as previous behavior of Rails 4.2 plus benefit of no additional SQL call. - Fixes #26593.
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-09-201-2/+2
|\ \
| * | [ci skip] Fix wrong rdoc-ref links, the format is {}[] not []{}Prathamesh Sonpatki2016-09-141-2/+2
| | |
* | | Always store errors details information with symbolsRafael Mendonça França2016-09-191-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the association is autosaved we were storing the details with string keys. This was creating inconsistency with other details that are added using the `Errors#add` method. It was also inconsistent with the `Errors#messages` storage. To fix this inconsistency we are always storing with symbols. This will cause a small breaking change because in those cases the details could be accessed as strings keys but now it can not. The reason that we chose to do this breaking change is because `#details` should be considered a low level object like `#messages` is. Fix #26499. [Rafael Mendonça França + Marcus Vieira]
* | | Merge pull request #26447 from kamipo/reduce_array_allocationSantiago Pastorino2016-09-191-3/+1
|\ \ \ | | | | | | | | Reduce array allocation when `where` with passed hash
| * | | Reduce array allocation when `where` with passed hashRyuta Kamizono2016-09-101-3/+1
| | | | | | | | | | | | | | | | | | | | In most case `where` is called with passed hash. In the case initializing `binds` is unnecessary.
* | | | Merge pull request #26448 from kamipo/remove_collection_association_uniqKasper Timm Hansen2016-09-181-1/+0
|\ \ \ \ | | | | | | | | | | Remove unnecessry `alias uniq distinct` for collection association
| * | | | Remove unnecessry `alias uniq distinct` for collection associationRyuta Kamizono2016-09-101-1/+0
| |/ / / | | | | | | | | | | | | `CollectionAssociation` is internal class and `uniq` is not called.
* | | | Merge pull request #26446 from kamipo/rename_type_var_name_to_typeEileen M. Uchitelle2016-09-171-10/+8
|\ \ \ \ | | | | | | | | | | Rename variable name that returning `type_for` to `type` from `column`
| * | | | Rename variable name that returning `type_for` to `type` from `column`Ryuta Kamizono2016-09-111-10/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | `column_for` was changed to `type_for` to return `type` object at 36bd52b4. But variable name is still `column`. It is very confusing. Rename variable name `column` to `type` for readability.
* | | | Merge pull request #26497 from koppen/26496-touch_with_optimistic_lockingEileen M. Uchitelle2016-09-171-1/+1
|\ \ \ \ | |_|_|/ |/| | | Clear attribute changes after handling locking
| * | | Clear attribute changes after handling lockingJakob Skjerning2016-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this the changes to the lock version column will stick around even after `touch` returns. Before: model.touch model.changes # => {"lock_version"=>[0, "1"]} After: model.touch model.changes # {}
* | | | Force correct namespace when using TransactionManagerArthur Neves2016-09-161-1/+1
| | | | | | | | | | | | | | | | [fixes #26441]
* | | | fix typo in `add_column` doc [ci skip]yuuji.yaginuma2016-09-161-1/+1
|/ / /
* | | Fix broken comments indentation caused by rubocop auto-correct [ci skip]Ryuta Kamizono2016-09-1425-1445/+1445
| | | | | | | | | | | | | | | | | | All indentation was normalized by rubocop auto-correct at 80e66cc4d90bf8c15d1a5f6e3152e90147f00772. But comments was still kept absolute position. This commit aligns comments with method definitions for consistency.
* | | Merge pull request #26466 from y-yagi/remove_duplicated_fixture_set_namesArthur Nogueira Neves2016-09-131-1/+1
|\ \ \ | | | | | | | | remove duplicated fixture set names
| * | | remove duplicated fixture set namesyuuji.yaginuma2016-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If using namespaced fixtures, get following Ruby warning. ``` activerecord/lib/active_record/fixtures.rb:922: warning: method redefined; discarding old admin_foos activerecord/lib/active_record/fixtures.rb:922: warning: previous definition of admin_foos was here ``` This is happening because of the multiple set the same path when setting the fixture name. Fix to remove the duplicate path.
* | | | Merge pull request #26434 from dylanahsmith/mysql2-no-nil-connectionArthur Nogueira Neves2016-09-122-15/+7
|\ \ \ \ | |/ / / |/| | | activerecord/mysql2: Avoid setting @connection to nil, just close it
| * | | activerecord/mysql2: Avoid setting @connection to nil, just close itDylan Thacker-Smith2016-09-082-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By doing `@connection = nil` that means that we need nil checks before it is used anywhere, but we weren't doing those checks. Instead, we get a NoMethodError after using a connection after it fails to reconnect. Neither of the other adapters set @connection to nil, just the mysql2 adapter. By just closing it, we avoid the need to check if we have a connection object and it will produce an appropriate exception when used.
* | | | Remove outdated "#TODO: Fix for binds." comment [ci skip]Ryuta Kamizono2016-09-111-1/+0
| |/ / |/| | | | | | | | This comment was added at eaf5486 but already implemented.
* | | Merge pull request #26380 from kamipo/pass_set_inverse_instance_blockKasper Timm Hansen2016-09-081-2/+2
|\ \ \ | |/ / |/| | Pass `set_inverse_instance` block to `sc.execute` for `SingularAssociation`
| * | Pass `set_inverse_instance` block to `sc.execute` for `SingularAssociation`Ryuta Kamizono2016-09-031-2/+2
| | | | | | | | | | | | | | | | | | | | | Follow up to caa178c. caa178c updated all code which sets inverse instances on newly loaded associations to use block. But `SingularAssociation` was forgotten it.
* | | Revert " [ci skip] Remove duplicate example."Vipul A M2016-09-061-0/+5
| | |
* | | Merge pull request #26410 from aditya-kapoor/rm-dupsVipul A M2016-09-061-5/+0
|\ \ \ | |_|/ |/| | [ci skip] Remove duplicate example.
| * | [ci skip] Remove duplicate example.Aditya Kapoor2016-09-061-5/+0
| | |
* | | Fix Remaining Case-In-Assignment Statement FormattingAlex Kitchens2016-09-065-62/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | Recently, the Rails team made an effort to keep the source code consistent, using Ruboco (bb1ecdcc677bf6e68e0252505509c089619b5b90 and below). Some of the case statements were missed. This changes the case statements' formatting and is consistent with changes in 810dff7c9fa9b2a38eb1560ce0378d760529ee6b and db63406cb007ab3756d2a96d2e0b5d4e777f8231.
* | | Merge pull request #26394 from kamipo/remove_redundant_conditionAndrew White2016-09-061-2/+2
|\ \ \ | | | | | | | | Remove redundant `!loaded?` condition
| * | | Remove redundant `!loaded?` conditionRyuta Kamizono2016-09-061-2/+2
| | | | | | | | | | | | | | | | | | | | Already checked `if !find_target? || loaded?`, unnecessary `!loaded?` in elsif condition.
* | | | Remove not used alias methodyui-knk2016-09-061-1/+0
|/ / / | | | | | | | | | | | | Bang methods of `AR::QueryMethods` are used only internally. We only use `left_outer_joins!`, so we can remove this alias.
* | | Merge pull request #26379 from kamipo/remove_unnecessary_query_scopeAndrew White2016-09-051-4/+0
|\ \ \ | |/ / |/| | Remove unnecessary `query_scope`
| * | Remove unnecessary `query_scope`Ryuta Kamizono2016-08-161-4/+0
| | |
* | | Remove unnecessary `count` method for collection proxyRyuta Kamizono2016-09-042-36/+14
| | | | | | | | | | | | Simply use its own method because `CollectionProxy` inherits `Relation`.
* | | Extract duplicated `create` and `create!` definition for associationRyuta Kamizono2016-09-033-16/+8
| | |
* | | Fix broken heredoc indentation caused by rubocop auto-correctRyuta Kamizono2016-09-0311-51/+51
| |/ |/| | | | | | | | | All indentation was normalized by rubocop auto-correct at 80e66cc4d90bf8c15d1a5f6e3152e90147f00772. But heredocs was still kept absolute position. This commit aligns heredocs indentation for consistency.
* | RuboCop is 100% green :tada:Xavier Noria2016-09-021-12/+13
| |
* | fixes remaining RuboCop issues [Vipul A M, Xavier Noria]Xavier Noria2016-09-016-9/+9
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 19:20:04 +0000