aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29834 from ↵Sean Griffin2017-07-186-3/+39
|\ | | | | | | | | kamipo/fix_unscoping_default_scope_with_sti_association Fix unscoping `default_scope` in STI associations
| * Fix unscoping `default_scope` for `Preloader`Ryuta Kamizono2017-07-192-1/+13
| |
| * Fix unscoping `default_scope` in STI associationsRyuta Kamizono2017-07-195-2/+26
| | | | | | | | | | | | | | Since 5c71000, it has lost to be able to unscope `default_scope` in STI associations. This change will use `.empty_scope?` instead of `.values.empty?` to regard as an empty scope if only have `type_condition`.
* | Don't convert dates to strings when using prepared statements in mysqlSean Griffin2017-07-182-3/+19
|/ | | | | | | | Dates are able to be natively handled by the mysql2 gem. libmysql (and the wire protocol) represent each portion of the date as an integer, which is significantly faster to encode and decode. By passing the Ruby date objects through directly, we can save a good bit of time and memory.
* Fix typo s/rause/raise/Ryuta Kamizono2017-07-191-1/+1
|
* Remove deprecated code concerning non-attributes and `*_will_change!`Sean Griffin2017-07-184-24/+7
|
* Remove deprecated code concerning dirty methods in after callbacksSean Griffin2017-07-182-83/+11
|
* Remove incorrect commentSean Griffin2017-07-181-2/+0
| | | | This method needs to be protected.
* Fix `JoinDependency` with using a custom tableRyuta Kamizono2017-07-186-18/+29
| | | | | | | | | | | | | | | Without this fix, `JoinDependency` doesn't use a custom table alias: ``` % ARCONN=sqlite3 be ruby -w -Itest test/cases/relations_test.rb -n test_using_a_custom_table_with_joins_affects_the_wheres Using sqlite3 Run options: -n test_using_a_custom_table_with_joins_affects_the_wheres --seed 14531 E Error:RelationTest#test_using_a_custom_table_with_joins_affects_the_wheres: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: posts.author_id: SELECT "omg_posts".* FROM "posts" "omg_posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" WHERE "omg_posts"."title" = ? LIMIT ? ```
* Merge pull request #29801 from kamipo/extract_null_relation_testSean Griffin2017-07-172-118/+82
|\ | | | | Extract `NullRelationTest` from `RelationTest`
| * Ensure calculation methods execute no queriesRyuta Kamizono2017-07-151-60/+14
| |
| * Extract `NullRelationTest` from `RelationTest`Ryuta Kamizono2017-07-152-118/+128
| | | | | | | | | | `test/cases/relations_test.rb` file has too much lines (2000 over). So I extracted `NullRelationTest` to the dedicated file.
* | Merge pull request #29799 from ↵Sean Griffin2017-07-171-8/+0
|\ \ | | | | | | | | | | | | kamipo/remove_outdated_test_scoped_responds_to_delegated_methods Remove outdated `test_scoped_responds_to_delegated_methods`
| * | Remove outdated `test_scoped_responds_to_delegated_methods`Ryuta Kamizono2017-07-151-8/+0
| |/ | | | | | | | | | | | | | | This test was added at 74ed123 to ensure `respond_to?` delegate methods to `Array` and `arel_table`. But array method delegation was removed at 9d79334 in favor of including `Enumerable`. And now `Relation` has `insert`, `update`, and `delete` methods (63480d2, 8d31c9f, d5f9173). So this delegation test is already outdated.
* | Merge pull request #25564 from brewski/serializable_hash_fixSean Griffin2017-07-171-4/+2
|\ \ | | | | | | Correctly handle frozen options for ActiveRecord::Serialization#seria…
| * | Correctly handle frozen options for ↵Brian Abreu2016-12-092-5/+3
| | | | | | | | | | | | ActiveRecord::Serialization#serializable_hash.
* | | Merge pull request #29796 from kamipo/fix_where_with_custom_tableSean Griffin2017-07-172-5/+5
|\ \ \ | | | | | | | | Fix `where` with a custom table
| * | | Fix `where` with a custom tableRyuta Kamizono2017-07-182-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix, SELECT clause doesn't use a custom table alias name: ``` % ARCONN=sqlite3 be ruby -w -Itest test/cases/relations_test.rb -n test_using_a_custom_table_affects_the_wheres Using sqlite3 Run options: -n test_using_a_custom_table_affects_the_wheres --seed 31818 E Error: RelationTest#test_using_a_custom_table_affects_the_wheres: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such table: posts: SELECT "posts".* FROM "posts" "omg_posts" WHERE "omg_posts"."title" = ? LIMIT ? ```
* | | | `Persistence#delete` should not be affected by scopingRyuta Kamizono2017-07-182-1/+12
|/ / / | | | | | | | | | | | | `self.class.delete` is delegated to `all` and `all` is affected by scoping. It should use `unscoped` to not be affected by that.
* | | Merge pull request #29788 from kamipo/remove_unused_mutex_mRafael França2017-07-172-3/+2
|\ \ \ | | | | | | | | Remove unused `Mutex_m` in Active Model
| * | | Make `generated_attribute_methods` to privateRyuta Kamizono2017-07-141-1/+1
| | | | | | | | | | | | | | | | Because `generated_attribute_methods` is an internal API.
| * | | Remove unused `Mutex_m` in Active ModelRyuta Kamizono2017-07-141-2/+1
| | |/ | |/|
* | | Allow multiparameter assigned attributes to be used with `text_field`Sean Griffin2017-07-173-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Between 4.2 and 5.0 the behavior of how multiparameter attributes interact with `_before_type_cast` changed. In 4.2 it returns the post-type-cast value. After 5.0, it returns the hash that gets sent to the type. This behavior is correct, but will cause an issue if you then tried to render that value in an input like `text_field` or `hidden_field`. In this case, we want those fields to use the post-type-cast form, instead of the `_before_type_cast` (the main reason it uses `_before_type_cast` at all is to avoid losing data when casting a non-numeric string to integer). I've opted to modify `came_from_user?` rather than introduce a new method for this as I want to avoid complicating that contract further, and technically the multiparameter hash didn't come from assignment, it was constructed internally by AR. Close #27888.
* | | Merge pull request #29825 from kamipo/remove_useless_arel_engineSean Griffin2017-07-174-19/+3
|\ \ \ | | | | | | | | Remove useless `arel_engine`
| * | | Remove useless `arel_engine`Ryuta Kamizono2017-07-174-19/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `arel_engine` is only used in `raise_record_not_found_exception!` to use `engine.connection` (and `connection.visitor`) in `arel.where_sql`. https://github.com/rails/arel/blob/v8.0.0/lib/arel/select_manager.rb#L183 But `klass.connection` will work as expected even if not using `arel_engine` (described by `test_connection`). So `arel_engine` is no longer needed.
* | | | Post.joins(:users) should not be affected by `User.current_scope`Sean Griffin2017-07-173-4/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was introduced by #18109. The intent of that change was to specifically apply `unscoped`, not to allow all changes to `current_scope` to affect the join. The idea of allowing `current_scope` to affect joins is interesting and potentially more consistent, but has sever problems associated with it. The fact that we're specifically stripping out joins indicates one such problem (and potentially leads to invalid queries). Ultimately it's difficult to reason about what `Posts.joins(:users)` actually means if it's affected by `User.current_scope`, and it's difficult to specifically control what does or doesn't get added. If we were starting from scratch, I don't think I'd have `joins` be affected by `default_scope` either, but that's too big of a breaking change to make at this point. With this change, we no longer apply `current_scope` when bringing in joins, with the singular exception of the motivating use case which introduced this bug, which is providing a way to *opt-out* of having the default scope apply to joins. Fixes #29338.
* | | Enable `Layout/FirstParameterIndentation` copRyuta Kamizono2017-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | We have some indentation cops. But now there is a little inconsistent params indentations. Enable `Layout/FirstParameterIndentation` cop to prevent newly inconsistent indentation added and auto-correct to existing violations.
* | | Merge pull request #29812 from kamipo/remove_unused_requiresKasper Timm Hansen2017-07-162-5/+0
|\ \ \ | | | | | | | | Remove unused requires
| * | | Remove unused requiresRyuta Kamizono2017-07-162-5/+0
| | | |
* | | | Merge pull request #29782 from y-yagi/follow_up_29699Kasper Timm Hansen2017-07-162-3/+13
|\ \ \ \ | | | | | | | | | | Set `represent_boolean_as_integer` via `configuration`
| * | | | Set `represent_boolean_as_integer` via `configuration`yuuji.yaginuma2017-07-162-3/+13
| | | | |
* | | | | Merge pull request #29813 from kamipo/fix_create_with_multiparameter_attributesKasper Timm Hansen2017-07-162-16/+34
|\ \ \ \ \ | | | | | | | | | | | | Fix `create_with` with multiparameter attributes
| * | | | | Fix `create_with` with multiparameter attributesRyuta Kamizono2017-07-162-16/+34
| | |/ / / | |/| | |
* | | | | Merge pull request #29814 from kamipo/dont_cache_scope_for_createKasper Timm Hansen2017-07-164-14/+6
|\ \ \ \ \ | | | | | | | | | | | | Don't cache `scope_for_create`
| * | | | | Don't cache `scope_for_create`Ryuta Kamizono2017-07-164-14/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I investigated where `scope_for_create` is reused in tests with the following code: ```diff --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -590,6 +590,10 @@ def where_values_hash(relation_table_name = table_name) end def scope_for_create + if defined?(@scope_for_create) && @scope_for_create + puts caller + puts "defined" + end @scope_for_create ||= where_values_hash.merge!(create_with_value.stringify_keys) end ``` It was hit only `test_scope_for_create_is_cached`. This means that `scope_for_create` will not be reused in normal use cases. So we can remove caching `scope_for_create` to respect changing `where_clause` and `create_with_value`.
* / / / / Fix code formatting for QueryMethods#selectRobin Dupret2017-07-161-2/+3
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #29809 from kamipo/remove_unused_ivarsKasper Timm Hansen2017-07-161-2/+1
|\ \ \ \ | |/ / / |/| | | Remove unused `@last`, `@order_clause`, and `@join_dependency`
| * | | Remove unused `@last`, `@order_clause`, and `@join_dependency`Ryuta Kamizono2017-07-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Using `@last` and `@order_clause` was removed at 8bb5274 and 90d1524. `@join_dependency` was added at b959950 but it is unused in the first place.
* | | | Fix `create_with` using both string and symbolRyuta Kamizono2017-07-169-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is related with #27680. Since `where_values_hash` keys constructed by `where` are string, so we need `stringify_keys` to `create_with_value` before merging it.
* | | | Use `where(id: 10)` rather than `where(relation.table[:id].eq(10))`Ryuta Kamizono2017-07-161-5/+5
|/ / / | | | | | | | | | | | | Because Arel is a private API and to describe `where_values_hash` keys constructed by `where` are string.
* | | Merge pull request #29679 from kamipo/add_test_case_for_27724Kasper Timm Hansen2017-07-152-0/+12
|\ \ \ | | | | | | | | Add a test case for overwriting existing condition on associations
| * | | Add a test case for overwriting existing condition on associationsRyuta Kamizono2017-07-072-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overwriting existing condition on associations has already supported (23bcc65 for eager loading, 2bfa2c0 for preloading). Fixes #27724. Closes #29154.
* | | | Merge pull request #29769 from kamipo/remove_extra_order_for_firstKasper Timm Hansen2017-07-152-32/+28
|\ \ \ \ | | | | | | | | | | Remove extra `.merge!(order: "id")` for `Relation#first` in tests
| * | | | Remove extra `.merge!(order: "id")` for `Relation#first` in testsRyuta Kamizono2017-07-132-32/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Since 07e5301, `Relation#first` will order by primary key if no order is defined.
* | | | | Merge pull request #29770 from y-yagi/fix_boolean_column_migration_scriptKasper Timm Hansen2017-07-152-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix boolean column migration script
| * | | | | Fix boolean column migration scriptyuuji.yaginuma2017-07-132-2/+2
| | |_|/ / | |/| | |
* / | | | Remove useless `aliased_table_name` in `JoinDependency`Ryuta Kamizono2017-07-154-18/+1
|/ / / / | | | | | | | | | | | | If `table.table_alias` is not nil, it is enough to use `table` simply.
* | | | Merge pull request #29699 from lugray/represent_boolean_as_integerMatthew Draper2017-07-128-8/+90
|\ \ \ \ | | | | | | | | | | Change sqlite3 boolean serialization to use 1 and 0
| * | | | Change sqlite3 boolean serialization to use 1 and 0Lisa Ugray2017-07-118-8/+90
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Abstract boolean serialization has been using 't' and 'f', with MySQL overriding that to use 1 and 0. This has the advantage that SQLite natively recognizes 1 and 0 as true and false, but does not natively recognize 't' and 'f'. This change in serialization requires a migration of stored boolean data for SQLite databases, so it's implemented behind a configuration flag whose default false value is deprecated. The flag itself can be deprecated in a future version of Rails. While loaded models will give the correct result for boolean columns without migrating old data, where() clauses will interact incorrectly with old data. While working in this area, also change the abstract adapter to use `"TRUE"` and `"FALSE"` as quoted values and `true` and `false` for unquoted. These are supported by PostreSQL, and MySQL remains overriden.
* | | | Merge pull request #29746 from kamipo/extract_fake_klassRafael França2017-07-113-52/+38
|\ \ \ \ | | | | | | | | | | Extract `FakeKlass` in `relation_test.rb` and `relation/mutation_test.rb`
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 01:47:56 +0000