aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #23961 from ↵Rafael França2016-03-013-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/exclude_name_and_type_from_prepare_column_options Exclude `:name` and `:type` from `prepare_column_options`
| * | | | | Exclude `:name` and `:type` from `prepare_column_options`Ryuta Kamizono2016-02-293-8/+8
| |/ / / / | | | | | | | | | | | | | | | Actually `:name` and `:type` are not column options.
* | | | | Merge pull request #23953 from ↵Rafael França2016-03-0112-136/+96
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_tests_failure_with_prepared_statements_false Fix tests failure with `prepared_statements: false`
| * | | | | Remove unnecessary namespaces in `explain_test.rb`Ryuta Kamizono2016-02-293-40/+28
| | | | | |
| * | | | | Fix tests failure with `prepared_statements: false`Ryuta Kamizono2016-02-2910-97/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests does not work for unprepared statements. Add `if ActiveRecord::Base.connection.prepared_statements` and fix a regex for fix tests failure with `prepared_statements: false`.
| * | | | | Fix `NoMethodError: undefined method `preparable'`Ryuta Kamizono2016-02-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error occurs with `prepared_statements: false`: ``` $ ARCONN=postgresql bundle exec ruby -w -Itest test/cases/associations_test.rb Using postgresql Run options: --seed 27753 ...E.................................... Finished in 0.713115s, 56.0919 runs/s, 91.1494 assertions/s. 1) Error: AssociationsTest#test_force_reload_is_uncached: NoMethodError: undefined method `preparable' for #<Arel::Visitors::PostgreSQL:0x007f8699702570> /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:68:in `block in select_all' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:83:in `cache_sql' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:68:in `select_all' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/querying.rb:39:in `find_by_sql' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:699:in `exec_queries' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/association_relation.rb:32:in `exec_queries' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:580:in `load' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:260:in `records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:256:in `to_a' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:458:in `get_records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:473:in `find_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:412:in `load_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_proxy.rb:45:in `load_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_proxy.rb:983:in `records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/delegation.rb:39:in `each' test/cases/associations_test.rb:116:in `block (2 levels) in test_force_reload_is_uncached' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:32:in `cache' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/query_cache.rb:9:in `cache' test/cases/associations_test.rb:115:in `block in test_force_reload_is_uncached' /Users/kamipo/src/github.com/rails/rails/activesupport/lib/active_support/deprecation/reporting.rb:36:in `silence' /Users/kamipo/src/github.com/rails/rails/activesupport/lib/active_support/deprecation/instance_delegator.rb:19:in `silence' test/cases/associations_test.rb:114:in `test_force_reload_is_uncached' ```
* | | | | | Merge pull request #23954 from kamipo/fix_undefined_method_fieldsRafael França2016-03-012-1/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix `NoMethodError: undefined method `fields' for nil:NilClass`
| * | | | | | Fix `NoMethodError: undefined method `fields' for nil:NilClass`Ryuta Kamizono2016-02-292-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `exec_query` raises `NoMethodError` when executing no result queries (`INSERT`, `UPDATE`, `DELETE`, and all DDL) in mysql2 adapter. ``` irb(main):002:0> conn.execute("create table t(a int)") (43.3ms) create table t(a int) => nil irb(main):003:0> conn.execute("insert into t values (1)") (19.3ms) insert into t values (1) => nil irb(main):004:0> conn.exec_query("insert into t values (1)") SQL (28.6ms) insert into t values (1) NoMethodError: undefined method `fields' for nil:NilClass ```
* | | | | | | Revert "Merge pull request #23927 from gaurish/jruby_ci_actionpack"Rafael Mendonça França2016-03-011-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ddb7be50e8a0946d29fbe66537f845b8369413b7, reversing changes made to ee4a1462e97f26bd480352468efab5b9c18aa8de. Reason: It is givin us a lot of timeouts in travis because JRuby 9.0.5.0 needs to be build in every run
* | | | | | | Merge pull request #23935 from y-yagi/convert_cable_coffee_to_javascriptRafael França2016-03-016-13/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | convert cable.coffee to cable.js
| * | | | | | | convert cable.coffee to cable.jsyuuji.yaginuma2016-02-286-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to eliminate the dependecy of CoffeeScript.
* | | | | | | | Merge pull request #23936 from yui-knk/local_constants_to_be_publicRafael Mendonça França2016-03-015-26/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate `Module.local_constants`
| * | | | | | | | Deprecate `Module.local_constants`yui-knk2016-03-015-26/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After Ruby 1.9, we can easily get the constants that have been defined locally by `Module.constants(false)`.
* | | | | | | | | Merge pull request #23417 from sgringwe/masterRafael Mendonça França2016-03-015-9/+81
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to error on ignored order or limit
| * | | | | | | | | Add initial support for allowing an error on order or limit of queries being ↵Scott Ringwelski2016-02-025-9/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignored in batches add some documentation and add 4 tests regarding error vs. warning behavior fix a typo when referring to the message go back to default in tests so that ordering is not important. use a constant instead of method. fix assert_nothing_raised call. use self.klass to allow per class configuration remove logger warn assets as that is tested elsewhere. pass error_on_ignore through find_each and find_in_batches also. add blocks to the finds so that the code is actually executed put the setting back to default in an ensure Add a changelog entry
* | | | | | | | | | Merge pull request #23980 from rails/deprecate-controller-action-segmentsAndrew White2016-03-0132-213/+478
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Deprecate :controller and :action path parameters
| * | | | | | | | | | Deprecate :controller and :action path parametersAndrew White2016-03-0132-213/+478
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allowing :controller and :action values to be specified via the path in config/routes.rb has been an underlying cause of a number of issues in Rails that have resulted in security releases. In light of this it's better that controllers and actions are explicitly whitelisted rather than trying to blacklist or sanitize 'bad' values.
* | | | | | | | | | | Merge pull request #23981 from y-yagi/do_not_set_action_cable_configRafael França2016-03-011-4/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | do not set Action Cable's config when specify `--skip-action-cable` option
| * | | | | | | | | | | do not set Action Cable's config when specify `--skip-action-cable` optionyuuji.yaginuma2016-03-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove duplicated `config.action_cable.url` config.
* | | | | | | | | | | | Merge pull request #23986 from rubys/dedup-ctrlc-msgEileen M. Uchitelle2016-03-011-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | Delete CTRL-C message as is duplicates Puma
| * | | | | | | | | | | Delete CTRL-C message as is duplicates PumaSam Ruby2016-03-011-2/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #23807 from matthewd/executorMatthew Draper2016-03-0247-337/+897
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Publish AS::Executor and AS::Reloader APIs
| * | | | | | | | | | | Don't reference Rails.application from inside a componentMatthew Draper2016-03-022-10/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Use AS::Reloader to support reloading in ActiveJobMatthew Draper2016-03-024-2/+23
| | | | | | | | | | | |
| * | | | | | | | | | | Use AS::Executor / AS::Reloader to support reloading in ActionCableMatthew Draper2016-03-029-30/+96
| | | | | | | | | | | |
| * | | | | | | | | | | Publish AS::Executor and AS::Reloader APIsMatthew Draper2016-03-0233-307/+782
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These should allow external code to run blocks of user code to do "work", at a similar unit size to a web request, without needing to get intimate with ActionDipatch.
* | | | | | | | | | | | Merge pull request #23598 from brchristian/activerecord_second_to_lastMatthew Draper2016-03-022-4/+83
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord #second_to_last tests and finder methods
| * | | | | | | | | | | | default second_to_last to primary_key index if no order suppliedBrian Christian2016-02-271-1/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | refactor AR second_to_last to use array methodsBrian Christian2016-02-271-1/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | comment out failing .second and .third testsBrian Christian2016-02-271-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | adding additional tests for offset and limit behaviorBrian Christian2016-02-271-0/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | additional test assertions (limit and offset)Brian Christian2016-02-271-0/+16
| | | | | | | | | | | | |
| * | | | | | | | | | | | AR #second_to_last tests and finder methodsBrian Christian2016-02-272-4/+48
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #22170 from ↵Matthew Draper2016-03-024-14/+135
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | samphilipd/sam/properly_deallocate_prepared_statements_outside_of_transaction Correctly deallocate prepared statements if we fail inside a transaction
| * | | | | | | | | | | Make tests a bit more beautifulSam Davies2015-11-051-10/+13
| | | | | | | | | | | |
| * | | | | | | | | | | Correctly deallocate prepared statements if we fail inside a transactionSam Davies2015-11-054-14/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Addresses issue #12330 Overview ======== Cached postgres prepared statements become invalidated if the schema changes in a way that it affects the returned result. Examples: - adding or removing a column then doing a 'SELECT *' - removing the foo column then doing a 'SELECT bar.foo' In normal operation this isn't a problem, we can rescue the error, deallocate the prepared statement and re-issue the command. However in PostgreSQL transactions, once any command fails, the transaction becomes 'poisoned' and any subsequent commands will raise InFailedSQLTransaction. This includes DEALLOCATE statements, so the default deallocation strategy instead of removing the cached prepared statement instead raises InFailedSQLTransaction. Why this is bad =============== 1. InFailedSQLTransaction is a fairly cryptic error and doesn't communicate any useful information about what has actually gone wrong. 2. In the naive implementation the prepared statement never gets deallocated - it stays alive for the length of the session taking up memory on the postgres server. 3. It is unsafe to retry the transaction because the bad prepared statement is still in the cache and we would see the exact same failure repeated. Solution ======== If we are outside a transaction we can continue to handle these failures gracefully in the usual way. Inside a transaction instead of issuing a DEALLOCATE command that will certainly fail, we now raise ActiveRecord::PreparedStatementCacheExpired. This can be handled further up the stack, notably inside TransactionManager#within_new_transaction. Here we can make sure to first rollback the transaction, then safely issue DEALLOCATE statements to invalidate the rest of the cached prepared statements. This also allows the user (or some gem) the opportunity to catch this error and voluntarily retry the transaction if a schema change causes the prepared statement cache to become invalidated. Because the outdated statement has been deallocated, we can expect the transaction to succeed on the second try.
* | | | | | | | | | | | Mock fork twiceRafael Mendonça França2016-03-011-1/+1
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Support `:any` variants lookup in `PathResolver`Godfrey Chan2016-03-012-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `OptimizedFileSystemResolver` (which most Rails apps use), but did not implement the feature on the more generic `PathResolver`, which is often used in tests etc. Fixes #23881
* | | | | | | | | | | Merge pull request #23966 from ↵Jeremy Daer2016-03-018-133/+110
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jeremy/activejob/pare-down-async-adapter-for-low-footprint-dev Active Job: pare down async adapter for low footprint dev
| * | | | | | | | | | | Active Job: smaller footprint for the dev/test async adapterJeremy Daer2016-02-298-133/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use one shared worker pool for all queues with 0-#CPU workers rather than separate pools per queue with 2-10*#CPU workers each.
* | | | | | | | | | | | Merge pull request #23973 from mohitnatoo/dummy-template-with-rails-commandRafael França2016-02-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Updating the dummy app template to have rails_command instead of rake
| * | | | | | | | | | | | - Updating the dummy app template to have rails_command instead of rakeMohit Natoo2016-03-011-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #23968 from bouk/improve-cable-docsRafael França2016-02-291-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | Remove inconsistency in the Action Cable README
| * | | | | | | | | | | | Remove inconsistency in the Action Cable README [ci skip]Bouke van der Bijl2016-02-291-6/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | / generate config/spring.rb in new applications [closes #18874]Xavier Noria2016-02-294-0/+14
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Respect through association scopes when used with polymorphicSean Griffin2016-02-292-1/+8
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the `source_type` option is passed to a has_many through, the resulting `Reflection` will be an instance of `PolymorphicReflection` and not `ThroughReflection`, meaning that it will ignore the scopes that it needs to apply from the through reflections. This adds an additional delegation call to remedy this. I've been finding the reflection code completely impenetrable lately, it could use some major love. Fixes #22726
* | | | | | | | | | Merge pull request #23927 from gaurish/jruby_ci_actionpackRafael França2016-02-291-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Run CI for ActionPack on JRuby
| * | | | | | | | | | Try running CI for ActionPack on JRubyGaurish Sharma2016-02-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are green on local. Checking to see they pass on travis too!
* | | | | | | | | | | Merge pull request #23948 from ctm/remove_pathological_regexpRafael França2016-02-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber…
| * | | | | | | | | | | Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber#sql_colorClifford T. Matthews2016-02-231-1/+1
| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 17:01:21 +0000