aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Basic API for connection switchingEileen Uchitelle2018-10-104-1/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR adds the ability to 1) connect to multiple databases in a model, and 2) switch between those connections using a block. To connect a model to a set of databases for writing and reading use the following API. This API supercedes `establish_connection`. The `writing` and `reading` keys represent handler / role names and `animals` and `animals_replica` represents the database key to look up the configuration hash from. ``` class AnimalsBase < ApplicationRecord connects_to database: { writing: :animals, reading: :animals_replica } end ``` Inside the application - outside the model declaration - we can switch connections with a block call to `connected_to`. If we want to connect to a db that isn't default (ie readonly_slow) we can connect like this: Outside the model we may want to connect to a new database (one that is not in the default writing/reading set) - for example a slow replica for making slow queries. To do this we have the `connected_to` method that takes a `database` hash that matches the signature of `connects_to`. The `connected_to` method also takes a block. ``` AcitveRecord::Base.connected_to(database: { slow_readonly: :primary_replica_slow }) do ModelInPrimary.do_something_thats_slow end ``` For models that are already loaded and connections that are already connected, `connected_to` doesn't need to pass in a `database` because you may want to run queries against multiple databases using a specific role/handler. In this case `connected_to` can take a `role` and use that to swap on the connection passed. This simplies queries - and matches how we do it in GitHub. Once you're connected to the database you don't need to re-connect, we assume the connection is in the pool and simply pass the handler we'd like to swap on. ``` ActiveRecord::Base.connected_to(role: :reading) do Dog.read_something_from_dog ModelInPrimary.do_something_from_model_in_primary end ```
* Merge pull request #34110 from ↵Eileen M. Uchitelle2018-10-103-0/+33
|\ | | | | | | | | albertoalmagro/enum-raises-on-invalid-definition-values Enum raises on invalid definition values
| * Privatize ENUM_CONFLICT_MESSAGE constantAlberto Almagro2018-10-101-0/+1
| |
| * Raise on invalid definition valuesAlberto Almagro2018-10-103-0/+32
| | | | | | | | | | | | | | | | | | When defining a Hash enum it can be easy to use [] instead of {}. This commit checks that only valid definition values are provided, those can be a Hash, an array of Symbols or an array of Strings. Otherwise it raises an ArgumentError. Fixes #33961
* | Merge pull request #34137 from gmcgibbon/db_migrate_status_multi_dbEileen M. Uchitelle2018-10-101-1/+15
|\ \ | |/ |/| Add multi-db support to rails db:migrate:status
| * Add multi-db support to rails db:migrate:statusGannon McGibbon2018-10-091-1/+15
| |
* | Merge pull request #34122 from kamipo/generate_relation_methodsRyuta Kamizono2018-10-106-5/+59
|\ \ | | | | | | Generate delegation methods to named scope in the definition time
| * | Generate delegation methods to named scope in the definition timeRyuta Kamizono2018-10-096-5/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The delegation methods to named scope are defined when `method_missing` is invoked on the relation. Since #29301, the receiver in the named scope is changed to the relation like others (e.g. `default_scope`, etc) for consistency. Most named scopes would be delegated from relation by `method_missing`, since we don't allow scopes to be defined which conflict with instance methods on `Relation` (#31179). But if a named scope is defined with the same name as any method on the `superclass` (e.g. `Kernel.open`), the `method_missing` on the relation is not invoked. To address the issue, make the delegation methods to named scope is generated in the definition time. Fixes #34098.
* | | Merge pull request #34094 from ↵Ryuta Kamizono2018-10-107-3/+111
|\ \ \ | | | | | | | | | | | | | | | | christophemaximin/fix-activerecord-clearing-of-query-cache Fix inconsistent behavior by clearing QueryCache when reloading associations
| * | | Clear QueryCache when reloading associationsChristophe Maximin2018-10-107-3/+111
| | | |
* | | | Call `load_schema` before `assert_no_queries`Ryuta Kamizono2018-10-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up 45be690f8e6db019aac6198ba49d608a2e14824b. `predicate_builder.build` in `where` requires `load_schema` for `type_for_attribute`.
* | | | Fix odd indentationRyuta Kamizono2018-10-101-10/+10
| | | |
* | | | Refactor Arel visitor to use `collect_nodes_for` as much as possibleRyuta Kamizono2018-10-101-33/+10
| |_|/ |/| |
* | | Improve DELETE with JOIN handling to avoid subqueries if possibleRyuta Kamizono2018-10-102-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ``` Pet Destroy (0.8ms) DELETE FROM `pets` WHERE `pets`.`pet_id` IN (SELECT `pet_id` FROM (SELECT DISTINCT `pets`.`pet_id` FROM `pets` LEFT OUTER JOIN `toys` ON `toys`.`pet_id` = `pets`.`pet_id` WHERE `toys`.`name` = ?) AS __active_record_temp) [["name", "Bone"]] ``` After: ``` Pet Destroy (1.0ms) DELETE `pets` FROM `pets` LEFT OUTER JOIN `toys` ON `toys`.`pet_id` = `pets`.`pet_id` WHERE `toys`.`name` = ? [["name", "Bone"]] ```
* | | Merge pull request #34081 from gmcgibbon/db_migrate_status_moveEileen M. Uchitelle2018-10-093-13/+39
|\ \ \ | | | | | | | | Move db:migrate:status to DatabaseTasks method
| * | | Move db:migrate:status to DatabaseTasks methodGannon McGibbon2018-10-083-13/+39
| | | |
* | | | Merge pull request #34117 from ↵Ryuta Kamizono2018-10-101-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | aergonaut/docs/ActiveRecord--Persistence-belongs_to_touch_method Add docs to ActiveRecord::Persistence#belongs_to_touch_method [ci skip]
| * | | Add docs to ActiveRecord::Persistence#belongs_to_touch_methodChris Fung2018-10-071-0/+2
| | | | | | | | | | | | | | | | [ci skip]
* | | | Call `define_attribute_methods` before `assert_no_queries` to address CI ↵Ryuta Kamizono2018-10-095-9/+80
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flakiness Follow up 45be690f8e6db019aac6198ba49d608a2e14824b. Somehow calling `define_attribute_methods` in `build`/`new` sometimes causes the `table_exists?` query. To address CI flakiness due to `assert_no_queries` failure, ensure `define_attribute_methods` before `assert_no_queries`.
* | | [ci skip] Fix typoFrancesco Rodríguez2018-10-081-1/+1
| | |
* | | Don't expose internal methods in the associationsRyuta Kamizono2018-10-082-32/+32
| | |
* | | Fix test name to add missing "set"Ryuta Kamizono2018-10-081-1/+1
| | |
* | | Fix `AssociationRelation` not to set inverse instance key just like beforeRyuta Kamizono2018-10-073-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #31575, `set_inverse_instance` replaces the foreign key by the current owner immediately to make it happen when a record is added to collection association. But `set_inverse_instance` is not only called when a record is added, but also when a record is loaded from queries. And also, that loaded records are not always associated records for some reason (using `or`, `unscope`, `rewhere`, etc). It is hard to distinguish whether or not we should invoke `set_inverse_instance`, but at least we should avoid the undesired side-effect which was brought from #31575. Fixes #34108.
* | | Merge pull request #34076 from gmcgibbon/fixtures_refactorEileen M. Uchitelle2018-10-074-243/+376
|\ \ \ | | | | | | | | Fixtures refactor
| * | | Move FixtureSet::ReflectionProxy and FixtureSet::HasManyThroughProxy to ↵Gannon McGibbon2018-10-052-32/+32
| | | | | | | | | | | | | | | | FixtureSet::TableRows
| * | | Introduce FixtureSet::TableRows and FixtureSet::TableRowGannon McGibbon2018-10-053-88/+183
| | | |
| * | | Introduce FixtureSet::ModelMetadataGannon McGibbon2018-10-052-29/+49
| | | |
| * | | Small refactors to FixtureSet::ClassCache and FixtureGannon McGibbon2018-10-051-9/+8
| | | |
| * | | Move FixtureSet.create_fixtures reading and inserting sections into private ↵Gannon McGibbon2018-10-051-41/+58
| | | | | | | | | | | | | | | | methods
| * | | Organize FixtureSet class methodsGannon McGibbon2018-10-051-102/+104
| | | |
* | | | add test for cache_version precisionLachlan Sylvester2018-10-071-31/+55
|/ / /
* | / Exercise stringify of database configurationsbogdanvlviv2018-10-051-0/+5
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | Since #33968 we stringify keys of database configuration This commit adds more assertions in order to ensure that and prevent any regression in the future. Currently, if remove `to_s` added in #33968 from `env_name.to_s` on the line (activerecord/lib/active_record/database_configurations.rb:107), there is no test that would fail. One of the added assertions should emphasize why we need this `to_s`. Follow up #33968
* | Remove `ignore_none: false` to assert no queries more strictlyRyuta Kamizono2018-10-057-31/+31
| | | | | | | | Follow up 811be477786455d144819a5e9fbb7f9f54b8da69.
* | Use `assert_no_queries` not to ignore BEGIN/COMMIT queriesRyuta Kamizono2018-10-0513-38/+37
| | | | | | | | | | | | | | | | | | `test_update_does_not_run_sql_if_record_has_not_changed` would pass without #18501 since `assert_queries` ignores BEGIN/COMMIT unless `ignore_none: true` is given. Since #32647, empty BEGIN/COMMIT is ommited. So we no longer need to use `assert_queries(0)` to ignore BEGIN/COMMIT in the queries.
* | Simplify the condition in `prepare_update_statement`Ryuta Kamizono2018-10-051-8/+2
| |
* | Restore `preloaders_for_one` methodRyuta Kamizono2018-10-051-5/+9
| | | | | | | | Since the above comment is for the `preloaders_for_one`.
* | failing test for eager loadingMatt Jones2018-10-041-0/+5
| | | | | | | | cherry-picked from https://github.com/rails/rails/pull/33763
* | Merge pull request #33938 from faucct/bugfix/preload_through_no_recordsEileen M. Uchitelle2018-10-042-28/+29
|\ \ | | | | | | ActiveRecord::Associations::Preloader should not fail to preload through missing records
| * | ActiveRecord::Associations::Preloader should not fail to preload through ↵Nikita Sokolov2018-10-022-28/+29
| | | | | | | | | | | | missing records
* | | Escape table name so that it can be used in regular expressionAidan Haran2018-10-041-1/+1
| | |
* | | Remove unreachable database warningEugene Kenny2018-10-041-15/+1
| | | | | | | | | | | | | | | `establish_connection` will never raise `ActiveRecord::NoDatabaseError`, because it doesn't connect to a database; it sets up a connection pool.
* | | Move test_fixtures and render_context to separate filesGannon McGibbon2018-10-033-214/+220
| | |
* | | Move UPDATE/DELETE with JOIN handling to the Arel sideRyuta Kamizono2018-10-035-106/+92
| | |
* | | Fix call sitesGannon McGibbon2018-10-022-6/+6
|/ /
* | Handle UPDATE/DELETE with OFFSET in ArelRyuta Kamizono2018-10-016-19/+35
| |
* | Merge pull request #23593 from meinac/add_index_option_for_change_tableRyuta Kamizono2018-10-013-0/+22
|\ \ | | | | | | | | | index option added for change_table migrations
| * | Index option added for change_table migrationsMehmet Emin INAC2018-09-223-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case if we want to add a column into the existing table with index on it, we have to add column and index in two seperate lines. With this feature we don't need to write an extra line to add index for column. We can just use `index` option. Old behaviour in action: ``` change_table(:languages) do |t| t.string :country_code t.index: :country_code end ``` New behaviour in action: ``` change_table(:languages) do |t| t.string :country_code, index: true end ``` Exactly same behaviour is already exist for `create_table` migrations.
* | | Merge pull request #32031 from yahonda/remove_redundant_freezeRyuta Kamizono2018-10-0119-42/+42
|\ \ \ | | | | | | | | Add `Style/RedundantFreeze` to remove redudant `.freeze`
| * | | Add `Style/RedundantFreeze` to remove redudant `.freeze`Yasuo Honda2018-09-2919-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Rails 6.0 will support Ruby 2.4.1 or higher `# frozen_string_literal: true` magic comment is enough to make string object frozen. This magic comment is enabled by `Style/FrozenStringLiteralComment` cop. * Exclude these files not to auto correct false positive `Regexp#freeze` - 'actionpack/lib/action_dispatch/journey/router/utils.rb' - 'activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb' It has been fixed by https://github.com/rubocop-hq/rubocop/pull/6333 Once the newer version of RuboCop released and available at Code Climate these exclude entries should be removed. * Replace `String#freeze` with `String#-@` manually if explicit frozen string objects are required - 'actionpack/test/controller/test_case_test.rb' - 'activemodel/test/cases/type/string_test.rb' - 'activesupport/lib/active_support/core_ext/string/strip.rb' - 'activesupport/test/core_ext/string_ext_test.rb' - 'railties/test/generators/actions_test.rb'
* | | | Place `PartialQuery` and `PartialQueryCollector` in the same fileRyuta Kamizono2018-09-302-24/+28
| | | |