aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2016-01-10 13:10:18 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2016-01-10 13:10:18 -0300
commit527cd8dfcd72b184e6289a68585f0aab206e9a5c (patch)
tree53e2e7e9ad54a3620c035c6c032c7959101df772 /guides
parent4973704bf56dbb0d8beba977e1053d57e346ebd0 (diff)
parent8c629bf463b47643712570d4511a68b9a3da1476 (diff)
downloadrails-527cd8dfcd72b184e6289a68585f0aab206e9a5c.tar.gz
rails-527cd8dfcd72b184e6289a68585f0aab206e9a5c.tar.bz2
rails-527cd8dfcd72b184e6289a68585f0aab206e9a5c.zip
Merge pull request #22983 from bronson/update-mysql-in-guides
remove mentions of legacy mysql adapter from guides
Diffstat (limited to 'guides')
-rw-r--r--guides/source/contributing_to_ruby_on_rails.md1
-rw-r--r--guides/source/development_dependencies_install.md2
2 files changed, 1 insertions, 2 deletions
diff --git a/guides/source/contributing_to_ruby_on_rails.md b/guides/source/contributing_to_ruby_on_rails.md
index ed88ecf6ac..cbc304c87f 100644
--- a/guides/source/contributing_to_ruby_on_rails.md
+++ b/guides/source/contributing_to_ruby_on_rails.md
@@ -357,7 +357,6 @@ $ bundle exec rake test:sqlite3
You can now run the tests as you did for `sqlite3`. The tasks are respectively:
```bash
-test:mysql
test:mysql2
test:postgresql
```
diff --git a/guides/source/development_dependencies_install.md b/guides/source/development_dependencies_install.md
index 4322f03d05..7beb8f72a9 100644
--- a/guides/source/development_dependencies_install.md
+++ b/guides/source/development_dependencies_install.md
@@ -165,7 +165,7 @@ $ bundle exec ruby -Itest path/to/test.rb -n test_name
### Active Record Setup
-The test suite of Active Record attempts to run four times: once for SQLite3, once for each of the two MySQL gems (`mysql` and `mysql2`), and once for PostgreSQL. We are going to see now how to set up the environment for them.
+Active Record's test suite runs three times: once for SQLite3, once for MySQL, and once for PostgreSQL. We are going to see now how to set up the environment for them.
WARNING: If you're working with Active Record code, you _must_ ensure that the tests pass for at least MySQL, PostgreSQL, and SQLite3. Subtle differences between the various adapters have been behind the rejection of many patches that looked OK when tested only against MySQL.