aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* 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-023-14/+2
|\ \ \ | | | | | | | | Remove `ForeignKeys` module which was introduced at #32299
| * | | Remove `ForeignKeys` module which was introduced at #32299Ryuta Kamizono2018-04-023-14/+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.
* | | | Add AR::Base.base_class? predicateBogdan Gusiev2018-04-025-8/+13
|/ / /
* / / Fix two-level database configurations with URLsEugene Kenny2018-03-311-1/+1
|/ / | | | | | | | | | | | | | | | | An entry in `ActiveRecord::Base.configurations` can either be a connection spec ("two-level") or a hash of specs ("three-level"). We were detecting two-level configurations by looking for the `database` key, but the database can also be specified as part of the `url` key, which meant we incorrectly treated those configurations as three-level.
* | Merge pull request #32366 from utilum/use_current_configAndrew White2018-03-301-1/+1
|\ \ | | | | | | Use current_config in structure_dump
| * | Use current_config in structure_dumputilum2018-03-291-1/+1
| | | | | | | | | | | | This looks like a typo from 0f0aa6a275876502e002c054896734d6536ba5cd
* | | Merge pull request #32384 from riseshia/remove-expired-documentAndrew White2018-03-301-15/+1
|\ \ \ | | | | | | | | Remove expired explanation [ci skip]
| * | | Remove expired explanation [ci skip]Shia2018-03-301-15/+1
| | | | | | | | | | | | | | | | Override callback doesn't work anymore.
* | | | Remove shadowing variable warningAndrew White2018-03-301-2/+2
|/ / /
* | | Merge pull request #32338 from eugeneius/dont_clobber_foreign_keyRyuta Kamizono2018-03-301-2/+2
|\ \ \ | | | | | | | | Don't unset foreign key when preloading missing record
| * | | Don't unset foreign key when preloading missing recordEugene Kenny2018-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a belongs to association's target is set, its foreign key is now updated to match the new target. This is the correct behaviour when a new record is assigned, but not when the existing record is preloaded. As long as we mark the association as loaded, we can skip setting the target when the record is missing and avoid clobbering the foreign key.
* | | | Short circuit the scoping delegation for `relation.all`Ryuta Kamizono2018-03-301-0/+1
| |/ / |/| | | | | | | | | | | Previously `relation.all` behaves as `relation.scoping { klass.all }`. But it is just enough to `relation.spawn`.
* | | Merge pull request #30956 from CJStadler/with-lock-changed-deprecationRafael França2018-03-281-1/+1
| | | | | | | | | | | | Fix deprecation warnings from with_lock
* | | Merge pull request #32299 from davidstosik/expose-fk-ignore-patternGuillermo Iguaran2018-03-274-2/+24
|\ \ \ | |_|/ |/| | Expose foreign key name ignore pattern in configuration
| * | Move fk_ignore_pattern from config.active_record to SchemaDumperDavid Stosik2018-03-224-8/+7
| | | | | | | | | | | | | | | This makes more sense, as the foreign key ignore pattern is only used by the schema dumper.
| * | Document config.active_record.fk_ignore_patternDavid Stosik2018-03-201-0/+4
| | |
| * | Expose foreign key name ignore pattern in configurationDavid Stosik2018-03-196-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dumping the database schema, Rails will dump foreign key names only if those names were not generate by Rails. Currently this is determined by checking if the foreign key name is `fk_rails_` followed by a 10-character hash. At [Cookpad](https://github.com/cookpad), we use [Departure](https://github.com/departurerb/departure) (Percona's pt-online-schema-change runner for ActiveRecord migrations) to run migrations. Often, `pt-osc` will make a copy of a table in order to run a long migration without blocking it. In this copy process, foreign keys are copied too, but [their name is prefixed with an underscore to prevent name collision ](https://www.percona.com/doc/percona-toolkit/LATEST/pt-online-schema-change.html#cmdoption-pt-online-schema-change-alter-foreign-keys-method). In the process described above, we often end up with a development database that contains foreign keys which name starts with `_fk_rails_`. That name does not match the ignore pattern, so next time Rails dumps the database schema (eg. when running `rake db:migrate`), our `db/schema.rb` file ends up containing those unwanted foreign key names. This also produces an unwanted git diff that we'd prefer not to commit. In this PR, I'd like to suggest a way to expose the foreign key name ignore pattern to the Rails configuration, so that individual projects can decide on a different pattern of foreign keys that will not get their names dumped in `schema.rb`.
* | | Merge pull request #32274 from eileencodes/part-1-add-rake-tasks-for-multi-dbEileen M. Uchitelle2018-03-264-21/+142
|\ \ \ | |_|/ |/| | Part 1 Easy Multi db in Rails: Add basic rake tasks for multi db setup
| * | Refactor configs_for and friendseileencodes2018-03-215-56/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the configs_for and DatabaseConfig struct into it's own file. I was considering doing this in a future refactoring but our set up forced me to move it now. You see there are `mattr_accessor`'s on the Core module that have default settings. For example the `schema_format` defaults to Ruby. So if I call `configs_for` or any methods in the Core module it will reset the `schema_format` to `:ruby`. By moving it to it's own class we can keep the logic contained and avoid this unfortunate issue. The second change here does a double loop over the yaml files. Bear with me... Our tests dictate that we need to load an environment before our rake tasks because we could have something in an environment that the database.yml depends on. There are side-effects to this and I think there's a deeper bug that needs to be fixed but that's for another issue. The gist of the problem is when I was creating the dynamic rake tasks if the yaml that that rake task is calling evaluates code (like erb) that calls the environment configs the code will blow up because the environment is not loaded yet. To avoid this issue we added a new method that simply loads the yaml and does not evaluate the erb or anything in it. We then use that yaml to create the task name. Inside the task name we can then call `load_config` and load the real config to actually call the code internal to the task. I admit, this is gross, but refactoring can't all be pretty all the time and I'm working hard with `@tenderlove` to refactor much more of this code to get to a better place re connection management and rake tasks.
| * | Update schema/structure dump tasks for multi dbeileencodes2018-03-212-14/+36
| | | | | | | | | | | | | | | | | | | | | Adds the ability to dump the schema or structure files for mulitple databases. Loops through the configs for a given env and sets a filename based on the format, then establishes a connection for that config and dumps into the file.
| * | Add ability to create/drop/migrate all dbs for a given enveileencodes2018-03-212-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `each_current_configuration` is used by create, drop, and other methods to find the configs for a given environment and returning those to the method calling them. The change here allows for the database commands to operate on all the configs in the environment. Previously we couldn't slice the hashes and iterate over them becasue they could be two tier or could be three tier. By using the database config structs we don't need to care whether we're dealing with a three tier or two tier, we can just parse all the configs based on the environment. This makes it possible for us to run `bin/rails db:create` and it will create all the configs for the dev and test environment ust like it does for a two tier - it creates the db for dev and test. Now `db:create` will create `primary` for dev and test, and `animals` for dev and test if our database.yml looks like: ``` development: primary: etc animals: etc test: primary: etc animals: etc ``` This means that `bin/rails db:create`, `bin/rails db:drop`, and `bin/rails db:migrate` will operate on the dev and test env for both primary and animals ds.
| * | Add create/drop/migrate db tasks for each database in the environmenteileencodes2018-03-211-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a three-tier yaml file like this: ``` development: primary: database: "development" animals: database: "development_animals" migrations_paths: "db/animals_migrate" ``` This will add db create/drop/and migrate tasks for each level of the config under that environment. ``` bin/rails db:drop:primary bin/rails db:drop:animals bin/rails db:create:primary bin/rails db:create:animals bin/rails db:migrate:primary bin/rails db:migrate:animals ```
| * | Add DatabaseConfig Struct and associated methodseileencodes2018-03-211-0/+39
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing around and parsing hashes is easy if you know that it's a two tier config and each key will be named after the environment and each value will be the config for that environment key. This falls apart pretty quickly with three-tier configs. We have no idea what the second tier will be named (we know the first is primary but we don't know the second), we have no easy way of figuring out how deep a hash we have without iterating over it, and we'd have to do this a lot throughout the code since it breaks all of Active Record's assumptions regarding configurations. These methods allow us to pass around objects instead. This will allow us to more easily parse the configs for the rake tasks. Evenually I'd like to replace the Active Record connection management that passes around config hashes to use these methods as well but that's much farther down the road. `walk_configs` takes an environment, specification name, and a config and turns them into DatabaseConfig struct objects so we can ask the configs questions like: ``` db_config.spec_name => animals db_config.env_name => development db_config.config { :adapter => mysql etc } ``` `db_configs` loops through all given configurations and returns an array of DatabaseConfig structs for each config in the yaml file. and lastly `configs_for` takes an environment and either returns the spec name and config if a block is given or returns an array of DatabaseConfig structs just for the given environment.
* | Merge pull request #32306 from danhuynhdev/feature/store-accessor-prefixAndrew White2018-03-241-5/+20
|\ \ | | | | | | Add custom prefix to ActiveRecord::Store accessors
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 12:09:44 +0000