aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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`.
* | | | | | Schema dumping support for PostgreSQL oid typeRyuta Kamizono2017-02-128-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | Closes #27980
* | | | | | Schema dumping support for PostgreSQL interval typeRyuta Kamizono2017-02-128-21/+36
| | | | | | | | | | | | | | | | | | | | | | | | Closes #27979
* | | | | | Deprecate `supports_primary_key?`Ryuta Kamizono2017-02-126-28/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `supports_primary_key?` was added to determine if `primary_key` is implemented in the adapter in f060221. But we already use `primary_key` without `supports_primary_key?` (207f266, 5f3cf42) and using `supports_primary_key?` has been removed in #1318. This means that `supports_primary_key?` is no longer used in the internal and Active Record doesn't work without `primary_key` is implemented (all adapters must implement `primary_key`). Closes #27977
* | | | | | Remove unused requireRyuta Kamizono2017-02-128-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files are not using `strip_heredoc`. Closes #27976
* | | | | | Merge pull request #27982 from Edouard-chin/removes-extra-require-callRafael França2017-02-122-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removed the `attribute_accessors` required file:
| * | | | | | Also not needed on this file, call to `mattr_accessor` got removed in ↵Edouard CHIN2017-02-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/9e98f3f7e61dfce0a48948c8d296400af8bfaf21#diff-1ecd313ff0ab827af30014553cf8918dL76
| * | | | | | Removed the `attribute_accessors` required file:Edouard CHIN2017-02-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - This file is no more needed, the call to `cattr_reader` were removed in https://github.com/rails/rails/commit/9e2948e750fa3f641f20adad4b4ecae89b35faa7#diff-c5146df11f35304765e9ceebed108f57L60 and https://github.com/rails/rails/commit/1fe0a1b5ebebb1372968606b85ce08b93bc145c8#diff-c5146df11f35304765e9ceebed108f57L99
* | | | | | | Make `table_name=` reset current statement cachenamusyaka2017-02-123-0/+32
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So queries are not run against the previous table name. Closes #27953
* | | | | | Merge pull request #27973 from kenta-s/add-missing-test-for-time-blankAndrew White2017-02-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add Time#blank? to blank_test
| * | | | | | Add Time#blank? to blank_testkenta-s2017-02-121-1/+1
| | | | | | |
* | | | | | | Merge pull request #27974 from kamipo/add_new_rubocop_ruleXavier Noria2017-02-1212-11/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add `Style/EmptyLinesAroundMethodBody` in `.rubocop.yml` and remove extra empty lines
| * | | | | | | Add `Style/EmptyLinesAroundMethodBody` in `.rubocop.yml` and remove extra ↵Ryuta Kamizono2017-02-1212-11/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | empty lines
* | | | | | | document link processing in guides generation [ci skip]Xavier Noria2017-02-121-2/+42
| | | | | | |
* | | | | | | refactors and fixes in guides generation [ci skip]Xavier Noria2017-02-127-162/+124
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is not precisely atomic, but the changes have evolved, summary: * The ENV-based interface has been moved upwards, the generator has now a conventional initializer. * RAILS_VERSION is now assumed to be a Git tag. A blank RAILS_VERSION means edge guides. * In consequence, the EDGE env variable is gone. * The "local" version is also gone, the current SHA1 is computed for edge guides. * Assumes guides are generated from a repo checkout (time ago users could generate them from gems.) * The WARNINGS flag is gone in consequence, you cannot disable warnings. * The `api_link` Markdown helper is fixed. * Docs about usage have one single place: rake guides:help. * Links in guides have been revised.
* | | | | | Deprecate calling `attr_will_change!` with non-attributesSean Griffin2017-02-113-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was never really intended to work (at least not without calling `define_attribute_methods`, which is less common with Active Record). As we move forward the intention is to require the use of `attribute` over `attr_accessor` for more complex model behavior both on Active Record and Active Model, so this behavior is deprecated. Fixes #27956. Close #27963. [Alex Serban & Sean Griffin]
* | | | | | [ci skip] Fully qualify missing template error.Kasper Timm Hansen2017-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Switch extension 👉 format as it's more apt here.
* | | | | | Merge pull request #27870 from kenta-s/get-todo-done-in-render_testKasper Timm Hansen2017-02-112-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Get TODO done in `render_test`
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 16:18:32 +0000