aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Added nil case handling to allow rollback migration in case oftravis.h.oneill@gmail.com2016-08-174-5/+31
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invalid column type /activerecord/lib/active_record/connection_adapters /abstract/schema_definitions.rb:306 type = type.to_sym Changed to the following to handle nil case: type = type.to_sym if type Added regression test for this case: /activerecord/test/cases/migration_test.rb:554 if current_adapter?(:SQLite3Adapter) def test_allows_sqlite3_rollback_on_invalid_column_type Person.connection.create_table :something, force: true do |t| t.column :number, :integer t.column :name, :string t.column :foo, :bar end assert Person.connection.column_exists?(:something, :foo) assert_nothing_raised { Person.connection.remove_column :something, :foo, :bar } assert !Person.connection.column_exists?(:something, :foo) assert Person.connection.column_exists?(:something, :name) assert Person.connection.column_exists?(:something, :number) ensure Person.connection.drop_table :something, if_exists: true end end
* | | | | | | | Merge pull request #24099 from k0kubun/preserve-readonlyRafael Mendonça França2016-08-185-4/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve readonly flag only for readonly association
| * | | | | | | | Preserve readonly flag only for readonly associationTakashi Kokubun2016-07-305-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #24093
* | | | | | | | | Merge pull request #26200 from kamipo/remove_unnecessary_ordinal_methodsRafael França2016-08-183-93/+84
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unnecessary ordinal methods for collection association
| * | | | | | | | | Remove unnecessary ordinal methods for collection associationRyuta Kamizono2016-08-183-93/+84
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `CollectionProxy` inherits `Relation` therefore we can use its own methods rather than delegating to collection association.
* | | | | | | | | Merge pull request #25999 from kamipo/remove_sanitize_conditionsRafael França2016-08-183-4/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove `sanitize_conditions` and use `sanitize_sql` instead of `sanitize_conditions`
| * | | | | | | | | Deprecate `sanitize_conditions`. Use `sanitize_sql` insteadRyuta Kamizono2016-08-183-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `sanitize_conditions` protected method is only used in one place.
* | | | | | | | | | Merge pull request #26197 from ↵Rafael França2016-08-182-9/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_unnecessary_test_sql_for_insert_with_returning_disabled Remove unnecessary `test_sql_for_insert_with_returning_disabled`
| * | | | | | | | | | Remove unnecessary `test_sql_for_insert_with_returning_disabled`Ryuta Kamizono2016-08-182-9/+2
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `sql_for_insert` is only called in `use_insert_returning?` is true since #26002.
* | | | | | | | | | Merge pull request #26214 from philnash/active-job-default-queueClaudio B2016-08-181-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Updates Active Job guide on default runner.
| * | | | | | | | | [ci skip] Updates ActiveJob guide on default runner.Phil Nash2016-08-181-3/+4
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | The immediate runner is no longer default, the async adapter is.
* | | | | | | | | Merge pull request #26193 from iancanderson/ia-document-i18n-required-messageJon Moss2016-08-171-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | i18n documentation for required belongs_to message
| * | | | | | | | i18n documentation for required belongs_to messageIan C. Anderson2016-08-171-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you don't explicitly provide `optional: true` to a `belongs_to` definition, rails adds a validation to ensure presence of the `belongs_to` validation. However, when the validation is added, it is added with a message key of `:required`, which was not documented in the "Translations for Active Record Models" section of the i18n guides. Here are the lines that add the `:required` message: https://github.com/rails/rails/blob/c3e3577f9d5058382504773bf0d32afa15cb131e/activerecord/lib/active_record/associations/builder/belongs_to.rb#L136-L138 This commit adds the "non-optional association" validation to the table, so rails users know how to override the message for this validation. The default message is "must exist".
* | | | | | | | Change method visibility to be privateRafael Mendonça França2016-08-171-57/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those methods are only using inside this module and by a private method so they all should be private.
* | | | | | | | Push :defaults extraction down one levelRafael Mendonça França2016-08-172-60/+78
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since e852daa6976cc6b6b28ad0c80a188c06e226df3c only the verb methods where extracting the defaults options. It was merged a fix for the `root` method in 31fbbb7faccba25b2e3b5e10b8fca1468579d629 but `match` was still broken since `:defaults` where not extracted. This was causing routes defined using `match` and having the `:defaults` keys to not be recognized. To fix this it was extracted a new private method with the actual content of `match` and the `:defaults` extracting was moved to `match`.
* | | | | | | Merge pull request #26192 from greenbigfrog/patch-2Jon Moss2016-08-171-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix #26187
| * | | | | | | Fix #26187Jonathan2016-08-171-0/+1
|/ / / / / / / | | | | | | | | | | | | | | As "discussed" in #26187 I added the route that magically disappeared again.
* | | | | | | Merge pull request #26188 from greenbigfrog/patch-2प्रथमेश Sonpatki2016-08-171-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix diffrent naming in getting_started.md
| * | | | | | Fix diffrent naming in getting_started.mdJonathan2016-08-171-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | I've noticed that once `<h1>Editing article</h1>` L1157 was the title and then later on it's `<h1>Edit article</h1>` L1358 which kind of makes more sense... [ci skip]
* | | | | | Merge pull request #25396 from ↵Rafael França2016-08-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_error_message_for_out_of_range_integer_value Fix error message for out of range byte size integer value for consistency
| * | | | | | Fix error message for out of range byte size integer value for consistencyRyuta Kamizono2016-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Related f27a932, #25391.
* | | | | | | Merge pull request #25628 from ysksn/optionsRafael Mendonça França2016-08-174-5/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove parameter "options = nil" for #clear
| * | | | | | | Update CHANGELOG.md for #25628 [ci skip]Yosuke Kabuto2016-07-024-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move new CHANGELOG entry top [ci skip] Remove parameter "options = nil" for #clear
* | | | | | | | Merge pull request #26186 from yasulab/fix-link-in-rails5-release-noteGuillermo Iguaran2016-08-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix link in Rails 5.0 Release Note
| * | | | | | | | Fix link in Rails 5.0 Release Note [ci skip]Yohei YASUKAWA2016-08-171-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #25976 from kamipo/pluck_uses_loaded_targetRafael França2016-08-173-2/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | `pluck` should use `records` (`load_target`) when `loaded?` is true
| * | | | | | | | `pluck` should use `records` (`load_target`) when `loaded?` is trueRyuta Kamizono2016-08-043-2/+20
| | | | | | | | |
* | | | | | | | | Fix indentationRafael Mendonça França2016-08-171-3/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #25987 from aquajach/masterRafael Mendonça França2016-08-172-1/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix does_not_support_reverse? to find sql functions with commas in nested brackets
| * | | | | | | | | check if order contains comma first in does_not_support_reverse?Jack Chen Songyong2016-07-291-1/+1
| | | | | | | | | |
| * | | | | | | | | have does_not_support_reverse? support sql functions with commas in nested ↵Jack2016-07-292-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | brackets
* | | | | | | | | | Merge pull request #26185 from y-yagi/refactor_commands_tasksRafael França2016-08-174-164/+132
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | refactor `CommandsTasks`
| * | | | | | | | | | refactor `CommandsTasks`yuuji.yaginuma2016-08-174-164/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract a common method of `Rails::CommandsTasks` and `Rails::Engine::CommandsTasks` to the module.
* | | | | | | | | | | Merge pull request #26002 from ↵Rafael França2016-08-173-8/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/sql_for_insert_should_be_called_inside_exec_insert `sql_for_insert` should be called inside `exec_insert`
| * | | | | | | | | | | `sql_for_insert` should be called inside `exec_insert`Ryuta Kamizono2016-08-063-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `exec_insert` cannot return last inserted id if `use_insert_returning?` is true. `sql_for_insert` should be called inside `exec_insert`.
* | | | | | | | | | | | Merge pull request #26009 from kamipo/fix_inconsistent_finder_methods_signatureRafael França2016-08-173-49/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent the signature of finder methods for collection association
| * | | | | | | | | | | | Fix inconsistent the signature of finder methods for collection associationRyuta Kamizono2016-08-163-49/+38
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `#second`, `#third`, etc finder methods was added in 03855e790de2224519f55382e3c32118be31eeff. But the signature of these methods is inconsistent with the original finder methods. And also the signature of `#first` and `#last` methods is different from the original. This commit fixes the inconsistency.
* | | | | | | | | | | | Merge pull request #25862 from ↵प्रथमेश Sonpatki2016-08-171-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/start-documenting-ac-testcase-again Start documenting ActionController::TestCase again
| * | | | | | | | | | | | Start documenting ActionController::TestCase againPrathamesh Sonpatki2016-08-171-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rails 5 changed interface for passing arguments to request methods to keyword args for AC::TestCase but also hid the documentation. - But existing AC::TestCase tests need the new documentation about keyword args. So resurrected documentation and added a note about not using this for new tests. - The guides and other documentation is already updated to use `ActionDispatch::IntegrationTest`. [Matthew Draper, Prathamesh Sonpatki]
* | | | | | | | | | | | | Merge pull request #26021 from ↵Rafael França2016-08-172-16/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/finder_bang_method_should_call_non_bang_method Finder bang method should call non bang method
| * | | | | | | | | | | | | Finder bang method should call non bang methodRyuta Kamizono2016-08-162-16/+56
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise CollectionProxy's bang methdos cannot respect dirty target.
* | | | | | | | | | | | | Merge pull request #26037 from monmonmon/masterRafael França2016-08-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the logger is not nil before using it
| * | | | | | | | | | | | | Check if the logger exists before trying to use itmonmon2016-08-031-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #26072 from kamipo/extract_case_sensitive_handlerRafael Mendonça França2016-08-176-51/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract `PredicateBuilder::CaseSensitiveHandler`
| * | | | | | | | | | | | | | Extract `PredicateBuilder::CaseSensitiveHandler`Ryuta Kamizono2016-08-166-51/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently uniqueness validator is coupled with building Arel ASTs. This commit extracts `PredicateBuilder::CaseSensitiveHandler` for decouple the building Arel ASTs.
* | | | | | | | | | | | | | | Merge pull request #26121 from MaxLap/fix_count_with_left_joinsRafael Mendonça França2016-08-164-16/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix count which would sometimes force a DISTINCT
| * | | | | | | | | | | | | | | Fix count which would sometimes force a DISTINCTMaxime Lapointe2016-08-164-16/+28
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current behaviour of checking if there is a LEFT OUTER JOIN arel node to detect if we are doing eager_loading is wrong. This problem wasn't frequent before as only some pretty specific cases would add a LEFT OUTER JOIN arel node. However, the recent new feature left_outer_joins also add this node and made this problem happen frequently. Since in the perform_calculation function, we don't have access to eager_loading information, I had to extract the logic for the distinct out to the calculate method. As I was in the file for left_outer_join tests, I fixed a few that had bugs and I replaced some that were really weak with something that will catch more issues. In relation tests, the first test I changed would have failed if it had validated the hash returned by count instead of just checking how many pairs were in it. This is because this merge of join currently transforms the join node into an outer join node, which then made count do a distinct. So before this change, the return was {1=>1, 4=>1, 5=>1}.
* | | | | | | | | | | | | | | Merge pull request #25671 from ↵Rafael França2016-08-165-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/dont_handle_as_associated_predicate_if_table_has_column Do not handle as an associated predicate if a table has the column
| * | | | | | | | | | | | | | | Do not handle as an associated predicate if a table has the columnRyuta Kamizono2016-08-165-5/+16
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If handled as an associated predicate even though a table has the column, will generate invalid SQL by valid column name treated as a table name.
* | | | | | | | | | | | | | | Merge pull request #26000 from kamipo/remove_sanitizeRafael França2016-08-162-13/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | Remove internal `sanitize` method