aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #28199 from kirs/ar-test-connectionMatthew Draper2017-02-281-1/+4
|\ | | | | Handle non-existing $ARCONN
| * Handle non-existing $ARCONNKir Shatrov2017-02-271-1/+4
| |
* | Merge pull request #28188 from ↵Andrew White2017-02-264-8/+8
|\ \ | | | | | | | | | | | | kamipo/use_max_identifier_length_for_index_name_length Use `max_identifier_length` for `index_name_length`
| * | Use `max_identifier_length` for `index_name_length` in PostgreSQL adapterRyuta Kamizono2017-02-274-8/+8
| | | | | | | | | | | | | | | Actually `index_name_length` depend on `max_identifier_length`, not always 63.
* | | Merge pull request #28187 from kamipo/fix_intermittent_test_failureAndrew White2017-02-261-0/+3
|\ \ \ | | | | | | | | Fix `test_apply_distinct_in_count` failure in PG adapter
| * | | Fix `test_apply_distinct_in_count` failure in PG adapterRyuta Kamizono2017-02-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` % ARCONN=postgresql be ruby -w -Itest test/cases/calculations_test.rb -n test_apply_distinct_in_count /Users/kamipo/src/github.com/rails/rails/activesupport/lib/active_support/core_ext/enumerable.rb:20: warning: method redefined; discarding old sum Using postgresql Run options: -n test_apply_distinct_in_count --seed 27731 F Finished in 0.163682s, 6.1094 runs/s, 30.5470 assertions/s. 1) Failure: CalculationsTest#test_apply_distinct_in_count [test/cases/calculations_test.rb:238]: Expected /\ASELECT(?! DISTINCT) COUNT\(DISTINCT\b/ to match "SHOW max_identifier_length". 1 runs, 5 assertions, 1 failures, 0 errors, 0 skips ``` https://travis-ci.org/rails/rails/jobs/205493811#L1933 https://travis-ci.org/rails/rails/jobs/205496299#L1562 https://travis-ci.org/rails/rails/jobs/205514765#L1562
* | | | Merge pull request #25274 from kamipo/fix_find_nth_with_limit_valueAndrew White2017-02-262-6/+10
|\ \ \ \ | |_|/ / |/| | | Fix `find_nth` with `limit_value`
| * | | Fix `find_nth` with `limit_value`Ryuta Kamizono2017-02-262-6/+10
| | | | | | | | | | | | | | | | | | | | If the `index` exceeds a `limit`, simply return an empty result without querying the database.
* | | | Merge pull request #28172 from kamipo/deprecate_supports_migrationsAndrew White2017-02-2613-338/+306
|\ \ \ \ | | | | | | | | | | Deprecate `supports_migrations?` on connection adapters
| * | | | Deprecate `supports_migrations?` on connection adaptersRyuta Kamizono2017-02-2713-338/+306
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | `supports_migrations?` was added at 4160b518 to determine if schema statements (`create_table`, `drop_table`, etc) are implemented in the adapter. But all tested databases has been supported migrations since a4fc93c3 at least.
* / | | Refactor connection_pool_testKir Shatrov2017-02-261-1/+4
|/ / /
* | | [ci skip] Add CHANGELOG entry for #28183Andrew White2017-02-261-0/+4
| | |
* | | Merge pull request #28183 from eugeneius/having_select_columnAndrew White2017-02-262-1/+3
|\ \ \ | |/ / |/| | Include selects in group query with having clause
| * | Include selects in group query with having clauseEugene Kenny2017-02-262-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a grouped calculation contains a having clause that references a selected value, we need to include that selected value in the query. Postgres doesn't support referencing a selected value in a having clause, but other databases do; we can skip the test on the pg adapter but run it for the others. This was fixed before in 9a298a162c16e019fe6971e563e7f4916e86ced6, but the test coverage was lost in 5a05207d99b7e2678f9b42db2d9ffc21ec2c8c3b. The fix regressed in 6311975fb3c02f50730fd1e11b8dba8dd9c05306 and was removed in 97d46c17ea9113b0ce970167f5208c8d9170915c.
* | | Merge pull request #28176 from kamipo/push_valid_type_up_to_abstract_adapterAndrew White2017-02-264-11/+3
|\ \ \ | |/ / |/| | Push `valid_type?` up to abstract adapter
| * | Push `valid_type?` up to abstract adapterRyuta Kamizono2017-02-264-11/+3
| | | | | | | | | | | | | | | | | | | | | `valid_type?` should return true if a type exists in `native_database_types` at least. https://github.com/rails/rails/blob/v5.1.0.beta1/activerecord/lib/active_record/schema_dumper.rb#L136
* | | Merge pull request #28177 from kami-zh/remove-duplicated-privateAndrew White2017-02-261-102/+100
|\ \ \ | | | | | | | | Remove duplicated private method in ActiveRecord::FinderMethods
| * | | Remove duplicated private methodkami-zh2017-02-261-102/+100
| | | |
* | | | Merge pull request #28179 from kamipo/remove_useless_lineAndrew White2017-02-261-1/+0
|\ \ \ \ | |/ / / |/| | | Remove useless `select_values += select_values`
| * | | Remove useless `select_values += select_values`Ryuta Kamizono2017-02-261-1/+0
| |/ / | | | | | | | | | | | | `select_values` is a local variable defined at previous line. `select_values += select_values` is totally useless.
* | | Fix typo 'affect' -> 'effect' [ci skip]Rebecca Skinner2017-02-261-1/+1
| | |
* | | Fix `change_column` to drop default with `null: false`Ryuta Kamizono2017-02-264-5/+14
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `change_column` cannot drop default if `null: false` is specified at the same time. This change fixes the issue. ```ruby # cannot drop default change_column "tests", "contributor", :boolean, default: nil, null: false # we need the following workaround currently change_column "tests", "contributor", :boolean, null: false change_column "tests", "contributor", :boolean, default: nil ``` Closes #26582
* | Merge pull request #28167 from kirs/deprecate-verify-argsMatthew Draper2017-02-262-0/+15
|\ \ | | | | | | Deprecate AbstractAdapter#verify! with arguments
| * | Deprecate AbstractAdapter#verify! with argumentsKir Shatrov2017-02-252-0/+15
| | |
* | | Merge pull request #28169 from kirs/ensure-conn-verifyMatthew Draper2017-02-262-1/+2
|\ \ \ | | | | | | | | Use ensure block for things we cleanup in tests
| * | | Use ensure block for things we cleanup in testsKir Shatrov2017-02-252-1/+2
| |/ /
* | / Suppress `DISTINCT` clause outside aggregate functionRyuta Kamizono2017-02-252-2/+13
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `DISTINCT` clause is applied inside aggregate function by `operation_over_aggregate_column` if needed. Unneeded outside aggregate function. ```ruby # Before author.unique_categorized_posts.count # => SELECT DISTINCT COUNT(DISTINCT "posts"."id") FROM "posts" INNER JOIN "categorizations" ON "posts"."id" = "categorizations"."post_id" WHERE "categorizations"."author_id" = ? [["author_id", 2]] # After author.unique_categorized_posts.count # => SELECT COUNT(DISTINCT "posts"."id") FROM "posts" INNER JOIN "categorizations" ON "posts"."id" = "categorizations"."post_id" WHERE "categorizations"."author_id" = ? [["author_id", 2]] ``` Closes #27615
* | Order array contents to match Relation#firstMatthew Draper2017-02-251-1/+1
| |
* | Soft-deprecate the top-level HashWithIndifferentAccess classRobin Dupret2017-02-251-3/+3
| | | | | | | | | | | | | | Since using a `ActiveSupport::Deprecation::DeprecatedConstantProxy` would prevent people from inheriting this class and extending it from the `ActiveSupport::HashWithIndifferentAccess` one would break the ancestors chain, that's the best option we have here.
* | Improve docs for ActiveRecord::Result. [ci skip]Trevor Reiff2017-02-241-1/+12
| | | | | | | | Remove styling from `true` and `false`.
* | Merge pull request #25285 from ↵Rafael França2017-02-232-0/+17
|\ \ | | | | | | | | | | | | kamipo/fix_remove_reference_to_multiple_foreign_keys_in_the_same_table Fix `remove_reference` to multiple foreign keys in the same table
| * | Fix `remove_reference` to multiple foreign keys in the same tableRyuta Kamizono2017-02-112-0/+17
| | |
* | | Deprecate using `#quoted_id` in quotingRyuta Kamizono2017-02-245-6/+15
| | | | | | | | | | | | | | | Originally `quoted_id` was used in legacy quoting mechanism. Now we use type casting mechanism for that. Let's deprecate `quoted_id`.
* | | Fix type casting AR object to respect the primary key cast type's serializationRyuta Kamizono2017-02-242-2/+40
| | |
* | | Extract `TypeCastingTest` into `test/cases/quoting_test.rb`Ryuta Kamizono2017-02-243-52/+56
| | |
* | | Fix `wait_timeout` to configurable for mysql2 adapterRyuta Kamizono2017-02-243-2/+25
| | | | | | | | | | | | Fixes #26556.
* | | Preparing for 5.1.0.beta1 releaseRafael Mendonça França2017-02-232-1/+3
| | |
* | | Correctly dump native timestamp types for MySQLRyuta Kamizono2017-02-2310-5/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native timestamp type in MySQL is different from datetime type. Internal representation of the timestamp type is UNIX time, This means that timestamp columns are affected by time zone. ``` > SET time_zone = '+00:00'; Query OK, 0 rows affected (0.00 sec) > INSERT INTO time_with_zone(ts,dt) VALUES (NOW(),NOW()); Query OK, 1 row affected (0.02 sec) > SELECT * FROM time_with_zone; +---------------------+---------------------+ | ts | dt | +---------------------+---------------------+ | 2016-02-07 22:11:44 | 2016-02-07 22:11:44 | +---------------------+---------------------+ 1 row in set (0.00 sec) > SET time_zone = '-08:00'; Query OK, 0 rows affected (0.00 sec) > SELECT * FROM time_with_zone; +---------------------+---------------------+ | ts | dt | +---------------------+---------------------+ | 2016-02-07 14:11:44 | 2016-02-07 22:11:44 | +---------------------+---------------------+ 1 row in set (0.00 sec) ```
* | | Merge pull request #28095 from matthewd/nested-database-configMatthew Draper2017-02-222-0/+69
|\ \ \ | | | | | | | | Allow 3-level DB configs to group connections by environment
| * | | Allow 3-level DB configs to group connections by environmentMatthew Draper2017-02-222-0/+69
| | | | | | | | | | | | | | | | [Arthur Nogueira Neves & Matthew Draper]
* | | | Merge pull request #28042 from kamipo/add_changelog_for_27384Rafael França2017-02-212-4/+8
|\ \ \ \ | | | | | | | | | | Add CHANGELOG entry for #27384 and #27762
| * | | | Add CHANGELOG entry for #27384 and #27762Ryuta Kamizono2017-02-172-4/+8
| | | | |
* | | | | Merge pull request #23138 from rails/custom-url-helpers-and-polymorphic-urlsAndrew White2017-02-211-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Implement custom url helpers and polymorphic mapping
| * | | | | Fix schema leakage from dirty_test.rbAndrew White2017-02-211-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | The column information for the testings table was being cached so clear the cache in the test teardown.
* / | | | Add backticks around method namesJon Moss2017-02-211-1/+1
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Fix `define_attribute_method` with Symbol in ARPrem Sichanugrist2017-02-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue is only appear when you try to call `define_attribute_method` and passing a symbol in Active Record. It does not appear in isolation in Active Model itself. Before this patch, when you run `User.define_attribute_method :foo`, you will get: NoMethodError: undefined method `unpack' for :foo:Symbol from activerecord/lib/active_record/attribute_methods/read.rb:28:in `define_method_attribute' from activerecord/lib/active_record/attribute_methods/primary_key.rb:61:in `define_method_attribute' from activemodel/lib/active_model/attribute_methods.rb:292:in `block in define_attribute_method' from activemodel/lib/active_model/attribute_methods.rb:285:in `each' from activemodel/lib/active_model/attribute_methods.rb:285:in `define_attribute_method' This patch contains both a fix in Active Model and a test in Active Record for this error.
* | | | Merge pull request #28083 from eileencodes/ensure-test-threads-shared-db-connMatthew Draper2017-02-218-32/+80
|\ \ \ \ | | | | | | | | | | Ensure test threads share a DB connection
| * | | | Ensure test threads share a DB connectioneileencodes2017-02-208-32/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures multiple threads inside a transactional test to see consistent database state. When a system test starts Puma spins up one thread and Capybara spins up another thread. Because of this when tests are run the database cannot see what was inserted into the database on teardown. This is because there are two threads using two different connections. This change uses the statement cache to lock the threads to using a single connection ID instead of each not being able to see each other. This code only runs in the fixture setup and teardown so it does not affect real production databases. When a transaction is opened we set `lock_thread` to `Thread.current` so we can keep track of which connection the thread is using. When we rollback the transaction we unlock the thread and then there will be no left-over data in the database because the transaction will roll back the correct connections. [ Eileen M. Uchitelle, Matthew Draper ]
* | | | | Revert "Merge pull request #27925 from robin850/hwia-removal"Kasper Timm Hansen2017-02-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pointed out by @matthewd that the HWIA subclass changes the AS scoped class and top-level HWIA hierarchies out from under existing classes. This reverts commit 71da39097b67114329be6d8db7fe6911124531af, reversing changes made to 41c33bd4b2ec3f4a482e6030b6fda15091d81e4a.
* | | | | Merge pull request #25877 from kamipo/delegate_to_scope_rather_than_mergeMatthew Draper2017-02-215-34/+29
|\ \ \ \ \ | |/ / / / |/| | | | Delegate to `scope` rather than `merge!` for collection proxy