aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-0122-46/+96
|
* Merge pull request #23407 from jeremy/corrupt-before-commitJeremy Daer2016-02-012-2/+33
|\ | | | | Fix corrupt transaction state caused by `before_commit` exceptions
| * Fix corrupt transaction state caused by `before_commit` exceptionsJeremy Daer2016-02-012-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a `before_commit` callback raises, the database is rolled back but AR's record of the current transaction is not, leaving the connection in a perpetually broken state that affects all future users of the connection: subsequent requests, jobs, etc. They'll think a transaction is active when none is, so they won't BEGIN on their own. This manifests as missing `after_commit` callbacks and broken ROLLBACKs. This happens because `before_commit` callbacks fire before the current transaction is popped from the stack, but the exception-handling path they hit assumes that the current transaction was already popped. So the database ROLLBACK is issued, but the transaction stack is left intact. Common cause: deadlocked `#touch`, which is now implemented with `before_commit` callbacks. What's next: * We shouldn't allow active transaction state when checking in or out from the connection pool. Verify that conns are clean. * Closer review of txn manager sad paths. Are we missing other spots where we'd end up with incorrect txn state? What's the worst that can happen if txn state drifts? How can we guarantee it doesn't and contain the fallout if it does? Thanks for @tomafro for expert diagnosis!
* | Add spaces in the braces.Kasper Timm Hansen2016-02-011-1/+1
| | | | | | | | | | | | Solves personal insanity, since I was down in these files. (Please don't submit PRs like this.)
* | Converge on filter.Kasper Timm Hansen2016-02-011-5/+4
| | | | | | | | | | | | | | | | Some places were saying filter, while others said filter_options, spare the ambiguity and use filter throughout. This inlines a needless local variable and clarifies a route filter consists of defaults and values to match against.
* | Simplify filter normalization.Kasper Timm Hansen2016-02-011-5/+3
| | | | | | | | | | | | | | Assume the filter is a string, if it wasn't a hash and isn't nil. Remove needless else and rely on Ruby's default nil return. Add spaces within hash braces.
* | Merge pull request #23225 from vipulnsward/20420-rake-routes-optionsKasper Timm Hansen2016-02-017-30/+163
|\ \ | | | | | | Add options for rake routes task
| * | Add options for rake routes taskVipul A M2016-02-027-30/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two options: `-c` and `-g`. `-g` option returns the urls name, verb and path fields that match the pattern. `-c` option returns the urls for specific controller. Fixes #18902, and Fixes #20420 [Anton Davydov & Vipul A M]
* | | Revert "Merge pull request #16400 from bogdan/last-with-sql"Sean Griffin2016-02-013-60/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9f3730a516f30beb0050caea9539f8d6b808e58a, reversing changes made to 2637fb75d82e1c69333855abd58c2470994995d3. There are additional issues with this commit that need to be addressed before this change is ready (see #23377). This is a temporary revert in order for us to have more time to address the issues with that PR, without blocking the release of beta2.
* | | Merge pull request #23398 from matthewd/interlockMatthew Draper2016-02-024-23/+119
|\ \ \ | | | | | | | | Address remaining known issues in Interlock
| * | | After completing a load, give other threads a chance tooMatthew Draper2016-02-023-15/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we know no user code is running, we should do as much loading as we can. That way, all the threads will then be able to resume running user code together. Otherwise, only the last arriving thread would get to do its load, and would then return to userspace, leaving the others still blocked.
| * | | While new sharers are blocked, an existing sharer remains re-entrantMatthew Draper2016-02-022-1/+30
| | | |
| * | | Block new share attempts if there's an exclusive waiterMatthew Draper2016-02-022-8/+44
| | | |
| * | | Always obtain the lock and do the unloadMatthew Draper2016-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We mostly care about `reload_classes_only_on_change=true`, because that's the default... and there, we definitely need to wait for the lock when necessary.
* | | | Merge pull request #23406 from hackerkid/masterVipul A M2016-02-021-5/+5
|\ \ \ \ | | | | | | | | | | .git added to https repo urls
| * | | | .git added to https repo urlsVishnu Ks2016-02-021-5/+5
| | | | |
* | | | | Merge pull request #23151 from maclover7/fix-23148Rafael França2016-02-012-0/+11
|\ \ \ \ \ | | | | | | | | | | | | Add documentation for #17573
| * | | | | Add documentation for #17573Jon Moss2016-02-012-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes some parts of #23148. [ci skip]
* | | | | | Merge pull request #23402 from hackerkid/masterRichard Schneeman2016-02-011-5/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | git protocol replaced with https
| * | | | git protocol replaced with httpsVishnu Ks2016-02-021-5/+5
| | | | |
* | | | | Merge pull request #23025 from ↵Sean Griffin2016-02-016-14/+42
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | yahonda/shorten_internal_metadata_table_name_less_than_30_byte Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadata
| * | | | Rename `active_record_internal_metadatas` to `ar_internal_metadata`Yasuo Honda2016-02-012-0/+28
| | | | | | | | | | | | | | | | | | | | for those who already migrated to Rails 5.0.0 beta
| * | | | Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadataYasuo Honda2016-02-015-14/+14
| |/ / / | | | | | | | | | | | | to support Oracle database which only supports 30 byte identifier length
* | | | Merge pull request #23401 from claudiob/fix-as-changelog-mdClaudio B2016-02-011-29/+29
|\ \ \ \ | |_|_|/ |/| | | [ci skip] Properly indent code in markdown
| * | | [ci skip] Properly indent code in markdownclaudiob2016-02-011-29/+29
|/ / / | | | | | | | | | [ci skip]
* | | Merge pull request #23057 from schneems/schneems/default-puma-configRichard Schneeman2016-02-015-3/+64
|\ \ \ | | | | | | | | Add Default Puma Config
| * | | Add Default Puma Configschneems2016-01-295-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the `puma` command is run without any configuration options it will detect presence of a `config/puma.rb` file and use that. Currently there is discrepancy between `puma` command and `rails server` but Evan said it would be reasonable to add in reading in config from the default location. I am working on that right now as a feature in puma/puma. Why do we need this? By default Puma uses 16 threads, and by default ActiveRecord only has 5 threads. Due to the architecture of AR it is guaranteed that if you're running with fewer DB connections than your server has threads you will hit `ActiveRecord::ConnectionTimeoutError ` eventually if your app gets modest amounts of traffic. Since we are providing a default webserver, we should provide reasonable configuration for that webserver. This PR does a few things, first it sets the default Puma thread count to 5 to mach ActiveRecord's default. It sets the default environment to `"development"` and the default port to 300 so that booting the server with `$ puma` will give you the same default port as `rails server`. It is worth mentioning that by reading in from `PORT` environment variable this config can work with containerized deployments, such as on Heroku. We are not using worker processes by default, that way JRuby and windows devs can use this configuration without modification. I went ahead and included a default `on_worker_boot`. It won't be used unless a worker count is specified, that means this config will not use it. Even though it's not being used now It will make someone who wants to try modifying their config to run extra workers easier. cc/ @pixeltrix
* | | | Merge pull request #23385 from matthewd/default-subscription-adapterMatthew Draper2016-02-021-4/+2
|\ \ \ \ | |_|_|/ |/| | | Change default ACa adapter for development & test
| * | | Use the in-process subscription adapter for development & testMatthew Draper2016-02-011-4/+2
| | | |
* | | | Merge pull request #23381 from matthewd/uneventful-redisMatthew Draper2016-02-028-35/+212
|\ \ \ \ | |_|_|/ |/| | | Redis sans EventMachine
| * | | Switch the default redis adapter to a single-stream modelMatthew Draper2016-02-018-35/+212
| | | | | | | | | | | | | | | | | | | | | | | | This new adapter does get a little more intimate with the redis-rb gem's implementation than I would like, but it's the least bad of the approaches I've come up with.
* | | | Merge pull request #23375 from prathamesh-sonpatki/fix-19835Rafael França2016-02-012-13/+6
|\ \ \ \ | | | | | | | | | | Fix documentation related to `config.assets.cache_store` [ci skip]
| * | | | Fix documentation related to `config.assets.cache_store` [ci skip]Prathamesh Sonpatki2016-02-012-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - sprockets-rails no longer supports customizing cache store after rails/sprockets-rails@ecaeb27 using `config.assets.cache_store`. - Instead we need to configure it using block syntax. - Fixes #19835.
* | | | | tabenai (typo)Akira Matsuda2016-02-011-6/+6
| | | | |
* | | | | Merge pull request #23391 from erullmann/join_table_indexesRafael França2016-02-011-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Added references option to join tables
| * | | | | Added references option to join tablesErnst Rullmann2016-01-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue #22960 When creating join tables with the command rails g migration CreateJoinTableShowroomUser showroom:references user:references The migration will use references to create the joins and output: class CreateJoinTableShowroomUser < ActiveRecord::Migration def change create_join_table :showrooms, :users do |t| t.references :showroom, index: true, foreign_key: true t.references :user, index: true, foreign_key: true end end end This allows for proper refrences with indexes and foreign keys to be easily used when adding join tables. Without `:refrences` the normal output is generated: class CreateJoinTableShowroomUser < ActiveRecord::Migration[5.0] def change create_join_table :showrooms, :users do |t| # t.index [:showroom_id, :user_id] # t.index [:user_id, :showroom_id] end end end
* | | | | | Merge pull request #23168 from kamipo/avoid_extra_show_variables_in_migrationRafael França2016-02-015-21/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Avoid extra `show variables` in migration
| * | | | | Avoid extra `show variables` in migrationRyuta Kamizono2016-02-015-21/+15
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `initialize_schema_migrations_table` is called in every migrations. https://github.com/rails/rails/blob/v5.0.0.beta1/activerecord/lib/active_record/migration.rb#L1080 https://github.com/rails/rails/blob/v5.0.0.beta1/activerecord/lib/active_record/schema.rb#L51 This means that extra `show variables` is called regardless of the existence of `schema_migrations` table. This change is to avoid extra `show variables` if `schema_migrations` table exists.
* | | | | Merge pull request #23359 from kamipo/make_to_primary_keyRafael França2016-02-014-40/+5
|\ \ \ \ \ | | | | | | | | | | | | Make to primary key instead of an unique index for internal tables
| * | | | | Make to primary key instead of an unique index for internal tablesRyuta Kamizono2016-01-314-40/+5
| | | | | |
* | | | | | Remove development dependencies from actioncable.gemspecMatthew Draper2016-02-011-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | None of the other components use them, so we should be consistent.
* | | | | | Merge pull request #23373 from ↵Rafael França2016-02-013-17/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_duplicated_composite_primary_key_tests Remove duplicated composite primary key tests
| * | | | | | Remove duplicated composite primary key testsRyuta Kamizono2016-02-013-17/+1
| | | | | | |
* | | | | | | Merge pull request #23389 from kamipo/extract_explain_pretty_printerRafael França2016-02-017-119/+137
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Extract `ExplainPrettyPrinter` to appropriate files
| * | | | | | | Extract `ExplainPrettyPrinter` to appropriate filesRyuta Kamizono2016-02-017-119/+137
| |/ / / / / /
* / / / / / / Revert "Merge pull request #23366 from maclover7/add-configuation-ar-docs"Rafael Mendonça França2016-02-011-102/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 96355e87cba247246234386b0af9273cc5d59db9, reversing changes made to a00c36feea6c0271b5ad48a949ef294514fdef52. See https://github.com/rails/rails/pull/23366#issuecomment-177714429
* | | | | | Merge pull request #23372 from kamipo/use_index_in_create_in_test_schemaRafael França2016-02-012-11/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use `t.index` in `create_table` instead of `add_index` in test schema
| * | | | | | Use `t.index` in `create_table` instead of `add_index` in test schemaRyuta Kamizono2016-01-312-11/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | For reduce bootstrap queries in tests.
* | | | | | Merge pull request #23374 from prathamesh-sonpatki/migration-compatiblity-testsRafael França2016-01-311-0/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added test for backward compatibility of null constraints on timestamp columns
| * | | | | | Added test for backward compatibility of null constraints on timestamp columnsPrathamesh Sonpatki2016-01-311-0/+30
| |/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 11:48:41 +0000