aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29848 from kamipo/fix_distinct_count_with_order_and_limitRafael França2017-07-243-34/+59
|\ | | | | Fix `COUNT(DISTINCT ...)` with `ORDER BY` and `LIMIT`
| * Extract `Account` model to the dedicated fileRyuta Kamizono2017-07-222-34/+35
| |
| * Should keep the table name qualified `*` for distinct subqueryRyuta Kamizono2017-07-221-0/+12
| |
| * Fix `COUNT(DISTINCT ...)` with `ORDER BY` and `LIMIT`Ryuta Kamizono2017-07-221-0/+12
| | | | | | | | | | | | | | Since #26972, `ORDER BY` is kept if `LIMIT` is presented for performance. But in most SQL servers (e.g. PostgreSQL, SQL Server, etc), `ORDER BY` expressions must appear in select list for `SELECT DISTINCT`. We should not replace existing select list in that case.
* | Fix `warning: assigned but unused variable - comment`Ryuta Kamizono2017-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` % ARCONN=sqlite3 be ruby -w -Itest test/cases/associations/belongs_to_associations_test.rb -n test_multiple_counter_cache_with_after_create_update test/cases/associations/belongs_to_associations_test.rb:1181: warning: assigned but unused variable - comment Using sqlite3 Run options: -n test_multiple_counter_cache_with_after_create_update --seed 49644 . Finished in 0.114266s, 8.7515 runs/s, 17.5030 assertions/s. 1 runs, 2 assertions, 0 failures, 0 errors, 0 skips ```
* | Merge pull request #29765 from lugray/fix_counter_cacheRafael França2017-07-242-0/+17
|\ \ | | | | | | Fix `counter_cache` double increment
| * | Add test for fixed `counter_cache` double incrementLisa Ugray2017-07-192-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an `after_create` callback did `update_attributes` on a record with multiple `belongs_to` associations with counter caches, even numbered associations would have their counters double-incremented. Fixes to `ActiveModel::Dirty` in 020abad fixed this. This adds regression tests for this bug fixed incidentally in the other commit, which also removed the need for the workaround using @_after_create_counter_called.
* | | Merge pull request #29905 from kamipo/remove_duplicated_assertionSean Griffin2017-07-241-16/+2
|\ \ \ | | | | | | | | Remove duplicated assertion in `test_count_with_join`
| * | | Remove duplicated assertion in `test_count_with_join`Ryuta Kamizono2017-07-241-16/+2
| | | | | | | | | | | | | | | | | | | | The queries both `res2` and `res3` are completely the same. And also, `assert_nothing_raised` is covered by following assertion.
* | | | Refactor Active Record to let Arel manage bind paramsSean Griffin2017-07-2410-129/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A common source of bugs and code bloat within Active Record has been the need for us to maintain the list of bind values separately from the AST they're associated with. This makes any sort of AST manipulation incredibly difficult, as any time we want to potentially insert or remove an AST node, we need to traverse the entire tree to find where the associated bind parameters are. With this change, the bind parameters now live on the AST directly. Active Record does not need to know or care about them until the final AST traversal for SQL construction. Rather than returning just the SQL, the Arel collector will now return both the SQL and the bind parameters. At this point the connection adapter will have all the values that it had before. A bit of this code is janky and something I'd like to refactor later. In particular, I don't like how we're handling associations in the predicate builder, the special casing of `StatementCache::Substitute` in `QueryAttribute`, or generally how we're handling bind value replacement in the statement cache when prepared statements are disabled. This also mostly reverts #26378, as it moved all the code into a location that I wanted to delete. /cc @metaskills @yahonda, this change will affect the adapters Fixes #29766. Fixes #29804. Fixes #26541. Close #28539. Close #24769. Close #26468. Close #26202. There are probably other issues/PRs that can be closed because of this commit, but that's all I could find on the first few pages.
* | | | Merge pull request #29860 from georgeclaghorn/travel-back-automaticallyRafael França2017-07-241-4/+0
|\ \ \ \ | |/ / / |/| | | Remove time stubs after each test
| * | | Remove time stubs after each testGeorge Claghorn2017-07-221-4/+0
| | | | | | | | | | | | | | | | Reverts 7abb6e0.
* | | | Merge pull request #29867 from koic/fix_a_failed_ar_test_when_using_oracleKasper Timm Hansen2017-07-231-2/+10
|\ \ \ \ | | | | | | | | | | Fix a failued AR test when using OracleAdapter
| * | | | Fix a failued AR test when using OracleAdapterKoichi ITO2017-07-201-2/+10
| | | | |
* | | | | Merge pull request #29768 from janpieper/sort-enabled-extensions-in-dumpEileen M. Uchitelle2017-07-221-0/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | | Sort enabled adapter extensions in schema dump
| * | | | Sort enabled adapter extensions in schema dumpJan Pieper2017-07-121-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The list of enabled adapter extensions in the schema dump isn't sorted by default, so it may happen that the sorting changes over time. If you're using a VCS, a change to the sorting results in a diff without any real change. Sorting the list should solve this problem.
* | | | | Merge pull request #29869 from kamipo/make_type_map_to_privateRafael França2017-07-215-14/+12
|\ \ \ \ \ | | | | | | | | | | | | Make `type_map` to private because it is only used in the connection adapter
| * | | | | Make `type_map` to private because it is only used in the connection adapterRyuta Kamizono2017-07-205-14/+12
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | `type_map` is an internal API and it is only used in the connection adapter. And also, some type map initializer methods requires passed `type_map`, but those instances already has `type_map` in itself. So we don't need explicit passing `type_map` to the initializers.
* | | | | Merge pull request #29855 from lugray/has_one_destroyed_by_associationRafael França2017-07-211-0/+34
|\ \ \ \ \ | | | | | | | | | | | | Match destroyed_by_association for has_one to has_many
| * | | | | Match destroyed_by_association for has_one to has_manyLisa Ugray2017-07-211-0/+34
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a has_many association is destroyed by `dependent: destroy`, destroyed_by_association is set to the reflection, and this can be checked in callbacks. This matches that behaviour for has_one associations.
* | | | | Merge pull request #29732 from kirs/frozen-activerecordRafael França2017-07-21432-11/+877
|\ \ \ \ \ | | | | | | | | | | | | Use frozen-string-literal in ActiveRecord
| * | | | | Reset column information after schema changedyuuji.yaginuma2017-07-202-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following failures. https://travis-ci.org/rails/rails/jobs/253990014
| * | | | | Use frozen-string-literal in ActiveRecordKir Shatrov2017-07-19431-11/+873
| |/ / / /
* / / / / Revert "Extract `bind_param` and `bind_attribute` into `ActiveRecord::TestCase`"Sean Griffin2017-07-2113-46/+56
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b6ad4052d18e4b29b8a092526c2beef013e2bf4f. This is not something that the majority of Active Record should be testing or care about. We should look at having fewer places rely on these details, not make it easier to rely on them.
* | | | Merge pull request #29033 from kamipo/make_preload_query_to_prepared_statementsSean Griffin2017-07-183-3/+3
|\ \ \ \ | |_|_|/ |/| | | Make preload query to preparable
| * | | Make preload query to preparableRyuta Kamizono2017-07-073-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently preload query cannot be prepared statements even if `prepared_statements: true` due to array handler in predicate builder doesn't support making bind params. This makes preload query to preparable by don't passing array value if possible.
* | | | Merge branch 'master' into fix_unscope_where_column_with_orSean Griffin2017-07-1819-223/+256
|\ \ \ \
| * \ \ \ Merge pull request #29834 from ↵Sean Griffin2017-07-183-0/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_unscoping_default_scope_with_sti_association Fix unscoping `default_scope` in STI associations
| | * | | | Fix unscoping `default_scope` for `Preloader`Ryuta Kamizono2017-07-191-0/+2
| | | | | |
| | * | | | Fix unscoping `default_scope` in STI associationsRyuta Kamizono2017-07-193-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-3/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-182-6/+4
| | | | |
| * | | | Remove deprecated code concerning dirty methods in after callbacksSean Griffin2017-07-181-4/+3
| | | | |
| * | | | Fix `JoinDependency` with using a custom tableRyuta Kamizono2017-07-181-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::Serialization#serializable_hash.
| * | | | | Merge pull request #29796 from kamipo/fix_where_with_custom_tableSean Griffin2017-07-171-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix `where` with a custom table
| | * | | | | Fix `where` with a custom tableRyuta Kamizono2017-07-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-0/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | `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-171-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-171-7/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Remove useless `arel_engine`