aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #35663 from ↵Eileen M. Uchitelle2019-03-181-1/+1
|\ | | | | | | | | eileencodes/fix-database-configuration-when-not-actually-a-three-tier Fix database configuration when adding another config level
| * Fix database configuration when adding another config leveleileencodes2019-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is kind of hard to explain but if you have a database config with another level like this: ``` development: primary: database: "my db" variables: statement_timeout: 1000 ``` the database configurations code would chooke on the `variables` level because it didn't know what to do with it. We'd see the following error: ``` lib/active_record/database_configurations.rb:72:in `block in find_db_config': undefined method `env_name' for [nil]:Array (NoMethodError) ``` The problem here is that Rails does correctly identify this as not a real configuration but returns `[nil]` along with the others. We need to make sure to flatten the array and remove all the `nil`'s before returning the `configurations` objects. Fixes #35646
* | Simplify values_list with more compositionKasper Timm Hansen2019-03-181-24/+30
| | | | | | | | This also prevents insert_all from leaking its attributes checks.
* | Extract column check in values_listKasper Timm Hansen2019-03-181-14/+14
|/ | | | | | `values_list` is quite long and does far too many things. This also eagerly extract the keys in initialize instead of having to worry about calling them multiple times.
* Don't expose internal `type_casted_binds` methodRyuta Kamizono2019-03-191-7/+7
| | | | Internal usage for the method as public has removed at #29623.
* Merge pull request #35653 from kamipo/remove_arel_nodes_valuesRyuta Kamizono2019-03-187-60/+9
|\ | | | | Get rid of `Arel::Nodes::Values`
| * Get rid of `Arel::Nodes::Values`Ryuta Kamizono2019-03-187-60/+9
| | | | | | | | | | | | That is completely covered by `Arel::Nodes::ValuesList`. Related https://github.com/rails/arel/pull/484.
* | Add test case to prevent possible SQL injectionRyuta Kamizono2019-03-181-1/+3
|/
* Add test case for unscoping `:optimizer_hints`Ryuta Kamizono2019-03-181-1/+1
|
* Tweak `truncate_tables`Ryuta Kamizono2019-03-182-18/+18
| | | | | | * Remove redundant `table_names.empty?` * Early return in `truncate_tables` since it is already deeply nested * Move `truncate_tables` out from between `exec_delete` and `exec_update`
* SQLite3: Make fixture loading to bulk statementsRyuta Kamizono2019-03-174-47/+38
|
* Fix undefined local variable or method `discard_remaining_results'Ryuta Kamizono2019-03-171-1/+1
| | | | https://buildkite.com/rails/rails/builds/59632#fe3d2551-569a-46c8-94f3-7abe835d4d7a/122-153
* Ensure `execute_batch` discards remaining resultsRyuta Kamizono2019-03-172-14/+5
|
* Make `truncate_tables` to bulk statementsRyuta Kamizono2019-03-177-55/+119
| | | | | | | | | | | | | | | | | | Before: ``` (16.4ms) TRUNCATE TABLE `author_addresses` (20.5ms) TRUNCATE TABLE `authors` (19.4ms) TRUNCATE TABLE `posts` ``` After: ``` Truncate Tables (19.5ms) TRUNCATE TABLE `author_addresses`; TRUNCATE TABLE `authors`; TRUNCATE TABLE `posts` ```
* Fix warning: instance variable @optimizer_hints not initializedRyuta Kamizono2019-03-171-0/+1
| | | | https://buildkite.com/rails/rails/builds/59622#924dff9d-85c2-4946-b264-a7e6ce01432c/122-130
* Extract `truncate` and `truncate_tables` into database statementsRyuta Kamizono2019-03-179-47/+20
| | | | This is to easier make `truncate_tables` to bulk statements.
* Merge pull request #35615 from kamipo/optimizer_hintsRyuta Kamizono2019-03-1715-6/+104
|\ | | | | Support Optimizer Hints
| * Support Optimizer HintsRyuta Kamizono2019-03-1615-6/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We as Arm Treasure Data are using Optimizer Hints with a monkey patch (https://gist.github.com/kamipo/4c8539f0ce4acf85075cf5a6b0d9712e), especially in order to use `MAX_EXECUTION_TIME` (refer #31129). Example: ```ruby class Job < ApplicationRecord default_scope { optimizer_hints("MAX_EXECUTION_TIME(50000) NO_INDEX_MERGE(jobs)") } end ``` Optimizer Hints is supported not only for MySQL but also for most databases (PostgreSQL on RDS, Oracle, SQL Server, etc), it is really helpful to turn heavy queries for large scale applications.
* | Raise UnknownAttributeError when unknown column is passed to insert_all and ↵Josef Šimánek2019-03-161-0/+8
|/ | | | friends.
* Revert "Remove Marshal support from SchemaCache"Rafael Mendonça França2019-03-131-0/+11
| | | | This reverts commit 65f2eeaaf5774f0891fff700f4defb0b90a05789.
* Merge tag 'v6.0.0.beta3'eileencodes2019-03-131-1/+1
|\ | | | | | | v6.0.0.beta3 release
| * Prep releaseeileencodes2019-03-111-1/+1
| | | | | | | | | | | | | | * Update RAILS_VERSION * Bundle * rake update_versions * rake changelog:header
* | [skip ci] Rails 5.1+ supports bigint primary keyYasuo Honda2019-03-131-1/+1
| | | | | | | | Follow up #35573
* | Document int Primary Key with create_or_find_by (#35573)Alex Kitchens2019-03-121-0/+4
| | | | | | | | | | This commit addresses the issue in https://github.com/rails/rails/issues/35543 by making note of the growing primary key issue with `create_or_find_by`.
* | Schema Cache: cache table indexesKasper Timm Hansen2019-03-131-5/+15
| | | | | | | | | | | | Useful to not query for indexes when an application uses schema cache. Ref https://github.com/rails/rails/pull/35546
* | Merge branch 'test-remove-marshal-support-from-schema-cache'Kasper Timm Hansen2019-03-121-10/+0
|\ \
| * | Remove Marshal support from SchemaCacheKasper Timm Hansen2019-03-121-10/+0
| | | | | | | | | | | | | | | YAML has been used to serialize the schema cache ever since 2016 with Rails 5.1: 4c00c6ed
* | | Modernize size calculation in Schema CacheKasper Timm Hansen2019-03-121-1/+1
|/ / | | | | | | | | Not looking for other contributions like this, but I took the liberty since I was already working on this.
* | Remove unused `Row` class in `SelectManager`Ryuta Kamizono2019-03-131-12/+0
| | | | | | | | The `Row` class is no longer used since d956772b3c61d97940ebcccd7c83e2397ca0c36c.
* | Initialize `@default_timezone` and `@timestamp_decoder` in `add_pg_decoders`Ryuta Kamizono2019-03-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Staled `@default_timezone` would cause an error on `reconnect!` after `disconnect!`. https://buildkite.com/rails/rails/builds/59495#23be8079-3a4f-4375-9991-0a6f874554f2 Steps to reproduce: ``` % ARCONN=postgresql bin/test test/cases/adapter_test.rb test/cases/base_test.rb -n "/(?:test_attributes_on_dummy_time|test_reconnect_after_a_disconnect)$/" --seed 15849 Using postgresql Run options: -n "/(?:test_attributes_on_dummy_time|test_reconnect_after_a_disconnect)$/" --seed 15849 # Running: . E Error: ActiveRecord::AdapterTestWithoutTransaction#test_reconnect_after_a_disconnect: NoMethodError: undefined method `add_coder' for #<PG::TypeMapAllStrings:0x00007f85ab9dd5b8> /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:866:in `update_typemap_for_default_timezone' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:652:in `exec_no_cache' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:636:in `execute_and_clear' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:894:in `add_pg_decoders' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:744:in `connect' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:285:in `rescue in block in reconnect!' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:281:in `block in reconnect!' /Users/kamipo/.rbenv/versions/2.6.1/lib/ruby/2.6.0/monitor.rb:230:in `mon_synchronize' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb:280:in `reconnect!' /Users/kamipo/src/github.com/rails/rails/activerecord/test/cases/adapter_test.rb:465:in `block in <class:AdapterTestWithoutTransaction>' ```
* | Squish the deprecation messages across the codebasePrathamesh Sonpatki2019-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sample example -> Before: prathamesh@Prathameshs-MacBook-Pro-2 blog *$ rails server thin DEPRECATION WARNING: Passing the Rack server name as a regular argument is deprecated and will be removed in the next Rails version. Please, use the -u option instead. After: prathamesh@Prathameshs-MacBook-Pro-2 squish_app *$ rails server thin DEPRECATION WARNING: Passing the Rack server name as a regular argument is deprecated and will be removed in the next Rails version. Please, use the -u option instead.
* | Fix query attribute method on user-defined attribute to be aware of ↵kamille-3212019-03-111-2/+1
| | | | | | | | | | | | | | | | | | | | typecasted value change the line to check an attribute has user-defined type ref: https://github.com/rails/rails/pull/35320#discussion_r257924552 check query attribute method is working when given value does not respond to to_i method
* | Merge pull request #35449 from pjrebsch/quoting-empty-rangeRyuta Kamizono2019-03-111-2/+3
|\ \ | | | | | | Quote empty ranges like other empty enumerables
| * | Quote empty ranges like other empty enumerablesPatrick Rebsch2019-03-071-2/+3
| | |
* | | Merge pull request #35121 from utilum/warning_tried_to_create_proc_without_blockKasper Timm Hansen2019-03-103-6/+6
|\ \ \ | | | | | | | | Ruby 2.7 warning: creating a Proc without a block
| * | | Ruby 2.7 warning: creating a Proc without a blockutilum2019-02-133-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of [Revision 66772]( https://bugs.ruby-lang.org/projects/ruby-trunk/repository/trunk/revisions/66772) `Proc.new` without giving a block emits `warning: tried to create Proc object without a block`. This commit fixes cases where Rails test suit tickles this warning. See CI logs: https://travis-ci.org/rails/rails/jobs/487205819#L1161-L1190 https://travis-ci.org/rails/rails/jobs/487205821#L1154-1159 https://travis-ci.org/rails/rails/jobs/487205821#L1160-L1169 https://travis-ci.org/rails/rails/jobs/487205821#L1189 https://travis-ci.org/rails/rails/jobs/487254404#L1307-L1416 https://travis-ci.org/rails/rails/jobs/487254405#L1174-L1191
* | | | PostgreSQL: Add `add_pg_encoders` and `add_pg_decoders` in `connect`Ryuta Kamizono2019-03-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | It is to work that on `reconnect!` after `disconnect!`. https://buildkite.com/rails/rails/builds/59378#1efea538-cfca-4d43-8b7e-ae78e97227c8
* | | | SQLite3: Set `busy_timeout` in `configure_connection`Ryuta Kamizono2019-03-101-2/+2
| | | | | | | | | | | | | | | | It is to work that on `reconnect!` after `disconnect!`
* | | | Fix `reconnect!` to work after `disconnect!`Ryuta Kamizono2019-03-102-4/+16
| | | |
* | | | Update upsert_all documentation [ci skip]Sharang Dashputre2019-03-091-3/+2
| | | |
* | | | Merge pull request #35527 from tight/improve_doc_of_automatic_inverse_ofRyuta Kamizono2019-03-091-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve doc of automatic inverse_of detection [ci skip]
| * | | | Improve doc of automatic inverse_of detectionFrançois D2019-03-081-2/+3
| | |/ / | |/| |
* | | | Merge pull request #35531 from boblail/issue-35519Ryuta Kamizono2019-03-091-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update documentation on upsert_all so that it is correct for Postgres [ci skip]
| * | | | Update documentation on upsert_all so that it is correct for PostgresBob Lail2019-03-081-3/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Details in https://github.com/rails/rails/issues/35519 In short, MySQL and Sqlite3 allow a record to be both inserted _and_ replaced in the same operation. Postgres (and the SQL-2003 rules for MERGE) do not. Postgres's rationale seems to be that the operation would be nondeterministic. I think it's OK for Rails users to have a different experience with this feature depending on their database; but I think you should be able to follow the examples in the docs on any database.
* / / / Minor documentation fixes related to bulk insert [skip ci]Vishal Telangre2019-03-091-10/+13
|/ / /
* | | Merge pull request #35512 from kamipo/delegate_onlyRyuta Kamizono2019-03-071-1/+1
|\ \ \ | | | | | | | | Delegate `only` query method to relation as with `except`
| * | | Delegate `only` query method to relation as with `except`Ryuta Kamizono2019-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've found the skewness of delegation methods between `except` and `only` in a88b6f2. The `only` method is closely similar with `except` as `SpawnMethods`. https://github.com/rails/rails/blob/e056b9bfb07c4eb3bcc6672d885aadd72bec574f/activerecord/lib/active_record/relation/spawn_methods.rb#L53-L67 It is preferable both behaves the same way.
* | | | Merge pull request #35503 from samjohn/cannot-grammar-correctionXavier Noria2019-03-074-4/+4
|\ \ \ \ | |/ / / |/| | | Replace “can not” with “cannot”.
| * | | Replace “can not” with “cannot”.Samantha John2019-03-064-4/+4
| | | |
* | | | Refactor AR::Querying to extract `QUERYING_METHODS` listRyuta Kamizono2019-03-071-13/+17
| | | | | | | | | | | | | | | | This makes to ease testing `QUERYING_METHODS`.