aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25675 from TimPetricola/schema-no-standardized-column-widthsRafael Mendonça França2016-08-194-11/+125
|\ | | | | | | Option not to line up column attributes in schema.rb
| * Merge branch 'master' into schema-no-standardized-column-widthsTim Petricola2016-08-184-117/+137
| |\
| * | Option not to line up column types and attributes in schema.rbTim Petricola2016-08-174-14/+128
| | |
* | | Add chengelog entry to #25976Rafael Mendonça França2016-08-191-0/+7
| | | | | | | | | | | | [Rafael Mendonça França + Robin Dupret]
* | | Merge pull request #26154 from ↵Rafael Mendonça França2016-08-196-84/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/remove_text_default_treated_as_empty_string Remove text default treated as an empty string in non-strict mode
| * | | Remove text default treated as an empty string in non-strict modeRyuta Kamizono2016-08-196-84/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strict mode controls how MySQL handles invalid or missing values in data-change statements such as INSERT or UPDATE. If strict mode is not in effect, MySQL inserts adjusted values for invalid or missing values and produces warnings. ```ruby def test_mysql_not_null_defaults_non_strict using_strict(false) do with_mysql_not_null_table do |klass| record = klass.new assert_nil record.non_null_integer assert_nil record.non_null_string assert_nil record.non_null_text assert_nil record.non_null_blob record.save! record.reload assert_equal 0, record.non_null_integer assert_equal "", record.non_null_string assert_equal "", record.non_null_text assert_equal "", record.non_null_blob end end end ``` It is inconsistent with other types that only text/blob defaults treated as an empty string. This commit fixes the inconsistency.
* | | | Merge pull request #26217 from kamipo/revert_23067Rafael França2016-08-191-1/+1
|\ \ \ \ | | | | | | | | | | Revert "`sql_for_insert` returns values for passing to `exec_insert`"
| * | | | Revert "`sql_for_insert` returns values for passing to `exec_insert`"Ryuta Kamizono2016-08-191-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts #23067. #23067 is for propagating `pk` value from `sql_for_insert` to `exec_insert` (avoiding extra query for pg adapter). Now `exec_insert` includes `sql_for_insert` since #26002 therefore this propagating is no longer needed.
* | | | Merge pull request #25989 from ↵Rafael França2016-08-192-11/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/remove_unnecessary_select_for_collection_proxy Remove unnecessary `select` method for `CollectionProxy`
| * | | | Remove unnecessary `select` method for `CollectionProxy`Ryuta Kamizono2016-08-182-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `CollectionProxy` inherits `Relation` and `Relation` includes `QueryMethods`. This method is completely duplicated. https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/relation/query_methods.rb#L271-L275
* | | | | Merge pull request #26216 from y-yagi/fixes_19880Rafael França2016-08-193-2/+16
|\ \ \ \ \ | | | | | | | | | | | | run `before_configuration` callbacks as soon as application constant inherits from Rails::Application
| * | | | | run `before_configuration` callbacks as soon as application constant ↵yuuji.yaginuma2016-08-193-2/+16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inherits from Rails::Application Until Rails 4.1, `before_configuration` run as soon as the application constant inherits from `Rails::Application`. However, in d25fe31c40928712b5e08fe0afb567c3bc88eddf, it has been modified to run at instantiation process. This modify to `before_configuration` is run at same timing as to Rails 4.1. Fixes #19880
* | | | | Merge pull request #26089 from travisoneill/sqlite_rollback_fixRafael Mendonça França2016-08-194-5/+31
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | Sqlite3 Migration Error Fixed (issue #26087)
| * | | | 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.