aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Avoid disabling postgres errorsHarry Marr2015-10-281-4/+5
| | | | | | | | | | | | | | | | | | | | | | The standard_conforming_strings setting doesn't exist on all versions of Postgres, but if it does exist, Rails turns it on. Previously this was done by effectively disabling errors on the Postgres connection, issuing a SET to turn the setting on, then re-enabling errors on the connection. However, if you're running pgbouncer in transaction-pooling mode, you can't guarantee that successive calls to `#execute` will be sent to the same pgbouncer-postgres connection, so you can end up disabling errors on a different postgres connection, and never re-enabling them. Future queries on that connection that result in errors (e.g. violating unique constraints) will leave the connection in a bad state where successive queries will fail. This commit sets standard_conforming_strings by issuing an UPDATE to pg_settings, which will update the setting if it exists, and do nothing if it doesn't (rather than erroring out like SET would), which means we can remove the error-disabling code. It's also worth noting that Postgres has allowed standard_conforming_strings to be updated since 8.2 (which is the oldest version Rails supports), so technically we probably don't even need to be defensive here.
* Merge pull request #22096 from Gaurav2728/change_deprecated_msgRichard Schneeman2015-10-282-6/+6
|\ | | | | specify deprecated waring, follow the standard conventions
| * specify deprecated waring, follow the standard conventionsGaurav Sharma2015-10-282-6/+6
|/ | | | `skip_filter`, `skip_action_callback` may both are deprecated in Rails 5.1 so waring msg should be specific.
* Write the cookie jar it was not committed in TestCaseRafael Mendonça França2015-10-282-2/+2
| | | | | | | | | | | | | | | | | | | For ActionController::Base we write the cookies in a middleware if it was not yet committed no matter if the response was committed or not. [1] For ActionController::Live we write the cookies before the response is committed. [2] We already mimic ActionController::Live in ActionController::TestCase but we don't mimic the ActionController::Base behavior because we were checking if the response was committed before writing the cookies. Now we are matching the behavior of the middleware and writing the cookies if it was not written before. [1]: https://github.com/rails/rails/blob/80c6b901d4d87cee610ab0a438ff6e3c6bf118d1/actionpack/lib/action_dispatch/middleware/cookies.rb#L599-L604 [2]: https://github.com/rails/rails/blob/80c6b901d4d87cee610ab0a438ff6e3c6bf118d1/actionpack/lib/action_controller/metal/live.rb#L218-L223
* Remove dead codeRafael Mendonça França2015-10-281-5/+0
| | | | This is leftover from when `render nothing: true` rendered blank string.
* Merge pull request #22095 from ↵Rafael França2015-10-271-1/+1
|\ | | | | | | | | ajmyers01/fix_typo_in_eager_load_polymorphic_error Fix Typo in EagerLoadPolymorphicError [ci skip]
| * Fix Typo in EagerLoadPolymorphicError [ci skip]Alex Myers2015-10-271-1/+1
|/
* Merge pull request #18383 from ↵Rafael Mendonça França2015-10-273-1/+40
|\ | | | | | | | | | | scambra/habtm-with-where-includes-16032-for-master Includes HABTM returns correct size now
| * Includes HABTM returns correct size now. It's caused by the join dependencySergio Cambra2015-01-073-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only instantiates one HABTM object because the join table hasn't a primary key. Updated commit from @bigxiang commit dbaa837 Fixes #16032. Examples: before: Project.first.salaried_developers.size # => 3 Project.includes(:salaried_developers).first.salaried_developers.size # => 1 after: Project.first.salaried_developers.size # => 3 Project.includes(:salaried_developers).first.salaried_developers.size # => 3
* | Merge pull request #22093 from y-yagi/fix_typo_in_db_purgeRafael França2015-10-271-1/+1
|\ \ | | | | | | fix typo in `db:purge` description [ci skip]
| * | fix typo in `db:purge` description [ci skip]yuuji.yaginuma2015-10-281-1/+1
|/ /
* | Merge pull request #22087 from yui-knk/fix_ar_changelogKasper Timm Hansen2015-10-271-17/+14
|\ \ | | | | | | [ci skip] Aline code examples in AR changelog
| * | [ci skip] Aline code examples in AR changelogyui-knk2015-10-271-17/+14
| | |
* | | Merge pull request #22078 from arunagw/secret-key-as-an-integerSantiago Pastorino2015-10-272-0/+16
|\ \ \ | |/ / |/| | raise `ArgumentError` when `SECRET_KEY_BASE` is an integer
| * | raise `ArgumentError` when `SECRET_KEY_BASE` is an integerArun Agrawal2015-10-272-0/+16
|/ / | | | | | | | | | | | | If `SECRET_KEY_BASE` or other `secret` gets passed as other then string we need to raise `ArgumentError` to know that it's a wrong argument. Closes #22072
* | Remove skipped JRuby tests that are passing on 9.0.3.0.Guo Xiang Tan2015-10-273-6/+0
| |
* | Revert "Merge pull request #21994 from mtodd/inherit-scopes"Rafael Mendonça França2015-10-272-3/+3
| | | | | | | | | | | | | | This reverts commit 60c9701269f5b412849f1a507df61ba4735914d7, reversing changes made to 6a25202d9ea3b4a7c9f2d6154b97cf8ba58403db. Reason: Broken build
* | Merge pull request #21994 from mtodd/inherit-scopesArthur Neves2015-10-262-3/+3
|\ \ | | | | | | | | | Fix InheritanceTest#test_scope_inherited_properly implementation bugs
| * | Make inherited scope test failMatt Todd2015-10-262-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This triggers the JoinDependency work to reflect on the associations and trigger an error as follows: ActiveRecord::ConfigurationError: Association named 'account' was not found on Company; perhaps you misspelled it? Fix Company.of_first_firm joins association name Should be `Company.joins(:accounts)` not `Company.joins(:account)`. Do the same for Client.of_first_firm
* | [ci skip] Add doc for preloader_forschneems2015-10-261-0/+4
| |
* | [ci skip] Clarify doc for preloaders_for_oneschneems2015-10-261-0/+5
| |
* | [ci skip] Add doc to preloaders_onschneems2015-10-261-0/+1
| |
* | Merge pull request #19686 from tsun1215/index_errorsSean Griffin2015-10-268-4/+95
|\ \ | | | | | | | | | | | | | | | Errors can be indexed with nested attributes Close #8638
| * | Errors can be indexed with nested attributesMichael Probber2015-04-178-4/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `has_many` can now take `index_errors: true` as an option. When this is enabled, errors for nested models will be returned alongside an index, as opposed to just the nested model name. This option can also be enabled (or disabled) globally through `ActiveRecord::Base.index_nested_attribute_errors` E.X. ```ruby class Guitar < ActiveRecord::Base has_many :tuning_pegs accepts_nested_attributes_for :tuning_pegs end class TuningPeg < ActiveRecord::Base belongs_to :guitar validates_numericality_of :pitch end ``` - Old style - `guitar.errors["tuning_pegs.pitch"] = ["is not a number"]` - New style (if defined globally, or set in has_many_relationship) - `guitar.errors["tuning_pegs[1].pitch"] = ["is not a number"]` [Michael Probber, Terence Sun]
* | | Merge pull request #22080 from AnnaErshova/edits-config-code-textRafael França2015-10-261-2/+1
|\ \ \ | | | | | | | | Edits default `config/boot.rb` to match what's generated by Rails 4.2.
| * | | Edits default `config/boot.rb` to match what's generated by Rails 4.2.AnnaErshova2015-10-261-2/+1
|/ / /
* | | Merge pull request #19924 from iamvery/db-tasks-exit-statusSean Griffin2015-10-266-5/+67
|\ \ \ | | | | | | | | | | | | Explicitly exit with status "1" for create and drop failures
| * | | Update changelog with db rake task exit status fixJay Hayes2015-10-201-0/+4
| | | |
| * | | Exit with non-zero status when db:drop failsJay Hayes2015-10-202-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If the drop task fails for a reason other than the database not existing, processing should end. This is indicated by a non-zero exit status. * Since the backtrace is already printed to screen, we forgo printing it again by using an explicit call to `exit`. * :warning: This modifies the behavior of the db:create task slightly in that the stack trace is no longer printed by default. If the `--trace` option is used, it will print the trace _after_ the error message.
| * | | Exit with non-zero status when db:create failsJay Hayes2015-10-204-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If the create task fails for a reason other than the database already existing, processing should end. This is indicated by a non-zero exit status. * Since the backtrace is already printed to screen, we forgo printing it again by using an explicit call to `exit`. * :warning: This modifies the behavior of the db:create task slightly in that the stack trace is no longer printed by default. If the `--trace` option is used, it will print the trace _after_ the error message.
| * | | Fix test of drop failureJay Hayes2015-10-202-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Previously the sqlite3 adapter could not "fail" on drop. Now an error is raised when no file exists. * Also updates purge to be resilient of drop failures. This is how purge is expected to behave.
| * | | Add tests to verify exit status for create/drop failuresJay Hayes2015-10-201-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Running the db:create task when the database already exists isn't really an error case. That is processing may proceed in this case because the database exists as requested. So let's validate that behavior with a test. * Likewise, if the database doesn't exist when running the db:drop task processing may continue as the requested condition is already met. Thus a test.
* | | | [ci skip] Fix method documentation locationschneems2015-10-261-3/+2
| | | |
* | | | Merge pull request #22071 from yui-knk/redefine_method_keep_visibilitySean Griffin2015-10-262-1/+32
|\ \ \ \ | | | | | | | | | | Make `Module#redefine_method` to keep method visibility
| * | | | Make `Module#redefine_method` to keep method visibilityyui-knk2015-10-262-1/+32
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Before this commit `Module#redefine_method` always changes visibility of redefined method to `public`. This commit changes behavior of Module#redefine_method` to keep method visibility.
* | | | Merge pull request #22064 from kamipo/do_not_omit_parenthesesSean Griffin2015-10-253-13/+13
|\ \ \ \ | | | | | | | | | | Do not omit parentheses [ci skip]
| * | | | Do not omit parentheses [ci skip]Ryuta Kamizono2015-10-253-13/+13
| | | | |
* | | | | Merge pull request #22060 from sebmck/tweak-wordingClaudio B2015-10-255-16/+16
|\ \ \ \ \ | | | | | | | | | | | | Tweaked wording used in some tests.
| * | | | | Tweaked wording used in some tests.Sebastian McKenzie2015-10-255-16/+16
| | | | | |
* | | | | | Merge pull request #22062 from y-yagi/fix_rdoc_markupYves Senn2015-10-251-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | fix rdoc markup [ci skip]
| * | | | | fix rdoc markup [ci skip]yuuji.yaginuma2015-10-251-4/+4
|/ / / / /
* | | | | Merge pull request #22040 from arunagw/remove-jruby-travis-optsYves Senn2015-10-241-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove JRUBY_OPTS from .travis.yml file
| * | | | Remove JRUBY_OPTS from .travis.yml fileArun Agrawal2015-10-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we are not running tests for JRuby on travis this option is not needed. For more details check 0e8c04529159522aadbfe4fe71ea3d326df07d52
* | | | | Merge pull request #22054 from tgxworld/jruby_issue_fixedMatthew Draper2015-10-241-4/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove skip on tests that have been fixed.
| * | | | | Remove skip on tests that have been fixed.Guo Xiang Tan2015-10-241-4/+0
|/ / / / /
* | | | | Merge pull request #22033 from jmccartie/jm/uuid_nilRafael Mendonça França2015-10-238-19/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Guard clause for id_kind in generator
| * | | | | Stop aligning the argumentsRafael Mendonça França2015-10-231-4/+4
| | | | | |
| * | | | | Use thor class_option to make the primary_key_type option workRafael Mendonça França2015-10-236-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | Also move the method to the right class
| * | | | | Move default uuid generation to active_recordJon McCartie2015-10-235-11/+16
|/ / / / /
* | | | | Merge pull request #22052 from piton4eg/patch-10Arthur Nogueira Neves2015-10-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix punctuation [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 23:09:50 +0000