aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #13582 from schneems/schneems/preserve-connection-behaviorRafael Mendonça França2014-01-091-1/+118
|\ \ | | | | | | Ensure Active Record connection consistency
| * | Ensure Active Record connection consistencyschneems2014-01-091-1/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Active Record can be configured via the environment variable `DATABASE_URL` or by manually injecting a hash of values which is what Rails does, reading in `database.yml` and setting Active Record appropriately. Active Record expects to be able to use `DATABASE_URL` without the use of Rails, and we cannot rip out this functionality without deprecating. This presents a problem though when both config is set, and a `DATABASE_URL` is present. Currently the `DATABASE_URL` should "win" and none of the values in `database.yml` are used. This is somewhat unexpected to me if I were to set values such as `pool` in the `production:` group of `database.yml` they are ignored. There are many ways that active record initiates a connection today: - Stand Alone (without rails) - `rake db:<tasks>` - ActiveRecord.establish_connection - With Rails - `rake db:<tasks>` - `rails <server> | <console>` - `rails dbconsole` We should make all of these behave exactly the same way. The best way to do this is to put all of this logic in one place so it is guaranteed to be used. Here is my prosed matrix of how this behavior should work: ``` No database.yml No DATABASE_URL => Error ``` ``` database.yml present No DATABASE_URL => Use database.yml configuration ``` ``` No database.yml DATABASE_URL present => use DATABASE_URL configuration ``` ``` database.yml present DATABASE_URL present => Merged into `url` sub key. If both specify `url` sub key, the `database.yml` `url` sub key "wins". If other paramaters `adapter` or `database` are specified in YAML, they are discarded as the `url` sub key "wins". ``` ### Implementation Current implementation uses `ActiveRecord::Base.configurations` to resolve and merge all connection information before returning. This is achieved through a utility class: `ActiveRecord::ConnectionHandling::MergeAndResolveDefaultUrlConfig`. To understand the exact behavior of this class, it is best to review the behavior in activerecord/test/cases/connection_adapters/connection_handler_test.rb though it should match the above proposal.
* | | Merge pull request #13632 from tinogomes/masterRafael Mendonça França2014-01-091-0/+10
|\ \ \ | |/ / |/| | Adding Hash#compact and Hash#compact! methods
| * | Adding Hash#compact and Hash#compact! methodstinogomes2014-01-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding Hash#compact and Hash#compact! methods * Using Ruby 1.9 syntax on documentation * Updating guides for `Hash#compact` and `Hash#compact!` methods * Updating CHANGELOG for ActiveSupport * Removing unecessary protected method and lambda for `Hash#compact` implementations * Performing `Hash#compact` implementation - https://gist.github.com/tinogomes/8332883 * fixing order position * Fixing typo
* | | Fix typo [ci skip]Jake Worth2014-01-081-1/+1
|/ /
* | create/drop test and development databases only if RAILS_ENV is nilDamien Mathieu2014-01-081-0/+2
| | | | | | | | Closes #13625
* | update 4.1 release notes with deprecation commit link. [ci skip]Yves Senn2014-01-061-1/+2
| |
* | Ruby is a proper noun here, not part of code fragment [ci skip]Soon Van2014-01-051-3/+3
| | | | | | | | | | Last line of note also relates heavily to first part and parenthesis broke reading flow.
* | Allow an absolute controller path inside a module scopeAndrew White2014-01-051-0/+2
| | | | | | | | Fixes #12777
* | Change all "can not"s to the correct "cannot".T.J. Schuck2014-01-032-3/+3
| |
* | Deprecate unused `symbolized_base_class` and `symbolized_sti_name`.Yves Senn2014-01-031-0/+3
| | | | | | | | | | | | | | These methods were only used for the `IdentityMap` which was removed. They are no longer used internally and should be removed without replacement. As they were not `:nodoc:`'ed it's better to deprecate them before removal.
* | Automatically maintain test database schemaJon Leighton2014-01-025-25/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move check from generated helper to test_help.rb, so that all applications can benefit * Rather than just raising when the test schema has pending migrations, try to load in the schema and only raise if there are pending migrations afterwards * Opt out of the check by setting config.active_record.maintain_test_schema = false * Deprecate db:test:* tasks. The test helper is now fully responsible for maintaining the test schema, so we don't need rake tasks for this. This is also a speed improvement since we're no longer reloading the test database on every call to "rake test".
* | Removed elipsis indicating that the reader should have more code than what ↵Mo Omer2014-01-011-2/+0
| | | | | | | | | | | | is pasted. [ci skip]
* | Make explicit that the view file need to be created [ci skip]Rafael Mendonça França2014-01-011-1/+1
| | | | | | | | Closes #13566
* | Do not highlight rake routes output as ruby code [ci skip]Rafael Mendonça França2014-01-011-2/+2
| | | | | | | | Closes #13565
* | Merge pull request #13556 from yahonda/update_mysql_grantRafael Mendonça França2014-01-011-0/+2
|\ \ | | | | | | Update grant statement to address #13549
| * | Update grant statement to address #13549Yasuo Honda2014-01-011-0/+2
| | |
* | | [ci skip] Add missing flash message in block filter example.Juanito Fatas2014-01-011-2/+5
|/ / | | | | | | Also make all three examples consistent.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-311-10/+10
|\ \
| * | [ci skip] trailing documentation whitespaceschneems2013-12-191-10/+10
| | |
* | | Update explanation to match exampleSteven Nunez2013-12-301-1/+1
| | |
* | | Typo fix [ci skip]Ilja Krijger2013-12-281-3/+4
| | |
* | | doc fix. Use `sess.path` within `open_session`. Closes #13490. [ci skip]Yves Senn2013-12-271-1/+1
| |/ |/|
* | Fixed typo [CI skip]Semenyk Dmitriy2013-12-271-1/+1
| |
* | [ci skip] Update getting started Ruby version.Juanito Fatas2013-12-241-1/+1
| |
* | [ci skip] a destroy action in controller, not delete [getting_stated.md].Juanito Fatas2013-12-241-3/+3
| |
* | Merge pull request #13326 from schneems/schneems/add-asset-flagGuillermo Iguaran2013-12-191-0/+27
|\ \ | | | | | | Flag `config.assets.raise_runtime_errors` in dev
| * | Flag `config.assets.raise_runtime_errors` in devschneems2013-12-191-0/+27
| | | | | | | | | | | | | | | By default `config.assets.raise_runtime_errors` should be set to `true` in development for new apps. Source: https://github.com/rails/sprockets-rails/pull/100
* | | Merge pull request #13357 from taryneast/masterLauro Caetano2013-12-191-4/+4
|\ \ \ | | | | | | | | Describe precision + scale in migrations guide
| * | | [ci skip] Describe precision + scale in migrationsTaryn East2013-12-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Telling somebody that "precision sets the precision" is not very helpful. Newbies want to know what precision is *for*, likewise with scale. So I've added a very brief description for each.
* | | | Make possible to use symbol as the verifier nameRafael Mendonça França2013-12-191-1/+0
| | | |
* | | | revises the release notes about message verifiers (second take) [ci skip]Xavier Noria2013-12-191-8/+11
| | | |
* | | | Revert "revises the release notes about message verifiers [ci skip]"Xavier Noria2013-12-191-11/+8
| | | | | | | | | | | | | | | | This reverts commit 293a1a68992ba3e3e80f9f0f685e866ff79bf11a.
* | | | revises the release notes about message verifiers [ci skip]Xavier Noria2013-12-191-8/+11
| | | | | | | | | | | | | | | | Example code does not run yet with beta1.
* | | | Merge pull request #13408 from JuanitoFatas/remove-ttRafael Mendonça França2013-12-191-2/+2
|\ \ \ \ | |_|_|/ |/| | | Remove <tt> tag in 4_1_release notes. [ci skip].
| * | | Remove <tt> tag in 4_1_release notes. [ci skip].Juanito Fatas2013-12-201-2/+2
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-204-4/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Update contributing_to_ruby_on_rails.md"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 41ba51f4850a8cd2fe69789011ac33366366d32f. [ci skip]
| * | | Revert "Update security.md"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f4804fafecdc057988575b4516afe9ca1d5f42fc. [ci skip]
| * | | Revert "Fix on-site markdown rendering [ci skip]"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 427db6b9d2b35a72f3c017eb19a2e1e800b0a7a3. [ci skip]
| * | | Revert "Underscore in markdown should be escaped with backslash [ci skip]"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b58f3a641795e1777aa3e12a853c34ff512acfb9. Reason: Discussion in https://github.com/rails/docrails/commit/b58f3a641795e1777aa3e12a853c34ff512acfb9 [ci skip]
| * | | [ci skip] add `assets.raise_runtime_errors` flagschneems2013-12-141-2/+4
| | | | | | | | | | | | | | | | | | | | The flag will be used in multiple places to check for errors during runtime if enabled. Source: https://github.com/rails/sprockets-rails/pull/100
| * | | Remove an extra periodRobin Dupret2013-12-041-1/+1
| | | | | | | | | | | | | | | | As a side not, the period after etc is not always needed http://en.wiktionary.org/wiki/etc
| * | | Update contributing_to_ruby_on_rails.mdHarshad Sabne2013-12-011-1/+1
| | | | | | | | | | | | Escape hyphen
| * | | Update security.mdHarshad Sabne2013-11-301-1/+1
| | | | | | | | | | | | Add escape character for correct rendering
| * | | Remove Rdoc formatting from markdown [ci skip]Harshad Sabne2013-11-291-1/+1
| | | | | | | | | | | | Use markdown formatting instead
| * | | Fix on-site markdown rendering [ci skip]Harshad Sabne2013-11-281-1/+1
| | | |
| * | | Underscore in markdown should be escaped with backslash [ci skip]Harshad Sabne2013-11-261-1/+1
| | | | | | | | | | | | In the absence of proper escaping the first link was getting messed up and remaining part of the sentence (2nd link) was not displayed in the rendered markdown on the website though it was displaying correctly in the repository markdown file.
| * | | Globalize has moved to a new repositoryHarshad Sabne2013-11-251-1/+1
| | | | | | | | | | | | From (svenfuchs/globalize3) to (globalize/globalize)
* | | | couple of tweaks to the release notes [ci skip]Xavier Noria2013-12-191-2/+2
| | | |