aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Added ability update locking_column valuebogdanvlviv2016-10-214-7/+90
|
* Fixed: Optimistic locking does not work well with null in the databasebogdanvlviv2016-10-214-15/+69
|
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-10-201-3/+3
|\
| * Corrected comments referring to documentation inIain Beeston2016-10-031-3/+3
| | | | | | | | | | | | | | | | `ActiveRecord::Type::Value` This is now defined in `ActiveModel::Type::Value` (`ActiveRecord::Type::Value` still exists but it's effectively an alias)
* | Use old typecasting method if no type casted binds are passed inAaron Patterson2016-10-202-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | Query cache doesn't type cast bind parameters since it isn't actually querying the database, so it can't pass those values in. Type casting in the query cache method would cause the values to be type cast twice in the case that there is a cache miss (since the methods it calls will type cast *again*). If logging is disabled, then adding the type cast code to the query cache method will needlessly typecast the values (since the only reason those values are type cast is for display in the logs). Fixes #26828.
* | render_bind should be privateAaron Patterson2016-10-191-10/+10
| |
* | Fix indentation of code examplesOrhan Toy2016-10-191-4/+4
| | | | | | | | This commit fixes the generated HTML of the two code examples.
* | update doc about `change_column_default` [ci skip]yuuji.yaginuma2016-10-191-2/+4
| | | | | | | | Follow up to #20018.
* | Merge pull request #26598 from ↵Eileen M. Uchitelle2016-10-151-2/+2
|\ \ | | | | | | | | | | | | rutaka-n/raise_record_not_found_with_correct_params initialize errors with name of class and other params
| * | initialize errors with name of class and other paramsv.promzelev2016-09-231-2/+2
| | |
* | | Merge pull request #26784 from kamipo/quote_table_name_properlyRafael França2016-10-145-24/+35
|\ \ \ | | | | | | | | Quote table name properly
| * | | Quote table name properlyRyuta Kamizono2016-10-145-24/+35
| | | | | | | | | | | | | | | | If does not quote table name properly, invalid SQL is generated.
* | | | Support index.length for MySQL 8.0.0-dmrYasuo Honda2016-10-131-1/+1
|/ / / | | | | | | | | | | | | | | | | | | MySQL 8.0.0-dmr `SUB_PART` column of `information_schema.statistics` changed to varbinary(12), which is bigint(3) in MySQL 5.6. Addresses #26774
* | | Fix `warning: ambiguous first argument`Ryuta Kamizono2016-10-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | ``` test/cases/adapters/postgresql/case_insensitive_test.rb:12: warning: ambiguous first argument; put parentheses or a space even after `/' operator test/cases/adapters/postgresql/case_insensitive_test.rb:16: warning: ambiguous first argument; put parentheses or a space even after `/' operator test/cases/adapters/postgresql/case_insensitive_test.rb:20: warning: ambiguous first argument; put parentheses or a space even after `/' operator test/cases/adapters/postgresql/case_insensitive_test.rb:24: warning: ambiguous first argument; put parentheses or a space even after `/' operator ```
* | | Merge pull request #26208 from nanaya/pg-insensitive-textMatthew Draper2016-10-113-2/+37
|\ \ \ | | | | | | | | | | | | Fix case insensitive check for text column in pg
| * | | Fix case insensitive check for text column in pgnanaya2016-09-012-0/+30
| | | | | | | | | | | | | | | | There's no 'text to text' casting in the cast table so the feature detection fails.
| * | | Use proper castingnanaya2016-09-011-2/+2
| | | |
* | | | Extract `format_colspec` to format column specRyuta Kamizono2016-10-112-12/+10
| | | |
* | | | Fix table comment dumpingRyuta Kamizono2016-10-113-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #26735. If `table_options` returns `{ comment: nil }`, `create_table` line is broken. Example: ```ruby create_table "accounts", force: :cascade, do |t| ```
* | | | `name` is not a column optionRyuta Kamizono2016-10-103-12/+8
| | | | | | | | | | | | | | | | `migration_keys` includes `name` but `name` is not a column option.
* | | | Dump index options to pretty formatRyuta Kamizono2016-10-105-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby # Before t.index ["firm_id", "type", "rating"], name: "company_index", order: {"rating"=>:desc}, using: :btree # After t.index ["firm_id", "type", "rating"], name: "company_index", order: { rating: :desc }, using: :btree ```
* | | | Merge pull request #26735 from kamipo/prevent_to_create_blank_commentRafael França2016-10-093-6/+8
|\ \ \ \ | | | | | | | | | | Prevent to create blank comment
| * | | | Prevent to create blank commentRyuta Kamizono2016-10-083-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Currently blank comment does not dump to `db/schema.rb`. But created it even if specified blank.
* | | | | Merge pull request #26732 from matthewd/fixnum-warningMatthew Draper2016-10-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixnum and Bignum are deprecated in Ruby trunk
| * | | | | Fixnum and Bignum are deprecated in Ruby trunkMatthew Draper2016-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | https://bugs.ruby-lang.org/issues/12739
* | | | | | Merge pull request #26730 from rails/explain-why-inverse_of-is-disabledXavier Noria2016-10-071-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | explain why autosave= disables inverse_of [ci skip]
| * | | | | explain why autosave= disables inverse_of [ci skip]Xavier Noria2016-10-071-0/+4
| | | | | |
* | | | | | Tweak a test so the queries matchMatthew Draper2016-10-081-1/+1
|/ / / / /
* | | | | Simplify serializable test to avoid mystery deadlockMatthew Draper2016-10-071-23/+21
| | | | |
* | | | | Merge pull request #24963 from fertapric/recover-db-runtime-on-production-logsEileen M. Uchitelle2016-10-061-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix database runtimes on production log
| * | | | | Fix DB runtimes on production logFernando Tapia Rico2016-05-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails default production configuration establishes "info" as log level. Due to the changes included on commit 191facc857bb4fb52078fb544c6bc1613a81cc80, db runtimes were not being collected if the log level was different than "debug", and 0.0 ms was the runtime reported on production logs.
* | | | | | Merge pull request #26631 from kamipo/remove_duplicate_conditionMatthew Draper2016-10-061-3/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove duplicated `unless current_adapter?(:SQLite3Adapter)` condition
| * | | | | | Remove duplicated `unless current_adapter?(:SQLite3Adapter)` conditionRyuta Kamizono2016-09-271-3/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | `test_native_decimal_insert_manual_vs_automatic` exists inside `unless current_adapter?(:SQLite3Adapter)`. This condition is duplicated.
* | | | | | Merge pull request #26633 from kamipo/text_too_big_should_be_textMatthew Draper2016-10-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | `:text_too_big` column should be `:text`, not `:integer`
| * | | | | | `:text_too_big` column should be `:text`, not `:integer`Ryuta Kamizono2016-09-271-1/+1
| |/ / / / /
* | | | | | Merge pull request #25304 from kbrock/calculate_attributesMatthew Draper2016-10-061-6/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use attribute_names over column_names
| * | | | | | Use attribute_names over column_namesKeenan Brock2016-10-041-6/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #24571 from raimo/patch-1Sean Griffin2016-10-042-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Print the proper ::Float::INFINITY value when used as a default value
| * | | | | | Print the proper ::Float::INFINITY value when used as a default valueRaimo Tuisku2016-05-232-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses https://github.com/rails/rails/issues/22396
* | | | | | | Merge pull request #26684 from matthewd/executor-serialMatthew Draper2016-10-051-6/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Avoid bumping the class serial when invoking executor
| * | | | | | Avoid bumping the class serial when invoking executorMatthew Draper2016-10-031-6/+4
| | | | | | |
* | | | | | | Made ActiveRecord consistently use ActiveRecord::Type (notIain Beeston2016-10-038-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveModel::Type) Some code was previously referring to ActiveModel::Type::*. This could cause issues in the future if any of the ActiveRecord::Type classes were overridden in the future.
* | | | | | | Merge pull request #26425 from prathamesh-sonpatki/fix-nil-issueMatthew Draper2016-10-032-10/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix issue with `cache_key` when the named timestamp column has value nil
| * | | | | | Fix issue with `cache_key` when the named timestamp column has value nilPrathamesh Sonpatki2016-09-072-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When the named timestamp column is nil, we should just return the cache_key with model name and id similar to the behavior of implicit timestamp columns. - Fixed one of the issue mentioned in https://github.com/rails/rails/issues/26417.
* | | | | | | 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.
* | | | | | | Make PG deadlock error more deterministicMatthew Draper2016-10-011-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've seen occasional Travis failures mentioning deadlocks. I think they're escaping from this test.
* | | | | | | Merge pull request #26584 from Shopify/cached-query-nameRafael França2016-09-304-11/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Preserve cached queries name in AS notifications
| * | | | | | | Preserve cached queries name in AS notificationsJean Boussier2016-09-224-11/+18
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Don't skip in-memory insertion of associations when loaded in validateSean Griffin2016-09-294-16/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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