aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
* Add test case for `collection.size` with dirty targetRyuta Kamizono2018-04-211-0/+10
|
* Merge pull request #32674 from composerinteralia/relax-assertionRyuta Kamizono2018-04-211-2/+2
|\ | | | | Relax assertions in connection config tests
| * Relax assertions in connection config testsDaniel Colson2018-04-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment these two ActiveRecord tests pass with `rake test:sqlite3`, but fail with `ARCONN=sqlite3 bin/test`. `Rails.root` is defined when running `bin/test`, but not when running the rake task. When `Rails.root` is defined, `config[:database]` will look something like `vagrant/rails/activerecord/db/primary.sqlite3` instead of just `db/primary.sqlite3`. (See https://github.com/rails/rails/blob/00caf95e14b90782ab17fbd6d2b930844df99980/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L27) Relaxing `assert_equal` to `assert_match` will allow these tests to pass regardless of how they are run. I do have a question why we need both ways to run tests. I have been using `bin/test` lately, but I see from #32426 that this is not the preferred method.
* | Can preload associations through polymorphic associationsDana Sherson2018-04-202-0/+32
| |
* | Merge pull request #31513 from fatkodima/relation-touch_allRafael França2018-04-201-1/+46
|\ \ | |/ |/| Add `touch_all` method to `ActiveRecord::Relation`
| * Add `touch_all` method to `ActiveRecord::Relation`fatkodima2018-04-131-1/+46
| |
* | Use assert_no_match for test_order_to_unscope_reorderingYasuo Honda2018-04-201-1/+1
| |
* | Merge pull request #32645 from maneframe/skip_query_cache_mergeRafael Mendonça França2018-04-191-0/+4
|\ \ | | | | | | | | | Fix relation merging with skip_query_cache!
| * | Fix relation merging with skip_query_cache!James Williams2018-04-191-0/+4
| |/
* / Replace `assert !` with `assert_not`Daniel Colson2018-04-1935-144/+144
|/ | | | | This autocorrects the violations after adding a custom cop in 3305c78dcd.
* don't check for immutability when setting skip_preloading as it doesn't ↵Lachlan Sylvester2018-04-122-1/+9
| | | | effect the arel and the arel may already be generated by fresh_when
* Prevent changes_to_save from mutating attributesEugene Kenny2018-04-081-0/+8
| | | | | | | | | | | | When an array of hashes is added to a `HashWithIndifferentAccess`, the hashes are replaced with HWIAs by mutating the array in place. If an attribute's value is an array of hashes, `changes_to_save` will convert it to an array of HWIAs as a side-effect of adding it to the changes hash. Using `merge!` instead of `[]=` fixes the problem, as `merge!` copies any array values in the provided hash instead of mutating them.
* Make Mocha setup explcitly Minitest-specificJames Mead2018-04-071-1/+1
| | | | | This has been possible since Mocha v1.0 and makes it clear that we want Mocha to integrate with Minitest, not Test::Unit.
* Merge pull request #32355 from kamipo/delegate_to_klass_in_a_scopeRafael França2018-04-062-0/+15
|\ | | | | Bring back private class methods accessibility in named scope
| * Deprecate accessibility of private/protected class methods in named scopeRyuta Kamizono2018-03-302-2/+10
| |
| * Bring back private class methods accessibility in named scopeRyuta Kamizono2018-03-271-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The receiver in a scope was changed from `klass` to `relation` itself for all scopes (named scope, default_scope, and association scope) behaves consistently. In addition. Before 5.2, if both an AR model class and a Relation instance have same named methods (e.g. `arel_attribute`, `predicate_builder`, etc), named scope doesn't respect relation instance information. For example: ```ruby class Post < ActiveRecord::Base has_many :comments1, class_name: "RecentComment1" has_many :comments2, class_name: "RecentComment2" end class RecentComment1 < ActiveRecord::Base self.table_name = "comments" default_scope { where(arel_attribute(:created_at).gteq(2.weeks.ago)) } end class RecentComment2 < ActiveRecord::Base self.table_name = "comments" default_scope { recent_updated } scope :recent_updated, -> { where(arel_attribute(:updated_at).gteq(2.weeks.ago)) } end ``` If eager loading `Post.eager_load(:comments1, :comments2).to_a`, `:comments1` (default_scope) respects aliased table name, but `:comments2` (using named scope) may not work correctly since named scope doesn't respect relation instance information. See also 801ccab. But this is a breaking change between releases without deprecation. I decided to bring back private class methods accessibility in named scope. Fixes #31740. Fixes #32331.
* | Merge pull request #32441 from composerinteralia/refute-notRafael França2018-04-049-16/+16
|\ \ | | | | | | Add custom RuboCop for `assert_not` over `refute`
| * | Autocorrect `refute` RuboCop violationsDaniel Colson2018-04-039-16/+16
| | | | | | | | | | | | | | | | | | 73e7aab behaved as expected on codeship, failing the build with exactly these RuboCop violations. Hopefully `rubocop -a` will have been enough to get a passing build!
* | | Merge pull request #32414 from bogdan/query-cache-optimizationRafael França2018-04-041-1/+2
|\ \ \ | | | | | | | | Optimize the code inside AR::QueryCache middleware
| * | | Optimize the code inside AR::QueryCache middlewareBogdan Gusiev2018-04-041-1/+2
| | | |
* | | | Add AR::Base.base_class? predicateBogdan Gusiev2018-04-022-1/+10
| |/ / |/| |
* | | Remove leftover blank sqlite3 file after in memory handler tests.utilum2018-04-011-0/+2
| | |
* | | Fix two-level database configurations with URLsEugene Kenny2018-03-311-10/+52
|/ / | | | | | | | | | | | | | | | | An entry in `ActiveRecord::Base.configurations` can either be a connection spec ("two-level") or a hash of specs ("three-level"). We were detecting two-level configurations by looking for the `database` key, but the database can also be specified as part of the `url` key, which meant we incorrectly treated those configurations as three-level.
* | Fix intermittent CI failure due to setting explicit `person.id = 10`Ryuta Kamizono2018-03-301-4/+0
| | | | | | | | https://travis-ci.org/rails/rails/jobs/360109429
* | Merge pull request #32338 from eugeneius/dont_clobber_foreign_keyRyuta Kamizono2018-03-301-0/+2
|\ \ | | | | | | Don't unset foreign key when preloading missing record
| * | Don't unset foreign key when preloading missing recordEugene Kenny2018-03-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a belongs to association's target is set, its foreign key is now updated to match the new target. This is the correct behaviour when a new record is assigned, but not when the existing record is preloaded. As long as we mark the association as loaded, we can skip setting the target when the record is missing and avoid clobbering the foreign key.
* | | Merge pull request #30956 from CJStadler/with-lock-changed-deprecationRafael França2018-03-283-0/+23
| | | | | | | | | | | | Fix deprecation warnings from with_lock
* | | Merge pull request #32299 from davidstosik/expose-fk-ignore-patternGuillermo Iguaran2018-03-271-0/+11
|\ \ \ | |_|/ |/| | Expose foreign key name ignore pattern in configuration
| * | Move fk_ignore_pattern from config.active_record to SchemaDumperDavid Stosik2018-03-221-1/+4
| | | | | | | | | | | | | | | This makes more sense, as the foreign key ignore pattern is only used by the schema dumper.
| * | Test config.active_record.fk_ignore_patternDavid Stosik2018-03-201-0/+8
| | |
* | | Merge pull request #32274 from eileencodes/part-1-add-rake-tasks-for-multi-dbEileen M. Uchitelle2018-03-261-1/+128
|\ \ \ | |_|/ |/| | Part 1 Easy Multi db in Rails: Add basic rake tasks for multi db setup
| * | Add tests for new rake taskseileencodes2018-03-211-1/+128
| |/
* | Merge pull request #32306 from danhuynhdev/feature/store-accessor-prefixAndrew White2018-03-243-1/+26
|\ \ | | | | | | Add custom prefix to ActiveRecord::Store accessors
| * | Add custom prefix to ActiveRecord::Store accessorsTan Huynh2018-03-233-1/+26
| | | | | | | | | | | | | | | | | | Add a prefix option to ActiveRecord::Store.store_accessor and ActiveRecord::Store.store. This option allows stores to have identical keys with different accessors.
* | | Fix that `touch(:updated_at)` causes multiple assignments on the columnRyuta Kamizono2018-03-231-0/+10
|/ / | | | | | | | | | | | | The multiple assignments was caused by 37a1dfa due to lost the `to_s` normalization for given names. Fixes #32323.
* / Add `QueryingMethodsDelegationTest` to cover query methods delegationRyuta Kamizono2018-03-221-0/+28
|/ | | | | It makes to ease to detect a future regression as long as the methods are covered by this test.
* Fix failing `QuotingTest#test_quoted_time_utc`bogdanvlviv2018-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | This test fails in specific time. Example: If run this test on the machine with time 01:00 am UTC+2, this test will fail. Changing representing of 2000-01-01 01:00 am UTC+2 to UTC+0 change the day, month and even year in our case, so substitution `"2000-01-01 "` to `""` isn't possible. ``` Failure: ActiveRecord::ConnectionAdapters::QuotingTest#test_quoted_time_utc Expected: "1999-12-31 23:01:27" Actual: "23:01:27" ``` Related to 7c479cbf
* Merge pull request #32271 from eileencodes/fix-three-tier-default-connectionEileen M. Uchitelle2018-03-161-0/+48
|\ | | | | Fix default connection handling with three-tier config
| * Fix connection handling with three-tier configeileencodes2018-03-161-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you had a three-tier config, the `establish_connection` that's called in the Railtie on load can't figure out how to access the default configuration. This is because Rails assumes that the config is the first value in the hash and always associated with the key from the environment. With a three tier config however we need to go one level deeper. This commit includes 2 changes. 1) removes a line from `resolve_all` which was parsing out the the environment from the config so instead of getting ``` { :development => { :primary => { :database => "whatever" } }, :animals => { :database => "whatever-animals" } }, etc with test / prod } ``` We'd instead end up with a config that had no attachment to it's envioronment. ``` { :primary => { :database => "whatever" } :animals => { :database => "whatever-animals" } etc - without test and prod } ``` Not only did this mean that Active Record didn't know how to establish a connection, it didn't have the other necessary configs along with it in the configs list. So fix this I removed the line that deletes these configs. The second thing this commit changes is adding this line to `establish_connection` ``` spec = spec[spec_name.to_sym] if spec[spec_name.to_sym] ``` When you have a three-tier config and don't pass any hash/symbol/env etc to `establish_connection` the resolver will automatically return both the primary and secondary (in this case animals db) configurations. We'll get an `database configuration does not specify adapter` error because AR will try to establish a connection on the `primary` key rather than the `primary` key's config. It assumes that the `development` or default env automatically will return a config hash, but with a three-tier config we actually get a key and config `primary => config`. This fix is a bit of a bandaid because it's not the "correct" way to handle this situation, but it does solve our immediate problem. The new code here is saying "if the config returned from the resolver (I know it's called spec in here but we interchange our meanings a LOT and what is returned is a three-tier config) has a key matching the "primary" spec name, grab the config from the spec and pass that to the estalbish_connection method". This works because if we pass `:animals` or a hash, or `:primary` we'll already have the correct configuration to connect with. This fixes the case where we want Rail to connect with the default connection. Coming soon is a refactoring that should eliminate the need to do this but I need this fix in order to write the multi-db rake tasks that I promised in my RailsConf submission. `@tenderlove` and I are working on the refactoring of the internals for connection management but it won't be ready for a few weeks and this issue has been blocking progress.
* | Fix multiline expression indexes for postgresql (#31621)fatkodima2018-03-162-2/+2
| |
* | Merge pull request #31250 from ↵Kasper Timm Hansen2018-03-151-1/+6
|\ \ | | | | | | | | | | | | lsylvester/only-preload-misses-on-multifetch-cache Only preload misses on multifetch cache
| * | Only preload misses on multifetch cacheLachlan Sylvester2018-03-061-1/+6
| | |
* | | Ensure that leading date is stripped by quoted_timeAndrew White2018-03-111-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | In #24542, quoted_time was introduced to strip the leading date component for time columns because it was having a significant effect in mariadb. However, it assumed that the date component was always 2000-01-01 which isn't the case, especially if the source wasn't another time column.
* | | Normalize date component when writing to time columnsAndrew White2018-03-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For legacy reasons Rails stores time columns on sqlite as full timestamp strings. However because the date component wasn't being normalized this meant that when they were read back they were being prefixed with 2001-01-01 by ActiveModel::Type::Time. This had a twofold result - first it meant that the fast code path wasn't being used because the string was invalid and second it was corrupting the second fractional component being read by the Date._parse code path. Fix this by a combination of normalizing the timestamps on writing and also changing Active Model to be more lenient when detecting whether a string starts with a date component before creating the dummy time value for parsing.
* | | Apply time column precision on assignmentAndrew White2018-03-112-0/+36
| |/ |/| | | | | | | | | | | In #20317, datetime columns had their precision applied on assignment but that behaviour wasn't applied to time columns - this commit fixes that. Fixes #30301.
* | Add `delegate :pick, to: :all`Yuji Hanamura2018-03-091-0/+5
| |
* | Fix dependence on has_one/belongs_to relationshipsFernando Gorodscy2018-03-062-0/+48
|/ | | | | | | | | | | | | | | | | | | | | | | | | | When a class has a belongs_to or has_one relationship with dependent: :destroy option enabled, objects of this class should not be deleted if it's dependents cannot be deleted. Example: class Parent has_one :child, dependent: :destroy end class Child belongs_to :parent, inverse_of: :child before_destroy { throw :abort } end c = Child.create p = Parent.create(child: c) p.destroy p.destroyed? # expected: false; actual: true; Fixes #32022
* whitelist NULLS { FIRST | LAST } in order clausesXavier Noria2018-03-061-0/+20
|
* Fix that after commit callbacks on update does not triggered when optimistic ↵Ryuta Kamizono2018-03-061-0/+22
| | | | | | | | | | | | | | | | | | locking is enabled This issue is caused by `@_trigger_update_callback` won't be updated due to `_update_record` in `Locking::Optimistic` doesn't call `super` when optimistic locking is enabled. Now optimistic locking concern when updating is supported by `_update_row` low level API, therefore overriding `_update_record` is no longer necessary. Removing the method just fix the issue. Closes #29096. Closes #29321. Closes #30823.
* `id_in_database` should be respected as primary key value for persisted recordsRyuta Kamizono2018-03-051-0/+39
| | | | | | | | | | | | Currently primary key value can not be updated if a record has a locking column because of `_update_record` in `Locking::Optimistic` doesn't respect `id_in_database` as primary key value unlike in `Persistence`. And also, if a record has dirty primary key value, it may destroy any other record by the lock version of dirty record itself. When updating/destroying persisted records, it should identify themselves by `id_in_database`, not by dirty primary key value.