aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Fix sqlite3 test failureRyuta Kamizono2016-06-042-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Sqlite3 test failure is due to 66ebbc4952f6cfb37d719f63036441ef98149418.
* | | / / / / Dont re-define class SQLite3Adapter on testArthur Neves2016-06-032-108/+98
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were declaring in a few tests, which depending of the order load will cause an error, as the super class could change. see https://github.com/rails/rails/commit/ac1c4e141b20c1067af2c2703db6e1b463b985da#commitcomment-17731383
* | | | | | Merge pull request #25263 from abhishekjain16/doc_accessor_threadEileen M. Uchitelle2016-06-031-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [skip ci] Fix grammar
| * | | | | [skip ci] Fix grammarAbhishek Jain2016-06-031-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-06-0314-52/+40
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Conflicts: guides/source/action_cable_overview.md
| * | | | Grammar fixes for Contributing guideJon Moss2016-06-021-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure why #25239, but it had good changes, so I'm manually pulling in the changes. [Jon Moss, Rajat Bansal] [ci skip]
| * | | | `will be` --> `is`Jon Moss2016-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Light edits to Action Cable Overview guideJon Moss2016-05-281-3/+3
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | `behaviour` --> `behavior`Jon Moss2016-05-272-2/+2
| | | | | | | | | | | | | | | | | | | | http://edgeguides.rubyonrails.org/api_documentation_guidelines.html#english
| * | | | - :scissors: space in code to match previous defaults.Vipul A M2016-05-231-3/+1
| | | | | | | | | | | | | | | | | | | | - Grammar edits.
| * | | | Update i18n guide about how to change locale and translations paths [ci skip]Prathamesh Sonpatki2016-05-221-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - config/application.rb no longer has comments about how to specify load paths or change default locale after https://github.com/rails/rails/commit/28dcadc0140dfdeb.
| * | | | Small grammar fixes for Action Controller OverviewJon Moss2016-05-211-5/+6
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | `routes.rb` --> `config/routes.rb`Jon Moss2016-05-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For consistency. [ci skip]
| * | | | Light grammar edits to beginning of Routing guideJon Moss2016-05-181-3/+3
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Add tick marks + small grammar changeJon Moss2016-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | PerRequestDigestCacheExpiry middlware was been removed. Removed traces, for ↵Vipul A M2016-05-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same. https://github.com/rails/rails/commit/23b6a9c0fcb8992e18450d6fe0680bf09685b7db [ci skip]
| * | | | Pass over API Apps guide grammar. [ci skip]Vipul A M2016-05-161-7/+5
| | | | |
| * | | | The `ActiveRecord::ConnectionAdapters::ConnectionManagement` and ↵Vipul A M2016-05-163-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::QueryCache` middlewares were removed with `Executor` addition on d3c9d808e3e242155a44fd2a89ef272cfade8fe8 Removes traces and reference of these from all places. [ci skip]
| * | | | Change output genereated for middlewares on a new application. This has ↵Vipul A M2016-05-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed quite a bit after Executor middleware addition. [ci skip]
| * | | | Add `ActiveRecord::Migration::CheckPending` to default middlewares for API AppsVipul A M2016-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #25243 from sukesan1984/add_i18n_validation_testYves Senn2016-06-031-4/+2
|\ \ \ \ \ | | | | | | | | | | | | Add i18n_validation_test
| * | | | | Add i18n_validation_testsukesan19842016-06-021-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | add active record uniqueness validation test for { on: [:create, :update] } condition.
* | | | | | Merge pull request #25258 from alexcameron89/masterArthur Nogueira Neves2016-06-021-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | [skip ci] Make header bullets consistent in engines.md
| * | | | | | [skip ci] Make header bullets consistent in engines.mdAlex Kitchens2016-06-021-3/+3
|/ / / / / /
* | | | | | Merge pull request #25254 from kamipo/fix_debug_helper_testSean Griffin2016-06-021-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix debug helper test
| * | | | | | Fix debug helper testRyuta Kamizono2016-06-031-1/+4
| | | | | | |
* | | | | | | Merge pull request #25240 from matthewd/reloadable-channelsMatthew Draper2016-06-0310-84/+56
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Properly support reloading for Action Cable channels
| * | | | | | | Properly support reloading for Action Cable channelsMatthew Draper2016-06-0210-84/+56
| | |/ / / / / | |/| | | | |
* | | | | | | Don't blank pad day of the month when formatting datesSean Griffin2016-06-023-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are currently using `%e` which adds a space before the result if the digit is a single number. This leads to strings like `February 2, 2016` which is undesireable. I've opted to replace with 0 padding instead of removing the padding entirely, to preserve compatibility for those relying on the fact that the width is constant, and to be consistent with time formatting. Fixes #25251.
* | | | | | | Ensure that records with unselected fields can be updatedSean Griffin2016-06-022-0/+17
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of refactoring mutation detection to be more performant, we introduced the concept of `original_value` to `Attribute`. This was not overridden in `Attribute::Uninitialized` however, so assigning ot an uninitialized value and calling `.changed?` would raise `NotImplementedError`. We are using a sentinel value rather than checking the result of `original_attribute.initialized?` in `changed?` because `original_value` might go through more than one node in the tree. Fixes #25228
* | | | | | Merge pull request #25252 from felguerez/masterVipul A M2016-06-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | add missing "as" to Engines doc page [ci skip]
| * | | | | | add missing "as"Antonio Felguerez2016-06-021-1/+1
|/ / / / / / | | | | | | | | | | | | it reads a bit awkwardly without it.
* / / / / / Fix failing testsSean Griffin2016-06-023-5/+17
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently CI is broken due to 56a61e0 and c4cb686. This occurred because the failures are not present on SQLite which is what I normally run locally before pushing. The optimizations to our YAML size were dropping mutations, as `with_type` didn't set the previous value if it'd already been read (that method was never really designed to be used with values on individual objects, it was previously only used for defaults). I'm questioning whether there's a better place to be handling the exclusion of the type, but this will fix the failing build. Additionally, there was a bug in `remove_foreign_key` if you passed it an options hash containing `to_table`. This now occurs whenever removing a reference, as we always normalize to a hash. [Sean Griffin & Ryuta Kamizono]
* | | | | Merge pull request #25236 from rajatbansal93/fix-typoArun Agrawal2016-06-011-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | fix typo [ci skip]
| * | | | fix typoRajat Bansal2016-06-011-5/+5
| | | | |
* | | | | Merge pull request #25231 from prathamesh-sonpatki/collapse-new-initializersDavid Heinemeier Hansson2016-06-0110-155/+59
|\ \ \ \ \ | | | | | | | | | | | | Collapse all new default initializers into a single file
| * | | | | Collapse all new default initializers into a single filePrathamesh Sonpatki2016-05-3110-155/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adjusted tests also for this new behavior. - Based on the discussion in https://github.com/rails/rails/pull/25184#issuecomment-222454583.
* | | | | | Clean up the test request/response even after an exceptionMatthew Draper2016-06-012-23/+50
| | | | | |
* | | | | | Make Active Record emit significantly smaller YAMLSean Griffin2016-05-318-7/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the size of a YAML encoded Active Record object by ~80% depending on the number of columns. There were a number of wasteful things that occurred when we encoded the objects before that have resulted in numerous wins - We were emitting the result of `attributes_before_type_cast` as a hack to work around some laziness issues - The name of an attribute was emitted multiple times, since the attribute objects were in a hash keyed by the name. We now store them in an array instead, and reconstruct the hash using the name - The types were included for every attribute. This would use backrefs if multiple objects were encoded, but really we don't need to include it at all unless it differs from the type at the class level. (The only time that will occur is if the field is the result of a custom select clause) - `original_attribute:` was included over and over and over again since the ivar is almost always `nil`. We've added a custom implementation of `encode_with` on the attribute objects to ensure we don't write the key when the field is `nil`. This isn't without a cost though. Since we're no longer including the types, an object can find itself in an invalid state if the type changes on the class after serialization. This is the same as 4.1 and earlier, but I think it's worth noting. I was worried that I'd introduce some new state bugs as a result of doing this, so I've added an additional test that asserts mutation not being lost as the result of YAML round tripping. Fixes #25145
* | | | | | Remove unused require and unused model stubJon Moss2016-05-312-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The `Project` model should have been removed in 468939297db91f8e595a93c94a16e23b26eee61a. - The superfluous require was added in 605c6455ac722ed9679e17458a47cc649cdedab0. Closes #25215 Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | | | Merge pull request #25170 from maclover7/add-configuration-cableJeremy Daer2016-05-318-51/+69
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | [Action Cable] Add `WebSocket` and `logger` configuration options
| * | | | | Add helper for testing against a mock WebSocket and serverJavan Makhmali2016-05-315-56/+48
| | | | | |
| * | | | | Reorganize `MockWebSocket`Jon Moss2016-05-312-22/+32
| | | | | |
| * | | | | Add configuration for `WebSocket` and `logger`Jon Moss2016-05-314-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | [Javan Makhmali, Jon Moss]
* | | | | | Respect options passed to `foreign_key` when reverting `add_reference`Sean Griffin2016-05-312-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code incorrectly assumes that the option was written as `foreign_key: true`, but that is not always the case. This now mirrors the behavior of reverting `add_foreign_key`. The code was changed to use kwargs while I was touching it, as well. This could really use a refactoring to go through the same code paths as `add_refernce` in the future, so we don't duplicate default values. Fixes #25169
* | | | | | Merge pull request #25216 from javan/actioncable/tune-sauce-labs-testsJeremy Daer2016-05-313-21/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Action Cable: Tune Sauce Labs tests
| * | | | | | Lock Faye version to avoid bug with its Promise polyfill, use mainline ↵Javan Makhmali2016-05-312-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | blade-sauce_labs_plugin gem
| * | | | | | Test single latest browser versionJavan Makhmali2016-05-311-6/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Cuts down the number of concurrent Sauce Labs VMs we need to spin up. Can add specific versions back in to target regressions if need be.
* | | | | | Merge pull request #25213 from kamipo/do_not_include_default_column_limitSean Griffin2016-05-313-10/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not include default column limit in schema.rb
| * | | | | | Do not include default column limit in schema.rbRyuta Kamizono2016-05-313-10/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of #20815. ```ruby class CreatePeople < ActiveRecord::Migration[5.0] def change create_table :people do |t| t.integer :int t.bigint :bint t.text :txt t.binary :bin end end end ``` Result. In postgresql and sqlite3 adapters: ```ruby ActiveRecord::Schema.define(version: 20160531141018) do create_table "people", force: :cascade do |t| t.integer "int" t.bigint "bint" t.text "txt" t.binary "bin" end end ``` In mysql2 adapter: ```ruby ActiveRecord::Schema.define(version: 20160531141018) do create_table "people", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t| t.integer "int" t.bigint "bint" t.text "txt", limit: 65535 t.binary "bin", limit: 65535 end end ``` After this patch: ```ruby ActiveRecord::Schema.define(version: 20160531141018) do create_table "people", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t| t.integer "int" t.bigint "bint" t.text "txt" t.binary "bin" end end ```