aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #23521 from kamipo/fix_assert_in_delta_failureRafael França2016-02-221-3/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix `assert_in_delta` test failure
| * | | | | | | | | Fix `assert_in_delta` test failureRyuta Kamizono2016-02-061-3/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `assert_in_delta` in `timestamp_test.rb` causes an intermittent test failure. It looks like that caused by subseconds truncation in MySQL 5.5. Example: ``` 1) Failure: TimestampTest#test_touching_many_attributes_updates_them [/home/travis/build/rails/rails/activerecord/test/cases/timestamp_test.rb:125]: Expected |2016-02-06 09:22:10 +0000 - 2016-02-06 09:22:09 UTC| (1.000837185) to be <= 1. ```
* | | | | | | | | Merge pull request #22748 from Azzurrio/masterMatthew Draper2016-02-221-0/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix NoMethodError preparable for Arel::Visitors::PostgreSQL
| * | | | | | | | | Fix NoMethodError preparable for Arel::Visitors in case prepared statements ↵Azzurrio2016-02-221-0/+22
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | is falsy
* | | | | | | | | Merge pull request #23751 from chezou/add-test-case-order-by-fieldAndrew White2016-02-221-0/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Add test cases about MySQL ORDER BY FIELD()
| * | | | | | | | Add assertions order by field with empty dataMichiaki Ariga2016-02-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add assertions to MySQL `ORDER BY FIELD()` with empty data. These tests examine to sanitize `ORDER BY FIELD()` with empty data appropriately. ```ruby Tag.order(['field(id, ?)', []]).to_sql # => SELECT "tags".* FROM "tags" ORDER BY field(id, NULL) Tag.order(['field(id, ?)', nil]).to_sql # => SELECT "tags".* FROM "tags" ORDER BY field(id, NULL) ```
* | | | | | | | | Match test name to test (typo)Ian Fleeton2016-02-211-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #23794 from matthewd/mutation-safe-to_aMatthew Draper2016-02-211-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mutating the result of Relation#to_a should not affect the relation
| * | | | | | | | | Mutating the result of Relation#to_a should not affect the relationMatthew Draper2016-02-211-0/+10
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarifying this separation and enforcing relation immutability is the culmination of the previous efforts to remove the mutator method delegations.
* | | | | | | | | Merge pull request #23793 from qazbnm456/masterEileen M. Uchitelle2016-02-201-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix typo
| * | | | | | | | | fix typoLobsiinvok2016-02-201-1/+1
| | | | | | | | | |
* | | | | | | | | | Always validate record if validating a virtual attributeeileencodes2016-02-203-0/+45
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23645 When you're using an `attr_accessor` for a record instead of an attribute in the database there's no way for the record to know if it has `changed?` unless you tell it `attribute_will_change!("attribute")`. The change made in 27aa4dd updated validations to check if a record was `changed?` or `marked_for_destruction?` or not `persisted?`. It did not take into account virtual attributes that do not affect the model's dirty status. The only way to fix this is to always validate the record if the attribute does not belong to the set of attributes the record expects (in `record.attributes`) because virtual attributes will not be in that hash. I think we should consider deprecating this particular behavior in the future and requiring that the user mark the record dirty by noting that the virtual attribute will change. Unfortunately this isn't easy because we have no way of knowing that you did the "right thing" in your application by marking it dirty and will get the deprecation warning even if you are doing the correct thing. For now this restores expected behavior when using a virtual attribute by always validating the record, as well as adds tests for this case. I was going to add the `!record.attributes.include?(attribute)` to the `should_validate?` method but `uniqueness` cannot validate a virtual attribute with nothing to hold on to the attribute. Because of this `should_validate?` was about to become a very messy method so I decided to split them up so we can handle it specifically for each case.
* / / / / / / / / eliminate warnings about multiple primary keys on habtm join tablesAaron Patterson2016-02-192-1/+14
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | habtm join tables commonly have two id columns and it's OK to make those two id columns a primary key. This commit eliminates the warnings for join tables that have this setup. ManageIQ/manageiq#6713
* | | | | | | | Merge pull request #22365 from ↵Sean Griffin2016-02-173-2/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phuibonhoa/phuibonhoa/polymorphic_where_multiple_types Fixed `where` for polymorphic associations when passed an array containing different types.
| * | | | | | | | Fixed `where` for polymorphic associations when passed an array containing ↵Philippe Huibonhoa2016-02-163-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different types. When passing in an array of different types of objects to `where`, it would only take into account the class of the first object in the array. PriceEstimate.where(estimate_of: [Treasure.find(1), Car.find(2)]) # => SELECT "price_estimates".* FROM "price_estimates" WHERE ("price_estimates"."estimate_of_type" = 'Treasure' AND "price_estimates"."estimate_of_id" IN (1, 2)) This is fixed to properly look for any records matching both type and id: PriceEstimate.where(estimate_of: [Treasure.find(1), Car.find(2)]) # => SELECT "price_estimates".* FROM "price_estimates" WHERE (("price_estimates"."estimate_of_type" = 'Treasure' AND "price_estimates"."estimate_of_id" = 1) OR ("price_estimates"."estimate_of_type" = 'Car' AND "price_estimates"."estimate_of_id" = 2))
* | | | | | | | | Merge pull request #23570 from rthbound/addresses-23568Matthew Draper2016-02-181-0/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Addresses #23568, Incorrect error message with accepts_nested_attributes_for / has_many & has_one
| * | | | | | | | Addresses #23568Ryan T. Hosford2016-02-091-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Corrects an incorrect exception message when using accepts_nested_attributes_for - Removes rescue/reraise behavior introduced in #19077 - Adds has_many & has_one, nested_attributes test case specifying the message that should be conveyed with an exception raised because one of the nested attributes provided is unknown
* | | | | | | | | Show proper error message when a non-relation object is passed to ↵Prathamesh Sonpatki2016-02-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AR::Relation#or - Previously it used to show error message <"undefined method `limit_value' for {:title=>\"Rails\"}:Hash"> - Now it shows following error message. >> Post.where.not(name: 'DHH').or(name: 'Tenderlove') ArgumentError: You have passed Hash object to #or. Pass an ActiveRecord::Relation object instead. - Fixes #23714.
* | | | | | | | | Fix semantics of test names for finish option in batches_testAkshay2016-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The change was added in #23099
* | | | | | | | | Test parent local_stored_attributes isn't modifiedDavid Genord II2016-02-161-0/+1
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Saw the `merge!` and had to prove to myself that the parent model's local_stored_attributes was not being changed when stored_attributes is called on a child model. Proved to be working as expected but this test is probably still useful to keep around.
* | | | | | | | Merge pull request #23614 from georgemillo/foreign_keyYves Senn2016-02-161-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let t.foreign_key use the same `to_table` twice Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | Let t.foreign_key use the same `to_table` twiceGeorge Millo2016-02-151-0/+20
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if you used `t.foreign_key` twice within the same `create_table` block using the same `to_table`, all statements except the final one would fail silently. For example, the following code: def change create_table :flights do |t| t.integer :from_id, index: true, null: false t.integer :to_id, index: true, null: false t.foreign_key :airports, column: :from_id t.foreign_key :airports, column: :to_id end end Would only create one foreign key, on the column `from_id`. This commit allows multiple foreign keys to the same table to be created within one `create_table` block.
* | | | | | | | Merge pull request #23377 from bogdan/last-with-sqlEileen M. Uchitelle2016-02-131-8/+36
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix AR::Relation#last bugs instroduced in 7705fc
| * | | | | | | | Make ActiveRecord::Relation#last to reverse SQL orderBogdan Gusiev2016-02-131-8/+36
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | instead of loading the relation into memory
* / | | | | | | Fix grammar `a` to `an` [ci skip]Ryuta Kamizono2016-02-131-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #18109 from k0kubun/unscoped-joinsSean Griffin2016-02-112-0/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow `joins` to be unscoped Fixes #13775
| * | | | | | | Allow `joins` to be unscopedTakashi Kokubun2016-01-312-0/+13
| | | | | | | |
* | | | | | | | Merge pull request #23581 from diego-silva/uniqueness-validator-pk-fixSean Griffin2016-02-111-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | UniquenessValidator exclude itself when PK changed
| * | | | | | | | UniquenessValidator exclude itself when PK changedDiego Silva2016-02-091-0/+11
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When changing the PK for a record which has a uniqueness validation on some other attribute, Active Record should exclude itself from the validation based on the PK value stored on the DB (id_was) instead of its new value (id).
* | | | | | | | rename to 'second_to_last' and 'third_to_last'Brian Christian2016-02-101-4/+4
| | | | | | | |
* | | | | | | | allow Array.penultimate and Array.antepenultiate access methodsBrian Christian2016-02-091-0/+10
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-02-071-2/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [ci skip] Good bye SQLite2yui-knk2016-02-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of https://github.com/rails/rails/commit/c9feea6c9ab4494b0cb0b8cf4316847854f65af6
* | | | | | | Revert "Dump indexes in `create_table` instead of `add_index`"Sean Griffin2016-02-051-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 99801c6a7b69eb4b006a55de17ada78f3a0fa4c1. Ultimately it doesn't matter whether `add_index` or `t.index` are used in the schema dumper in any meaningful way. There are gems out there which hook into the old behavior for things like indexing materialized views. Since the reverted commit doesn't seem to add much benefit, there's no reason for us to break these gems.
* | | | | | | Remove accidental additional testJeremy Baker2016-02-041-5/+0
| | | | | | |
* | | | | | | Add a resolver test for the missing schemeJeremy Baker2016-02-042-0/+11
| | | | | | |
* | | | | | | Typos in AR testsAkira Matsuda2016-02-044-5/+5
| | | | | | |
* | | | | | | Merge pull request #23458 from kamipo/activerecord_supports_mysql_5.0_and_upSean Griffin2016-02-031-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Active Record supports MySQL >= 5.0
| * | | | | | | Active Record supports MySQL >= 5.0Ryuta Kamizono2016-02-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently some features uses `information_schema` (e.g. foreign key support). `information_schema` introduced since MySQL 5.0.
* | | | | | | | Merge pull request #23457 from matthewd/arel-attributeMatthew Draper2016-02-041-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Defer Arel attribute lookup to the model class
| * | | | | | | Defer Arel attribute lookup to the model classMatthew Draper2016-02-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This still isn't as separated as I'd like, but it at least moves most of the burden of alias mapping in one place.
* | | | | | | | Typos in AR testsAkira Matsuda2016-02-036-10/+10
| | | | | | | |
* | | | | | | | Merge pull request #20997 from himesh-r/issue-20995Arthur Neves2016-02-021-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Changed id-writer to save join table records based on association primary key #20995.
| * | | | | | | Changed id-writer to save join table records based on association primary ↵Himesh2016-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key #20995 Changed id-writer to save join table records based on association primary key
* | | | | | | | Avoid infinite recursion when bad values are passed to tz aware fieldsSean Griffin2016-02-021-0/+7
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had previously updated this to attempt to map over whatever was passed in, so that additional types like range and array could benefit from this behavior without the time zone converter having to deal with every known type. However, the default behavior of a type is to just yield the given value to `map`, which means that if we don't actually know how to handle a value, we'll just recurse infinitely. Since both uses of `map` in this case occur in cases where we know receiving the same object will recurse, we can just break on reference equality. Fixes #23241.
* | | | | | | Merge pull request #23331 from amatsuda/valid_scope_nameRafael França2016-02-021-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Warn if a named scope is overwriting an existing scope or method
| * | | | | | | Suppress :warning:sAkira Matsuda2016-01-281-1/+1
| | | | | | | |
| * | | | | | | scope needs the second argumentAkira Matsuda2016-01-281-1/+1
| | | | | | | |
| * | | | | | | Revert "Remove valid_scope_name? check - use ruby"Akira Matsuda2016-01-281-0/+19
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f6db31ec16e42ee7713029f7120f0b011d1ddc6c. Reason: Scope names can very easily conflict, particularly when sharing Concerns within the team, or using multiple gems that extend AR models. It is true that Ruby has the ability to detect this with the -w option, but the reality is that we are depending on too many gems that do not care about Ruby warnings, therefore it might not be a realistic solution to turn this switch on in our real-world apps.
* | | | | | | Merge pull request #23407 from jeremy/corrupt-before-commitJeremy Daer2016-02-011-0/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix corrupt transaction state caused by `before_commit` exceptions