aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #22896 from kamipo/fix_unsigned_and_blob_or_text_columnRafael França2016-01-043-5/+16
|\ \ \ | | | | | | | | Fix `unsigned?` and `blob_or_text_column` for Enum columns in MySQL
| * | | Fix `unsigned?` and `blob_or_text_column?` for Enum columns in MySQLRyuta Kamizono2016-01-043-5/+16
| | | |
* | | | Merge pull request #22550 from tamird/record-fetch-warning-allocate-lessSean Griffin2016-01-045-20/+24
|\ \ \ \ | |_|/ / |/| | | activerecord: allocate fewer objects
| * | | activerecord: reuse immutable objectsTamir Duberstein2016-01-044-14/+20
| | | |
| * | | activerecord: allocate fewer arrays in `RecordFetchWarning`Tamir Duberstein2016-01-041-6/+4
| |/ /
* | | Merge pull request #22915 from kamipo/fix_user_name_in_docEileen M. Uchitelle2016-01-041-1/+1
|\ \ \ | | | | | | | | Fix user name in doc [ci skip]
| * | | Fix user name in doc [ci skip]Ryuta Kamizono2015-12-311-1/+1
| | | |
* | | | Merge pull request #22821 from shosti/set-null-transactionArthur Nogueira Neves2016-01-042-0/+6
|\ \ \ \ | |_|/ / |/| | | Allow add_to_transaction with null transaction
| * | | Allow add_to_transaction with null transactionEmanuel Evans2015-12-282-0/+6
| | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/22819
* | | | Merge pull request #22889 from kamipo/remove_fixme_commentsClaudio B2016-01-021-3/+0
|\ \ \ \ | | | | | | | | | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip]
| * | | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip]Ryuta Kamizono2016-01-031-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | The `Arel::Nodes::Quoted` was removed already. Follow up to f916aa247bddba0c58c50822886bc29e8556df76.
* | | | | correctly presence check of `application_record.rb` in pluginyuuji.yaginuma2016-01-021-1/+7
|/ / / /
* | | | Merge pull request #22877 from kamipo/refactor_case_sensitive_comparisonRafael França2016-01-014-20/+17
|\ \ \ \ | | | | | | | | | | Refactor `case_{sensitive|insensitive}_comparison`
| * | | | Refactor `case_{sensitive|insensitive}_comparison`Ryuta Kamizono2016-01-014-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ``` SELECT 1 AS one FROM "topics" WHERE "topics"."title" = 'abc' LIMIT $1 [["LIMIT", 1]] ``` After: ``` SELECT 1 AS one FROM "topics" WHERE "topics"."title" = $1 LIMIT $2 [["title", "abc"], ["LIMIT", 1]] ```
* | | | | quoted_id is not public API.Rafael Mendonça França2016-01-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | It was made public by mistake in https://github.com/rails/rails/commit/539b69e0.
* | | | | Remove unnecessary enable,disable_extension on testsFumiaki MATSUSHIMA2016-01-022-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uuid-ossp extension is alreadly enabled on test schema. And `disable_extension!('uuid-ossp', connection)` can be a cause of test failure. `ActiveRecord::StatementInvalid: PG::UndefinedFunction: ERROR: function uuid_generate_v1() does not exist` will happen depending on the execution order.
* | | | | Merge pull request #22860 from Timmehs/better-or-exampleClaudio B2016-01-011-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Better example for ActiveRecord::Relation#or [ci skip]
| * | | | | Improve example of #or to use different column values in the where clausesTim Sandberg2015-12-301-2/+2
| | | | | |
* | | | | | value has the right type hereSantiago Pastorino2015-12-311-1/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using `enum kind: [ :any, :income, :expense ]` syntax, value is already an integer and using `enum kind: { any: 'any', income: 'income', expense: 'expense' }` syntax value is a string. This allows us to define the mapping in the enum definition. This reverts commit 933decceaf6092020ba7ba768b51b2db9d5b882f.
* | | | | Update copyright notices to 2016 [ci skip]Rashmi Yadav2015-12-312-3/+3
| |_|/ / |/| | |
* | | | Merge pull request #22866 from prathamesh-sonpatki/rm-dot-at-the-end-of-commandRafael França2015-12-311-2/+2
|\ \ \ \ | | | | | | | | | | Lets not put fullstop at the end of a migration pending command
| * | | | Lets not put fullstop at the end of a migration pending commandPrathamesh Sonpatki2015-12-311-2/+2
| |/ / / | | | | | | | | | | | | - So that we can just copy paste the command and execute it
* | | | Merge pull request #22105 from ↵Rafael França2015-12-312-3/+65
|\ \ \ \ | |/ / / |/| | | | | | | | | | | morgoth/fix-errors-details-on-autosave-associations Fixed setting errors details on autosaved associations
| * | | Fixed setting errors details on autosaved associationsWojciech Wnętrzak2015-10-282-3/+65
| | | |
* | | | Merge pull request #22848 from derekprior/dp-postgresql-versionRafael França2015-12-301-5/+5
|\ \ \ \ | | | | | | | | | | Make `postgresql_version` public
| * | | | Make `postgresql_version` publicDerek Prior2015-12-301-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful to libraries that want to feature gate based on the version of PostgreSQL the user is connected to. For instance, I want to know if the user is connected to a version of Postgres that supports concurrent materialized view refreshes. I could add that as a method on the adapter as a PR, but rails has no need for this itself. Rails is already using the postgresql_version for its own feature gating and this makes that possible for other libraries.
* | | | | Merge pull request #22241 from kamipo/add_columns_for_distinct_for_mysql57Rafael França2015-12-303-5/+67
|\ \ \ \ \ | | | | | | | | | | | | Add `columns_for_distinct` for MySQL 5.7 with ONLY_FULL_GROUP_BY
| * | | | | Add `columns_for_distinct` for MySQL 5.7 with ONLY_FULL_GROUP_BYRyuta Kamizono2015-12-233-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In MySQL 5.7.5 and up, ONLY_FULL_GROUP_BY affects handling of queries that use DISTINCT and ORDER BY. It requires the ORDER BY columns in the select list for distinct queries, and requires that the ORDER BY include the distinct column. See https://dev.mysql.com/doc/refman/5.7/en/group-by-handling.html
| * | | | | Avoid `distinct` if a subquery has already materializedRyuta Kamizono2015-12-231-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Follow up to #19359 and avoid #22241.
* | | | | | Merge pull request #22447 from kamipo/fix_test_to_null_agnostic_wayRafael França2015-12-303-3/+14
|\| | | | | | | | | | | | | | | | | Fix `test_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct` to NULL-agnostic way
| * | | | | Fix ↵Ryuta Kamizono2015-12-193-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `test_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct` to NULL-agnostic way The sort order of NULL depends on the RDBS implementation. This commit is to fix the test to NULL-agnostic way. Example: ``` activerecord_unittest=# SELECT DISTINCT "posts"."id", author_addresses_authors.id AS alias_0 FROM "posts" LEFT OUTER JOIN "authors" ON "authors"."id" = "posts"."author_id" LEFT OUTER JOIN "author_addresses" ON "author_addresses"."id" = "authors"."author_address_id" LEFT OUTER JOIN "categorizations" ON "categorizations"."category_id" = "posts"."id" LEFT OUTER JOIN "authors" "authors_posts" ON "authors_posts"."id" = "categorizations"."author_id" LEFT OUTER JOIN "author_addresses" "author_addresses_authors" ON "author_addresses_authors"."id" = "authors_posts"."author_address_id" ORDER BY author_addresses_authors.id DESC; id | alias_0 ----+--------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 1 | 1 (12 rows) ``` ``` root@localhost [activerecord_unittest] > SELECT DISTINCT `posts`.`id`, author_addresses_authors.id AS alias_0 FROM `posts` LEFT OUTER JOIN `authors` ON `authors`.`id` = `posts`.`author_id` LEFT OUTER JOIN `author_addresses` ON `author_addresses`.`id` = `authors`.`author_address_id` LEFT OUTER JOIN `categorizations` ON `categorizations`.`category_id` = `posts`.`id` LEFT OUTER JOIN `authors` `authors_posts` ON `authors_posts`.`id` = `categorizations`.`author_id` LEFT OUTER JOIN `author_addresses` `author_addresses_authors` ON `author_addresses_authors`.`id` = `authors_posts`.`author_address_id` ORDER BY author_addresses_authors.id DESC; +----+---------+ | id | alias_0 | +----+---------+ | 1 | 1 | | 3 | NULL | | 1 | NULL | | 2 | NULL | | 4 | NULL | | 5 | NULL | | 6 | NULL | | 7 | NULL | | 8 | NULL | | 9 | NULL | | 10 | NULL | | 11 | NULL | +----+---------+ 12 rows in set (0.00 sec) ```
* | | | | | Merge pull request #22803 from kamipo/improve_select_one_in_mysql2_adapterRafael França2015-12-302-27/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve `select_one` in `Mysql2Adapter`
| * | | | | | Remove outdated commentRyuta Kamizono2015-12-271-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These `select_*` methods improved already.
| * | | | | | Improve `select_one` in `Mysql2Adapter`Ryuta Kamizono2015-12-272-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid instanciate `ActiveRecord::Result` and calling `ActiveRecord::Result#hash_rows` for the performance.
* | | | | | | Merge pull request #22547 from kamipo/fix_create_table_info_cacheRafael França2015-12-291-2/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Correctly cache create_table_info
| * | | | | | Correctly cache create_table_infoRyuta Kamizono2015-12-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #21664.
* | | | | | | Merge pull request #22053 from Empact/first-loadedYves Senn2015-12-283-16/+72
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix #first(limit) to take advantage of #loaded? records if available
| * | | | | | | Fix `first(limit)` to take advantage of `loaded?` records if availableBen Woosley2015-12-243-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I realized that `first(2)`, etc. was unnecessarily querying for the records when they were already preloaded. This was because `find_nth_with_limit` can not know which `@records` to return because it conflates the `offset` and `index` into a single variable, while the `@records` only needs the `index` itself to select the proper record. Because `find_nth` and `find_nth_with_limit` are public methods, I instead introduced a private method `find_nth_with_limit_and_offset` which is called internally and handles the `loaded?` checking. Once the `offset` argument is removed from `find_nth`, `find_nth_with_limit_and_offset` can be collapsed into `find_nth_with_limit`, with `offset` always equal to `offset_index`.
| * | | | | | | Deprecate passing `offset` to `find_nth`Ben Woosley2015-12-242-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All uses of the `offset` are passing `offset_index`. Better to push down the `offset` consideration into `find_nth`. This also works toward enabling `find_nth_with_limit` to take advantage of the `loaded?` state of the relation.
* | | | | | | | tests, don't connect to mysql when running sqlite3 tests.Yves Senn2015-12-281-0/+2
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves the following error: ``` Error: TestAdapterWithInvalidConnection#test_inspect_on_Model_class_does_not_raise: TypeError: superclass mismatch for class Mysql2Adapter /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:35:in `<module:ConnectionAdapters>' /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:34:in `<module:ActiveRecord>' /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:6:in `<top (required)>' /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:302:in `require' /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:302:in `block in require' /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:268:in `load_dependency' /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:302:in `require' /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/connection_specification.rb:174:in `spec' /Users/senny/Projects/rails/activerecord/lib/active_record/connection_handling.rb:50:in `establish_connection' /Users/senny/Projects/rails/activerecord/test/cases/invalid_connection_test.rb:12:in `setup' ```
* | | | | | | Fix varbinary with default ''Ryuta Kamizono2015-12-242-13/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A `(?:var)?binary` with default '' is a correct definition. Remove `missing_default_forged_as_empty_string?` method for fixing this issue because this method is a workaround for older mysql legacy adapter (19c99ac, f7015336).
* | | / / / Fixes LoggerSilence#silence threadsafetyCarl P. Corliss2015-12-231-0/+1
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - uses instance defined level if no custom local log level defined - Keeps track of local log level per [ thread + object-instance ] - prevents memory leakage by removing local level hash key/value on #silence method exit - avoids the use of Thread local variables
* | | | | release notes, extracted notable changes from Active Record CHANGELOG.Yves Senn2015-12-231-10/+13
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #22620 from kamipo/join_to_delete_is_same_as_join_to_updateRafael França2015-12-223-11/+5
|\ \ \ \ \ | | | | | | | | | | | | `join_to_delete` is same as `join_to_update`
| * | | | | `join_to_delete` is same as `join_to_update`Ryuta Kamizono2015-12-173-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reapply #22615.
* | | | | | Add support for passing flags to MySQL2 adapter by arrayStephen Blackstone2015-12-222-2/+14
| | | | | |
* | | | | | Revert "Merge pull request #22486 from ↵Yves Senn2015-12-213-26/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methyl/fix-includes-for-groupped-association" This reverts commit 537ac7d6ade61e95f2b70685ff2236b7de965bab, reversing changes made to 9c9c54abe08d86967efd3dcac1d65158a0ff74ea. Reason: The way we preload associations will change the meaning of GROUP BY operations. This is illustrated in the SQL generated by the added test (failing on PG): Association Load: D, [2015-12-21T12:26:07.169920 #26969] DEBUG -- : Post Load (0.7ms) SELECT "posts".* FROM "posts" LEFT JOIN comments ON comments.post_id = posts.id WHERE "posts"."author_id" = $1 GROUP BY posts.id ORDER BY SUM(comments.tags_count) [["author_id", 1]] Preload: D, [2015-12-21T12:26:07.128305 #26969] DEBUG -- : Post Load (1.3ms) SELECT "posts".* FROM "posts" LEFT JOIN comments ON comments.post_id = posts.id WHERE "posts"."author_id" IN (1, 2, 3) GROUP BY posts.id ORDER BY SUM(comments.tags_count)
* | | | | | No more no changes entries in the CHANGELOGsGenadi Samokovarov2015-12-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the `5.0.0.beta1` release, the CHANGELOGs got an entry like the following: ``` * No changes. ``` It is kinda confusing as there are indeed changes after it. Not a biggie, just a small pass over the CHANGELOGs. [ci skip]
* | | | | | Merge pull request #22486 from methyl/fix-includes-for-groupped-associationYves Senn2015-12-213-1/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass group values when including association Conflicts: activerecord/CHANGELOG.md
| * | | | | | Pass SQL group by values when including scoped associationLucjan Suski2015-12-153-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problem when added `group()` in association scope was lost in eager loaded association.