aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Don't clear transaction state after manual rollbackEugene Kenny2018-05-101-7/+1
| | | | | | | If an `ActiveRecord::Rollback` error was raised by a persistence method (e.g. in an `after_save` callback), this logic would potentially discard the original state of the record from before the transaction, preventing it from being restored later when the transaction was rolled back.
* Fix ActiveRecord::AttributeMethods::Dirty documentation [ci skip]Kieran Trezona-le Comte2018-05-071-20/+58
| | | | | | | | | | | | | | | Previously the documentation for the newly introduced (in 5.1) AR::Dirty methods was misleading, as it stated the the new methods were aliases for the old methods. This was false, and caused confusion when the differences in their implementation became apparent. This change attempts to describe the behaviour of these methods more accurately, also noting when they are likely to be useful (i.e. before or after saving a record). This change also makes minor updates to consistently format the documentation of this API, in accordance with the API Documentation Guidelines.
* Fix logic on disabling commit callbacksBrian Durand2018-05-041-1/+1
| | | | Commit callbacks are intentionally disabled when errors occur when calling the callback chain in order to reset the internal record state. However, the implicit order of operations on the logic for checking if callbacks are disabled is wrong. The result is that callbacks can be unexpectedly when errors occur in transactions.
* Allow a belonging to object to be created from a new recordJolyon Pawlyn2018-05-012-4/+8
| | | | If a 'has one' object is created from a new record, an ActiveRecord::RecordNotSaved error is raised but this behavior was also applied to the reverse scenario.
* Restore original merging order to enforce `if_exists: true`Ryuta Kamizono2018-04-291-2/+1
| | | | | The merging order was accidentally changed at #32447. The original intention is force `drop_table ... if_exists: true`. #28070.
* Fix `Associations::ClassMethods` doc [ci skip]Ryuta Kamizono2018-04-291-7/+7
| | | | | * Singular associations don't define `#association.nil?` * Wrap with <tt> for each method, not the whole sentence
* Ensure that `ids_reader` respects dirty target whether target is loaded or notRyuta Kamizono2018-04-271-1/+3
| | | | | | | Currently `ids_reader` doesn't respect dirty target when the target is not loaded yet unlike `collection.size`. I believe the inconsistency is a bug, fixes the `ids_reader` to behave consistently regardless of whether target is loaded or not.
* Loaded associations should not run a new query when size is calledGraham Turner2018-04-261-1/+3
| | | | | | | Already loaded associations were running an extra query when `size` was called on the association. This fix ensures that an extra query is no longer run. Update tests to use proper methods
* Remove math module from countNikolai B2018-04-251-2/+0
| | | | Not required after https://github.com/rails/arel/pull/449
* `get_value` needs to be a public methodGraham Turner2018-04-251-4/+5
| | | | | | Adds test case for failing issue Moves set_value back to protected
* Merge pull request #32097 from matthewd/arelMatthew Draper2018-04-2582-0/+4610
|\ | | | | Merge Arel
| * Arel: :nodoc: allMatthew Draper2018-02-2481-81/+81
| |
| * Arel: rubocop -aMatthew Draper2018-02-2482-1856/+1916
| |
| * Merge Arel into Active RecordMatthew Draper2018-02-2482-0/+4550
| |
* | Merge pull request #32646 from derekprior/dp-schema-dumper-documentationSean Griffin2018-04-241-5/+5
|\ \ | | | | | | Update schema.rb documentation [CI SKIP]
| * | Update schema.rb documentation [CI SKIP]Derek Prior2018-04-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation previously claimed that `db/schema.rb` was "the authoritative source for your database schema" while simultaneously also acknowledging that the file is generated. These two statements are incongruous and the guides accurately call out that many database constructs are unsupported by `schema.rb`. This change updates the comment at the top of `schema.rb` to remove the assertion that the file is authoritative. The documentation also previously referred vaguely to "issues" when re-running old migrations. This has been updated slightly to hint at the types of problems that one can encounter with old migrations. In sum, this change attempts to more accurately capture the pros, cons, and shortcomings of the two schema formats in the guides and in the comment at the top of `schema.rb`. [Derek Prior & Sean Griffin] Co-authored-by: Sean Griffin <sean@seantheprogrammer.com>
* | | `columns` is cached in the statementRyuta Kamizono2018-04-241-6/+3
| | | | | | | | | | | | https://github.com/sparklemotion/sqlite3-ruby/blob/v1.3.13/lib/sqlite3/statement.rb#L101-L104
* | | Save a hash allocation in MySQL statement poolEugene Kenny2018-04-232-5/+2
| | | | | | | | | | | | There's no need to wrap the statement in a hash with a single key.
* | | Merge pull request #32514 from ↵Ryuta Kamizono2018-04-221-1/+5
|\ \ \ | | | | | | | | | | | | | | | | samdec/multiple-has-one-through-associations-build-bug Fix .new with multiple through associations
| * | | Fix .new with multiple through associationsSam DeCesare2018-04-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug with building an object that has multiple `has_many :through` associations through the same object. Previously, when building the object via .new, the intermediate object would be created instead of just being built. Here's an example: Given a GameBoard, that has_one Owner and Collection through Game. The following line would cause a game object to be created in the database. GameBoard.new(owner: some_owner, collection: some_collection) Whereas, if passing only one of those associations into `.new` would cause the Game object to be built and not created in the database. Now the above code will only build the Game object, and not save it.
* | | | `target` in `CollectionAssociation` is always an arrayRyuta Kamizono2018-04-211-2/+2
| | | | | | | | | | | | | | | | | | | | So `target.is_a?(Array)` is meaningless, and just use `target.empty?` instead of `target.blank?`.
* | | | Fix typo in the `touch_all` doc [ci skip]Ryuta Kamizono2018-04-211-4/+4
| | | |
* | | | Can preload associations through polymorphic associationsDana Sherson2018-04-201-10/+15
| | | |
* | | | Merge pull request #31513 from fatkodima/relation-touch_allRafael França2018-04-202-10/+47
|\ \ \ \ | | | | | | | | | | Add `touch_all` method to `ActiveRecord::Relation`
| * | | | Add `touch_all` method to `ActiveRecord::Relation`fatkodima2018-04-132-10/+47
| | | | |
* | | | | Merge pull request #32667 from yahonda/mod_empty_insert_statement_valueRafael França2018-04-203-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Allow `primary_key` argument to `empty_insert_statement_value`
| * | | | | Allow `primary_key` argument to `empty_insert_statement_value`Yasuo Honda2018-04-203-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to support Oracle database support identity data type Oracle database does not support `INSERT .. DEFAULT VALUES` then every insert statement needs at least one column name specified. When `prefetch_primary_key?` returns `true` insert statement always have the primary key name since the primary key value is selected from the associated sequence. However, supporting identity data type will make `prefetch_primary_key?` returns `false` then no primary key column name added. As a result, `empty_insert_statement_value` raises `NotImplementedError` To address this error `empty_insert_statement_value` can take one argument `primary_key` to generate insert statement like this. `INSERT INTO "POSTS" ("ID") VALUES(DEFAULT)` It needs arity change for the public method but no actual behavior changes for the bundled adapters. Oracle enhanced adapter `empty_insert_statement_value` implementation will be like this: ``` def empty_insert_statement_value(primary_key) raise NotImplementedError unless primary_key "(#{quote_column_name(primary_key)}) VALUES(DEFAULT)" end ``` [Raise NotImplementedError when using empty_insert_statement_value with Oracle](https://github.com/rails/rails/pull/28029) [Add support for INSERT .. DEFAULT VALUES](https://community.oracle.com/ideas/13845)
* | | | | | Merge pull request #32650 from bogdanvlviv/return_back_slash_and_use___dir__Rafael França2018-04-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Return back "/" to the end of RAILS_GEM_ROOT
| * | | | | | Return back "/" to the end of RAILS_GEM_ROOTbogdanvlviv2018-04-201-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The "/" was removed in 40bdbce191ad90dfea43dad51fac5c4726b89392 during refactoring. It may cause regression since looks like was added intentionaly because it is possible that a name of any another gem can start with /rails/, so slash was added to ensure that it is "rails" gem. I would like to backport this to `5-2-stable` too. - Use `__dir__` instead of `__FILE__`. Follow up #29176.
* | | | | | Don't expose `Relation#preload_associations` in the docRyuta Kamizono2018-04-201-1/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extracted method is used for `CollectionCacheAssociationLoading`, still not public API. [ci skip]
* | | | | Fix relation merging with skip_query_cache!James Williams2018-04-191-2/+2
|/ / / /
* | | | Remove unused attr_writer :joinable on TransactionEugene Kenny2018-04-171-1/+0
| | | | | | | | | | | | | | | | | | | | This was added in 280587588aba6ce13717cd6679e3f2b43d287443, but has been unused since 392eeecc11a291e406db927a18b75f41b2658253.
* | | | Add missing `require "benchmark"`r7kamura2018-04-151-0/+1
| | | |
* | | | Fix broken nodocsChris Arcand2018-04-132-2/+2
|/ / / | | | | | | | | | | | | This commit fixes all references in the codebase missing a trailing :, which causes the nodoc not to actually work :) [skip ci]
* | | Fix database.yml mergingeileencodes2018-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ok so apparently you can not just have a `default:` that manually is merged in with YAML but you can also have a special "shared" config that is automatically merged. Example: ``` shared: adapter: mysql2 host: <%= ENV["DB_HOST"] || "localhost" %> username: root connect_timeout: 0 pool: 100 reconnect: true development: database: development_db adapter: mysql2 ``` To fix, only create a DatabaseConfig object when an adapter, database, or URL are present. The merging behavior for `shared` doesn't work with a 3-tier config. I don't think it worked before this change either - since Rails doesn't know which point to merge it in. That's something we may have to fix with the refactoring I'm working on.
* | | don't check for immutability when setting skip_preloading as it doesn't ↵Lachlan Sylvester2018-04-121-2/+3
|/ / | | | | | | effect the arel and the arel may already be generated by fresh_when
* | Don't create namespaced tasks if single db applicationeileencodes2018-04-091-2/+7
| | | | | | | | | | | | This was causing single db applications to have rake tasks named `db:create:primary`. These tasks are only useful to multiple database applications so they shouldn't be generated.
* | Allow schema/structure load for multiple databaseseileencodes2018-04-091-3/+3
| | | | | | | | | | Pass the spec name to load_schema in order to load from the correct structure file when there are multiple databases
* | Avoid generating full changes hash on every saveEugene Kenny2018-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | `changed_attribute_names_to_save` is called in `keys_for_partial_write`, which is called on every save when partial writes are enabled. We can avoid generating the full changes hash by asking the mutation tracker for just the names of the changed attributes. At minimum this saves one array allocation per attribute, but will also avoid calling `Attribute#original_value` which is expensive for serialized attributes.
* | Merge pull request #32355 from kamipo/delegate_to_klass_in_a_scopeRafael França2018-04-063-1/+15
|\ \ | | | | | | Bring back private class methods accessibility in named scope
| * | Deprecate accessibility of private/protected class methods in named scopeRyuta Kamizono2018-03-302-2/+6
| | |
| * | Bring back private class methods accessibility in named scopeRyuta Kamizono2018-03-273-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The receiver in a scope was changed from `klass` to `relation` itself for all scopes (named scope, default_scope, and association scope) behaves consistently. In addition. Before 5.2, if both an AR model class and a Relation instance have same named methods (e.g. `arel_attribute`, `predicate_builder`, etc), named scope doesn't respect relation instance information. For example: ```ruby class Post < ActiveRecord::Base has_many :comments1, class_name: "RecentComment1" has_many :comments2, class_name: "RecentComment2" end class RecentComment1 < ActiveRecord::Base self.table_name = "comments" default_scope { where(arel_attribute(:created_at).gteq(2.weeks.ago)) } end class RecentComment2 < ActiveRecord::Base self.table_name = "comments" default_scope { recent_updated } scope :recent_updated, -> { where(arel_attribute(:updated_at).gteq(2.weeks.ago)) } end ``` If eager loading `Post.eager_load(:comments1, :comments2).to_a`, `:comments1` (default_scope) respects aliased table name, but `:comments2` (using named scope) may not work correctly since named scope doesn't respect relation instance information. See also 801ccab. But this is a breaking change between releases without deprecation. I decided to bring back private class methods accessibility in named scope. Fixes #31740. Fixes #32331.
* | | Fix structure:dump for multiple databaseseileencodes2018-04-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | ccea4cf broke multiple database structure:dump, the current_config line should have been deleted instead. I'm struggling to write a test for this since the confings are passed from rake to the structure_dump method rather than the other way around. Hoping to come up with a test while I work on structure:load commands for multiple databases.
* | | Merge pull request #32447 from utilum/splatRafael França2018-04-041-2/+3
|\ \ \ | | | | | | | | 2.6 warnings: passing splat keyword arguments as a single Hash
| * | | passing splat keyword arguments as a single Hashutilum2018-04-041-2/+3
| | | | | | | | | | | | | | | | Ruby 2.6.0 warns about this.
* | | | Merge pull request #32414 from bogdan/query-cache-optimizationRafael França2018-04-041-11/+4
|\ \ \ \ | |/ / / |/| | | Optimize the code inside AR::QueryCache middleware
| * | | Optimize the code inside AR::QueryCache middlewareBogdan Gusiev2018-04-041-11/+4
| | | |
* | | | Class methods in the `class_methods` blocks are wrongly appeared in the docRyuta Kamizono2018-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is wrongly appeared as instance public methods in the doc. http://api.rubyonrails.org/v5.1.6/classes/ActionCable/Channel/Callbacks.html http://api.rubyonrails.org/v5.1.6/classes/ActiveRecord/Timestamp.html
* | | | Merge pull request #32415 from kamipo/remove_foreign_keys_moduleGuillermo Iguaran2018-04-024-15/+2
|\ \ \ \ | | | | | | | | | | Remove `ForeignKeys` module which was introduced at #32299
| * | | | Remove `ForeignKeys` module which was introduced at #32299Ryuta Kamizono2018-04-024-15/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To solve the problem #32299, just enough to introduce `fk_ignore_pattern` option. I don't think there is a need to expose these constants.