aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Revert "Made ActiveRecord consistently use ActiveRecord::Type (not"Sean Griffin2016-10-231-2/+2
| | | | | | 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-221-0/+7
| | | | | | | | | | | | | | | | - 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-212-1/+77
|
* Fixed: Optimistic locking does not work well with null in the databasebogdanvlviv2016-10-212-11/+57
|
* Use old typecasting method if no type casted binds are passed inAaron Patterson2016-10-201-1/+35
| | | | | | | | | | | | | 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.
* Quote table name properlyRyuta Kamizono2016-10-142-11/+20
| | | | If does not quote table name properly, invalid SQL is generated.
* 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-111-0/+26
|\ | | | | | | Fix case insensitive check for text column in pg
| * Fix case insensitive check for text column in pgnanaya2016-09-011-0/+26
| | | | | | | | There's no 'text to text' casting in the cast table so the feature detection fails.
* | Fix table comment dumpingRyuta Kamizono2016-10-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #26735. If `table_options` returns `{ comment: nil }`, `create_table` line is broken. Example: ```ruby create_table "accounts", force: :cascade, do |t| ```
* | Dump index options to pretty formatRyuta Kamizono2016-10-102-3/+5
| | | | | | | | | | | | | | | | | | | | ```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 ```
* | Fixnum and Bignum are deprecated in Ruby trunkMatthew Draper2016-10-081-1/+1
| | | | | | | | https://bugs.ruby-lang.org/issues/12739
* | 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 #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 #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
* | | | Made ActiveRecord consistently use ActiveRecord::Type (notIain Beeston2016-10-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-0/+6
|\ \ \ \ | | | | | | | | | | 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-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | | 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-301-5/+2
|\ \ \ \ \ | | | | | | | | | | | | Preserve cached queries name in AS notifications
| * | | | | Preserve cached queries name in AS notificationsJean Boussier2016-09-221-5/+2
| | | | | |
* | | | | | Don't skip in-memory insertion of associations when loaded in validateSean Griffin2016-09-292-9/+31
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Serialize JSON attribute value nil as SQL NULL, not JSON 'null'Trung Duc Tran2016-09-232-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: JSON attribute value nil can be used in where(attr: nil) Add changelog entry
* | | | | Return true if attribute is not changed for update_attributePrathamesh Sonpatki2016-09-231-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If the attribute is not changed, then update_attribute does not run SQL query, this effectively means that no change was made to the attribute. - This change was made in https://github.com/rails/rails/commit/0fcd4cf5 to avoid a SQL call. - But the change resulted into `nil` being returned when there was no change in the attribute value. - This commit corrects the behavior to return true if there is no change in attribute value. This is same as previous behavior of Rails 4.2 plus benefit of no additional SQL call. - Fixes #26593.
* | | | Always store errors details information with symbolsRafael Mendonça França2016-09-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the association is autosaved we were storing the details with string keys. This was creating inconsistency with other details that are added using the `Errors#add` method. It was also inconsistent with the `Errors#messages` storage. To fix this inconsistency we are always storing with symbols. This will cause a small breaking change because in those cases the details could be accessed as strings keys but now it can not. The reason that we chose to do this breaking change is because `#details` should be considered a low level object like `#messages` is. Fix #26499. [Rafael Mendonça França + Marcus Vieira]
* | | | Merge pull request #26497 from koppen/26496-touch_with_optimistic_lockingEileen M. Uchitelle2016-09-171-0/+1
|\ \ \ \ | | | | | | | | | | Clear attribute changes after handling locking
| * | | | Clear attribute changes after handling lockingJakob Skjerning2016-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this the changes to the lock version column will stick around even after `touch` returns. Before: model.touch model.changes # => {"lock_version"=>[0, "1"]} After: model.touch model.changes # {}
* | | | | improve error message when include assertions failMichael Grosser2016-09-1634-141/+141
|/ / / / | | | | | | | | | | | | | | | | | | | | assert [1, 3].includes?(2) fails with unhelpful "Asserting failed" message assert_includes [1, 3], 2 fails with "Expected [1, 3] to include 2" which makes it easier to debug and more obvious what went wrong
* | | | Fix broken comments indentation caused by rubocop auto-correct [ci skip]Ryuta Kamizono2016-09-145-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | All indentation was normalized by rubocop auto-correct at 80e66cc4d90bf8c15d1a5f6e3152e90147f00772. But comments was still kept absolute position. This commit aligns comments with method definitions for consistency.
* | | | Address `warning: ambiguous first argument; put parentheses or a space even ↵Yasuo Honda2016-09-131-2/+2
| | | | | | | | | | | | | | | | after `/' operator`
* | | | Merge pull request #26466 from y-yagi/remove_duplicated_fixture_set_namesArthur Nogueira Neves2016-09-132-2/+4
|\ \ \ \ | | | | | | | | | | remove duplicated fixture set names
| * | | | remove duplicated fixture set namesyuuji.yaginuma2016-09-122-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If using namespaced fixtures, get following Ruby warning. ``` activerecord/lib/active_record/fixtures.rb:922: warning: method redefined; discarding old admin_foos activerecord/lib/active_record/fixtures.rb:922: warning: previous definition of admin_foos was here ``` This is happening because of the multiple set the same path when setting the fixture name. Fix to remove the duplicate path.
* | | | Merge pull request #26460 from ↵Sean Griffin2016-09-121-6/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/remove_useless_test_string_with_crazy_column Remove useless `test_string_with_crazy_column`
| * | | | Remove useless `test_string_with_crazy_column`Ryuta Kamizono2016-09-111-6/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | Passing `FakeColumn` was removed at #15336 therefore `test_string_with_crazy_column` is duplicated with `test_quote_string_no_column`.
* | | | Merge pull request #26434 from dylanahsmith/mysql2-no-nil-connectionArthur Nogueira Neves2016-09-121-0/+21
|\ \ \ \ | | | | | | | | | | activerecord/mysql2: Avoid setting @connection to nil, just close it
| * | | | activerecord/mysql2: Avoid setting @connection to nil, just close itDylan Thacker-Smith2016-09-081-0/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By doing `@connection = nil` that means that we need nil checks before it is used anywhere, but we weren't doing those checks. Instead, we get a NoMethodError after using a connection after it fails to reconnect. Neither of the other adapters set @connection to nil, just the mysql2 adapter. By just closing it, we avoid the need to check if we have a connection object and it will produce an appropriate exception when used.
* | | | Merge pull request #26459 from ysksn/add_test_for_activerecord_enumEileen M. Uchitelle2016-09-124-0/+43
|\ \ \ \ | | | | | | | | | | Add tests for ActiveRecord::Enum#enum when suffix specified
| * | | | Add tests for ActiveRecord::Enum#enum when suffix specifiedYosuke Kabuto2016-09-124-0/+43
| |/ / / | | | | | | | | | | | | Make name of attribute medium instead of normal
* | | | Merge pull request #26458 from kamipo/remove_unused_require_threadSantiago Pastorino2016-09-111-1/+0
|\ \ \ \ | | | | | | | | | | Remove unused `require "thread"` in `test/cases/attribute_methods/read_test.rb`
| * | | | Remove unused `require "thread"` in `test/cases/attribute_methods/read_test.rb`Ryuta Kamizono2016-09-111-1/+0
| |/ / / | | | | | | | | | | | | `Mutex` was removed at 8eb7561ac6e8f020ec09608532de310c6b0b8dcd.
* / / / Remove duplicated `elsif` branchRyuta Kamizono2016-09-111-2/+0
|/ / / | | | | | | | | | The `elsif` branch is completely duplicated with `else` branch.
* | | Merge pull request #26370 from yahonda/rails26368Andrew White2016-09-052-2/+2
|\ \ \ | | | | | | | | Move `require "models/post"` before `require "models/comment"`
| * | | Change require order to come `require "models/post"` before `require ↵Yasuo Honda2016-09-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "models/comment"` to address BasicsTest#test_readonly_attributes failure #26368 It reproduces only when both of these conditions are satisfied: - Other test files `autosave_association_test.rb` or `where_test.rb` which executes `require "models/comment"` then `require "models/post"` - When `autosave_association_test.rb` or `where_test.rb` executed before `base_test.rb`