From 81bf120c340a2b9db13e96cad7f08bc2733a1ffe Mon Sep 17 00:00:00 2001
From: Vladimir Strakhov <vl.strakhov@gmail.com>
Date: Mon, 30 Jul 2012 11:06:02 +0400
Subject: add mysql authentification command to chapter 2.Running the Test
 Suite

---
 guides/source/contributing_to_ruby_on_rails.textile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'guides/source/contributing_to_ruby_on_rails.textile')

diff --git a/guides/source/contributing_to_ruby_on_rails.textile b/guides/source/contributing_to_ruby_on_rails.textile
index a8a097d156..35ec988c5e 100644
--- a/guides/source/contributing_to_ruby_on_rails.textile
+++ b/guides/source/contributing_to_ruby_on_rails.textile
@@ -184,6 +184,10 @@ We need first to delete +.bundle/config+ because Bundler remembers in that file
 
 In order to be able to run the test suite against MySQL you need to create a user named +rails+ with privileges on the test databases:
 
+<shell>
+mysql -u root mysql -p
+</shell>
+
 <shell>
 mysql> GRANT ALL PRIVILEGES ON activerecord_unittest.*
        to 'rails'@'localhost';
-- 
cgit v1.2.3


From 1a8e000339067a128bc1b941d0612eae5f484b5d Mon Sep 17 00:00:00 2001
From: Ace Suares <ace@suares.an>
Date: Fri, 3 Aug 2012 21:36:10 -0400
Subject: added info about an error that mysql gives when rails@localhost has a
 password; removed reference to activerecord/test/connections, which isn't
 there anymore

---
 guides/source/contributing_to_ruby_on_rails.textile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'guides/source/contributing_to_ruby_on_rails.textile')

diff --git a/guides/source/contributing_to_ruby_on_rails.textile b/guides/source/contributing_to_ruby_on_rails.textile
index 35ec988c5e..9ae627c237 100644
--- a/guides/source/contributing_to_ruby_on_rails.textile
+++ b/guides/source/contributing_to_ruby_on_rails.textile
@@ -202,6 +202,8 @@ $ cd activerecord
 $ bundle exec rake mysql:build_databases
 </shell>
 
+NOTE: If you get an error like "Access denied for user 'rails'@'localhost' (using password: YES)" then you most likely have a rails user in the mysql database, that uses a password, or you have a password specified in the my.cnf file of mysql.
+
 PostgreSQL's authentication works differently. A simple way to set up the development environment for example is to run with your development account
 
 <shell>
@@ -219,7 +221,7 @@ NOTE: Using the rake task to create the test databases ensures they have the cor
 
 NOTE: You'll see the following warning (or localized warning) during activating HStore extension in PostgreSQL 9.1.x or earlier: "WARNING: => is deprecated as an operator".
 
-If you’re using another database, check the files under +activerecord/test/connections+ for default connection information. You can edit these files to provide different credentials on your machine if you must, but obviously you should not push any such changes back to Rails.
+If you’re using another database, check the file +activerecord/test/config.yml+ or +activerecord/test/config.example.yml+ for default connection information. You can edit +activerecord/test/config.yml+ to provide different credentials on your machine if you must, but obviously you should not push any such changes back to Rails.
 
 You can now run the tests as you did for +sqlite3+. The tasks are respectively
 
-- 
cgit v1.2.3


From b51201242aaf77c6db5a9b2f72e433c521df79c5 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 4 Aug 2012 14:30:21 +0530
Subject: copy edits [ci skip]

---
 guides/source/contributing_to_ruby_on_rails.textile | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'guides/source/contributing_to_ruby_on_rails.textile')

diff --git a/guides/source/contributing_to_ruby_on_rails.textile b/guides/source/contributing_to_ruby_on_rails.textile
index 9ae627c237..dd43ef795f 100644
--- a/guides/source/contributing_to_ruby_on_rails.textile
+++ b/guides/source/contributing_to_ruby_on_rails.textile
@@ -184,10 +184,6 @@ We need first to delete +.bundle/config+ because Bundler remembers in that file
 
 In order to be able to run the test suite against MySQL you need to create a user named +rails+ with privileges on the test databases:
 
-<shell>
-mysql -u root mysql -p
-</shell>
-
 <shell>
 mysql> GRANT ALL PRIVILEGES ON activerecord_unittest.*
        to 'rails'@'localhost';
@@ -202,8 +198,6 @@ $ cd activerecord
 $ bundle exec rake mysql:build_databases
 </shell>
 
-NOTE: If you get an error like "Access denied for user 'rails'@'localhost' (using password: YES)" then you most likely have a rails user in the mysql database, that uses a password, or you have a password specified in the my.cnf file of mysql.
-
 PostgreSQL's authentication works differently. A simple way to set up the development environment for example is to run with your development account
 
 <shell>
-- 
cgit v1.2.3

