aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clear active connections after initializationEugene Kenny2017-02-172-0/+16
| | | | | | | | | | | | | Any connections that were checked out during initialization should be checked back in before the first request is processed, for two reasons: - Returning the connection to the pool allows it to be health checked before it's used again. If the connection dies before the first request arrives, the health check will replace it with a new one. - If the thread that initialized Rails is not the same thread that will be performing work, checking in the connection will allow it to be reused instead of being stuck to the initialization thread forever.
* Merge pull request #28049 from notapatch/masterJon Moss2017-02-171-1/+1
|\ | | | | Change engines guide to demonstrate maintained forum
| * Change engines guide to demonstrate maintained forumRichard2017-02-171-1/+1
| | | | | | | | | | | | | | Change Rails engine guide to references a maintained project Thredded instead of the abandoned project Forem. I chose Thredded as Forem's closing note (below) suggests the choice. https://github.com/rubysherpas/forem/blob/rails4/README.md
* | Merge pull request #28053 from kamipo/remove_docAkira Matsuda2017-02-181-5/+5
|\ \ | |/ |/| Remove `:doc:` for `NumericalityValidator` [ci skip]
| * Remove `:doc:` for `NumericalityValidator` [ci skip]Ryuta Kamizono2017-02-171-5/+5
|/ | | | | | | The `:doc:` was added in cdb9d7f but `NumericalityValidator` is already `:nodoc:` class. `:doc:` is unneeded. https://github.com/rails/rails/blob/master/activemodel/lib/active_model/validations/numericality.rb#L3
* Merge pull request #28047 from Erol/fix-i18n-documentation-typoYves Senn2017-02-171-1/+1
|\ | | | | Fix typo in I18n Guide [ci skip]
| * Fix typo in I18n Guide [ci skip]Erol Fornoles2017-02-171-1/+1
|/
* Merge pull request #28040 from kenta-s/fix-doc-in-multibyte-charsJon Moss2017-02-161-4/+5
|\ | | | | Fix doc in Multibyte::Chars [ci skip]
| * Fix doc in Multibyte::Chars [ci skip]kenta-s2017-02-171-4/+5
|/
* Merge pull request #28026 from Sen-Zhang/fix_some_typos_in_commentsJon Moss2017-02-1511-11/+11
|\ | | | | Change ActiveModel::Validation to ActiveModel::Validations in comments
| * change ActiveModel::Validation to ActiveModel::Validations in commentsSen Zhang2017-02-1511-11/+11
|/
* Merge pull request #28016 from kenta-s/fix-docs-of-deprecated_method_warningJon Moss2017-02-151-3/+3
|\ | | | | Remove redundant namespaces from sample code of `deprecated_method_wa…
| * Remove redundant namespaces from sample code of `deprecated_method_warning` ↵kenta-s2017-02-151-3/+3
| | | | | | | | [ci skip]
* | Merge pull request #27993 from koic/fix_test_ar_value_too_long_using_oracleEileen M. Uchitelle2017-02-151-2/+2
|\ \ | | | | | | Fix a tests of AR::ValueTooLong when using OracleAdapter
| * | Fix a tests of AR::ValueTooLong when using OracleAdapterKoichi ITO2017-02-141-2/+2
| | |
* | | Merge pull request #28018 from frewsxcv/patch-1Eileen M. Uchitelle2017-02-151-1/+1
|\ \ \ | |_|/ |/| | Indicate units of 'limit' in 'Integer' error message.
| * | Indicate units of 'limit' in 'Integer' error message.Corey Farwell2017-02-151-1/+1
|/ /
* | Merge pull request #27605 from ↵Godfrey Chan2017-02-143-3/+27
|\ \ | | | | | | | | | | | | mtsmfm/fix-generator-command-for-nested-rails-engine-take-2 Fix generator command for nested (namespaced) rails engine (take 2)
| * | Fix generator command for nested (namespaced) rails engine (take 2)Fumiaki MATSUSHIMA2017-01-073-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite https://github.com/rails/rails/pull/27550 085546df45 was reverted (b6ffb5efcb) because it change the return of `namespaced_path` from String to Array. ---------------- If we create nested (namespaced) rails engine such like bukkits-admin, `bin/rails g scaffold User name:string age:integer` will create `bukkits-admin/app/controllers/bukkits/users_controller.rb` but it should create `bukkits-admin/app/controllers/bukkits/admin/users_controller.rb`. In #6643, we changed `namespaced_path` as root path because we supposed application_controller is always in root but nested rails engine's application_controller will not.
* | | Merge pull request #28000 from kamipo/remove_unused_ddl_helperRafael França2017-02-141-2/+0
|\ \ \ | | | | | | | | Remove unused DdlHelper in ForeignKeyTest
| * | | Remove unused DdlHelper in ForeignKeyTestRyuta Kamizono2017-02-141-2/+0
|/ / /
* | | Merge pull request #27999 from yahonda/space_shuttlesMatthew Draper2017-02-151-11/+14
|\ \ \ | | | | | | | | Use ActiveRecord `bigint` type, not SQL literal bigint
| * | | Use ActiveRecord `bigint` type, not SQL literal bigintYasuo Honda2017-02-141-11/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | Oracle database itself does not have `bigint` SQL type, then it gets `ORA-00902: invalid datatype`. It can be addressed by using ActiveRecord `bigint` type because Oracle enhanced adapter recognizes ActiveRecord `bigint` type and transfer it to its equivalent SQL type `NUMBER(19)`.
* | | Merge pull request #27997 from kamipo/should_keep_pk_column_orderEileen M. Uchitelle2017-02-141-0/+1
|\ \ \ | | | | | | | | Should keep the primary key column order
| * | | Should keep the primary key column orderRyuta Kamizono2017-02-141-0/+1
|/ / / | | | | | | | | | | | | | | | Fixes CI failure caused by #27961. https://travis-ci.org/rails/rails/jobs/201472146#L2390-L2409
* | | Merge pull request #27996 from ream88/patch-1Vipul A M2017-02-141-1/+1
|\ \ \ | | | | | | | | Not ants were harmed! 🐜 [ci skip]
| * | | Not ants were harmed! 🐜Mario Uher2017-02-141-1/+1
|/ / /
* | | Merge pull request #27961 from jordanlewis/simplify-postgres-primary-keys-v2Sean Griffin2017-02-143-24/+10
|\ \ \ | | | | | | | | Simplify and optimize Postgres query for primary_keys()
| * | | Simplify and optimize Postgres query for primary_keys()Jordan Lewis2017-02-133-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | primary_keys(table) needs to query various metadata tables in Postgres to determine the primary key for the table. Previously, it did so using a complex common table expression against pg_constraint and pg_attribute. This patch simplifies the query by using information_schema tables. This simplifies the logic, making the query far easier to understand, and additionally avoids an expensive unnest, window function query, and common table expression.
* | | | Merge pull request #27991 from ↵Rafael França2017-02-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kenta-s/fix-return-value-of-deprecate_methods-in-doc Fix the return of `deprecate_methods` in doc [ci skip]
| * | | | Fix the return of `deprecate_methods` in doc [ci skip]kenta-s2017-02-141-1/+1
|/ / / /
* | | | Merge pull request #27926 from st0012/freeze-cache-instrument-nameRafael França2017-02-133-3/+3
|\ \ \ \ | | | | | | | | | | Freeze fragment cache related instrument name.
| * | | | Freeze fragment cache related instrument name.Stan Lo2017-02-073-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionMailer::Base#instrument_name and ActionController::Base#instrument_name will be frequently called once caching is enabled. So it's better to freeze them instead of create new string on every call. Also, the instrument name in #instrument_fragment_cache will usually be "write_fragment.action_controller" or "read_fragment.action_controller". So freezing them might also gain some performance improvement. We have done something like this in other places: https://github.com/rails/rails/blob/master/actionview/lib/action_view/template.rb#L348
* | | | | Merge pull request #27986 from kamipo/add_default_index_typeRafael França2017-02-134-1/+13
|\ \ \ \ \ | |_|/ / / |/| | | | Add `default_index_type?` to the generic schema dumper doesn't have the knowledge about an index type
| * | | | Add `default_index_type?` to the generic schema dumper doesn't have the ↵Ryuta Kamizono2017-02-144-1/+13
| | | | | | | | | | | | | | | | | | | | knowledge about an index type
* | | | | Fix rubocop violationsRafael Mendonça França2017-02-131-3/+3
|/ / / /
* | | | Merge pull request #26655 from kamipo/fix_remove_expression_indexRafael França2017-02-132-14/+21
|\ \ \ \ | | | | | | | | | | Fix `remove_index` to be able to remove expression indexes
| * | | | Fix `remove_index` to be able to remove expression indexesRyuta Kamizono2016-12-252-14/+21
| | | | | | | | | | | | | | | | | | | | Fixes #26635, #26641.
* | | | | Merge pull request #27981 from kamipo/omit_redundant_using_btreeRafael França2017-02-135-17/+17
|\ \ \ \ \ | | | | | | | | | | | | Omit redundant `using: :btree` for schema dumping
| * | | | | Omit redundant `using: :btree` for schema dumpingRyuta Kamizono2017-02-135-17/+17
|/ / / / /
* | | | | Merge pull request #27984 from kenta-s/remove-unused-variableRafael França2017-02-131-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | Refactor `test_find_by_does_not_use_statement_cache_if_table_name_is_changed`
| * | | | Refactor `test_find_by_does_not_use_statement_cache_if_table_name_is_changed`kenta-s2017-02-131-2/+2
|/ / / /
* | | | Merge pull request #27122 from kamipo/fix_unscope_with_subqueryRafael França2017-02-132-14/+38
|\ \ \ \ | | | | | | | | | | Fix unscope with subquery
| * | | | Refactor `except_predicates_and_binds` to avoid `tap`Ryuta Kamizono2017-02-131-12/+15
| | | | |
| * | | | Fix unscope with subqueryRyuta Kamizono2016-12-052-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently cannot unscope subquery properly. This commit fixes the issue. Fixes #26323.
* | | | | Merge pull request #26930 from kamipo/index_name_exists_defaultRafael França2017-02-136-27/+37
|\ \ \ \ \ | | | | | | | | | | | | The `default` arg of `index_name_exists?` makes to optional
| * | | | | Deprecate passing `default` to `index_name_exists?`Ryuta Kamizono2017-02-134-5/+21
| | | | | |
| * | | | | The `default` arg of `index_name_exists?` makes to optionalRyuta Kamizono2017-02-135-24/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `default` arg of `index_name_exists?` is only used the adapter does not implemented `indexes`. But currently all adapters implemented `indexes` (See #26688). Therefore the `default` arg is never used.
* | | | | | Merge pull request #26630 from kamipo/quoted_binaryRafael França2017-02-134-20/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Extract `quoted_binary` and use it rather than override `_quote`
| * | | | | Extract `quoted_binary` and use it rather than override `_quote`Ryuta Kamizono2016-09-274-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each databases have different binary representation. Therefore all adapters overrides `_quote` for quoting binary. Extract `quoted_binary` for quoting binary and use it rather than override `_quote`.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 22:41:53 +0000