aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #23770 from meinac/fix_habtm_symbol_class_nameArthur Nogueira Neves2016-10-272-2/+14
|\ \ \ \ \ | | | | | | | | | | | | Fix HABTM associations join table resolver bug on constants and symbols
| * | | | | Fix HABTM associations join table resolver bug on constants and symbolsMehmet Emin İNAÇ2016-10-272-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using Constant and symbol class_name option for associations are valid but raises exception on HABTM associations. There was a test case which tries to cover symbol class_name usage but doesn't cover correctly. Fixed both symbol usage and constant usage as well. These are all working as expected now; ``` has_and_belongs_to_many :foos, class_name: 'Foo' has_and_belongs_to_many :foos, class_name: :Foo has_and_belongs_to_many :foos, class_name: Foo ``` Closes #23767
* | | | | | Permit loads while queries are runningMatthew Draper2016-10-275-25/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A query may wait on a database-level lock, which could lead to a deadlock between threads.
* | | | | | Fixes an issue where time_zone_conversion that causes an exception in ARs ↵Julian Nadeau2016-10-271-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delegation Following off of https://github.com/rails/rails/issues/15945, I realized that super needs to be the first thing that is called in an AbstractModel's inherited method. I was receiving errors within the inherited method of time_zone_conversion, so I tested locally by moving super to the top of the method declaration. All exceptions went away.
* | | | | removes requires already present in active_support/railsXavier Noria2016-10-271-2/+0
| | | | |
* | | | | Merge pull request #26899 from kamipo/use_regex_matchXavier Noria2016-10-2710-13/+13
|\ \ \ \ \ | | | | | | | | | | | | Use Regexp#match? rather than Regexp#===
| * | | | | Use Regexp#match? rather than Regexp#===Ryuta Kamizono2016-10-2610-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Follow up to 99cf7558000090668b137085bfe6bcc06c4571dc.
* | | | | | let Regexp#match? be globally availableXavier Noria2016-10-2711-11/+0
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Regexp#match? should be considered to be part of the Ruby core library. We are emulating it for < 2.4, but not having to require the extension is part of the illusion of the emulation.
* | | | | Clear the correct query cacheSamuel Cochran2016-10-262-4/+27
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This executor currently relies on `ActiveRecord::Base.connection` not changing between `prepare` and `complete`. If something else returns the current ActiveRecord connection to the pool early then this `complete` call will fail to clear the correct query cache and restore the original `query_cache_enabled` status. This has for example been happening in Sidekiq: https://github.com/mperham/sidekiq/pull/3166 We can just keep track of the connection as part of the exector state.
* | | | Merge pull request #25432 from ↵Eileen M. Uchitelle2016-10-251-3/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | kamipo/polymorphic_reflection_is_not_using_methods_from_through_reflection `PolymorphicReflection` is not using the methods from `ThroughReflection`
| * | | `PolymorphicReflection` is not using the methods from `ThroughReflection`Ryuta Kamizono2016-06-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ThroughReflection` initializes `@delegate_reflection` and delegate all public methods to `delegate_reflection`. But `PolymorphicReflection` does not initialize `@delegate_reflection`. It is enough to inherit `AbstractReflection` (using `alias_candidate` only).
* | | | Merge pull request #26869 from prathamesh-sonpatki/fix-brittle-mysql-testsGuillermo Iguaran2016-10-241-4/+4
|\ \ \ \ | | | | | | | | | | Fix brittle tests which were relying on the error message text from mysql2 gem
| * | | | Fix brittle tests which were relying on the error message text from mysql2 gemPrathamesh Sonpatki2016-10-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - These tests were fixed earlier on master in https://github.com/rails/rails/commit/f13ec72664fd13d33d617103ca964a7592295854. - They started failing in first place due to change in https://github.com/brianmario/mysql2/commit/f14023fcfee9e85e6fc1b0e568048811518f8c23. - They will fail again when the message is changed in mysql2 so let's not rely on the error message.
* | | | | Copy-edits on #26880Rafael Mendonça França2016-10-241-32/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Put a blank line after :call-seq: otherwise it will think the whole test is the call seq. * Improve some text. * Use some rdoc formatting. * Restores the documentation of table_name_prefix. [ci skip]
* | | | | Fix model schema doc stringsMia Zbikowski2016-10-241-44/+103
| | | | |
* | | | | Small grammar fix for #26867Jon Moss2016-10-231-1/+2
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Add info about updating locking column valuebogdanvlviv2016-10-231-0/+1
| | | | | | | | | | | | | | | | | | | | [ci skip] Follow #26050
* | | | Revert "Made ActiveRecord consistently use ActiveRecord::Type (not"Sean Griffin2016-10-238-23/+9
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 671eb742eec77b5c8281ac2a2e3976ef32a6e424. This is not a change we would like moving forward.
* | | | Update mysql adapter error message when disconnectedGuillermo Iguaran2016-10-221-2/+2
| | | |
* | | | Fix regression caused due to removal of select method from CollectionAssociationPrathamesh Sonpatki2016-10-224-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CollectionAssociation#select was removed in https://github.com/rails/rails/pull/25989 in favor of QueryMethods#select but it caused a regression when passing arguments to select and a block. - This used to work earlier in Rails 4.2 and Rails 5. See gist https://gist.github.com/prathamesh-sonpatki/a7df922273473a77dfbc742a4be4b618. - This commit restores the behavior of Rails 4.2 and Rails 5.0.0 to allow passing arguments and block at the same time but also deprecates it. - Because, these arguments do not have any effect on the output of select when select is used with a block. - Updated documentation to remove the example passing arguments and block at the same time to `CollectionProxy#select`.
* | | | 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